Merge branch 'sowon' into develop

src/main/java/com/style24/front/biz/dao/TsfPlanningDao.java

@@ -120,6 +120,15 @@ public interface TsfPlanningDao {
 	 */
 	Collection<Plan> getPlanCouponInfo(Coupon coupon);
 	
+	/**
+	 * 기획전 템플릿 이미지
+	 *
+	 * @param 기획전 번호
+	 * @return
+	 * @author sowon
+	 * @date 2021. 3. 22
+	 */
+	Collection<Plan> getPlanImageInfo(Plan plan);
 	
 	/**
 	 * 이벤트 갯수 조회

src/main/java/com/style24/front/biz/service/TsfPlanningService.java

@@ -157,6 +157,18 @@ public class TsfPlanningService {
 	public Collection<Plan> getPlanCouponInfo(Coupon coupon) {
 		return planningDao.getPlanCouponInfo(coupon);
 	}
+	
+	/**
+	 * 기획전 템플릿 이미지
+	 *
+	 * @param
+	 * @return
+	 * @author sowon
+	 * @since 2021. 3. 22
+	 */
+	public Collection<Plan> getPlanImageInfo(Plan plan) {
+		return planningDao.getPlanImageInfo(plan);
+	}
 
 
 	/**

src/main/java/com/style24/front/biz/web/TsfPlanningController.java

@@ -141,7 +141,10 @@ public class TsfPlanningController extends TsfBaseController {
 		
 		// 쿠폰
 		mav.addObject("couponInfo",planningService.getPlanCouponInfo(coupon));
-				
+		
+		// 이미지
+		mav.addObject("imageInfo",planningService.getPlanImageInfo(plan));
+		
 		// 다른기획전 보기 
 		mav.addObject("planList", planningService.getPlanList(plan));
 //

src/main/java/com/style24/persistence/mybatis/shop/TsfPlanning.xml

@@ -325,7 +325,8 @@
 		SELECT TMPL_TYPE , DISP_ORD 
 		FROM TB_PLAN_CONTENTS TPC 
 		WHERE 1=1 
-		 AND PLAN_SQ = #{planSq}
+			AND TPC.PLAN_SQ = #{planSq}
+		    AND TPC.DISP_YN = 'Y'
 		GROUP BY TMPL_TYPE
 		ORDER BY DISP_ORD 
 	</select>
@@ -478,7 +479,7 @@
 		ORDER BY F2.REVIEW_SQ LIMIT 20
 	</select>
 	
-	<select id="getPlanCouponInfo" parameterType="coupon" resultType="coupon">
+	<select id="getPlanCouponInfo" parameterType="Coupon" resultType="Coupon">
 		/* TsfPlanning.templateDispOrdInfo*/
 		SELECT F.*
 		      ,(CASE F.CPN_ID WHEN (SELECT CPN_ID FROM TB_CUST_COUPON C WHERE C.CPN_ID = F.CPN_ID )THEN '받기완료'
@@ -537,5 +538,26 @@
 		)F
  
 	</select>
+	
+	<select id="getPlanImageInfo" parameterType="Plan" resultType="Plan">
+		/* TsfPlanning.getPlanImageInfo*/
+		SELECT PC.PLAN_CONT_SQ
+		      ,PC.PLAN_SQ
+		      ,PC.TMPL_TYPE
+		      ,PC.TITLE
+		      ,PC.LINK_URL
+		      ,PC.DISP_YN
+		      ,PC.DISP_ORD
+		      ,PCI.PLAN_CONT_ITEM_SQ
+		      ,PCI.ITEM_VAL
+		      ,PCI.DISP_ORD
+		      ,PCI.REVIEW_DISP_STDT
+		      ,PCI.REVIEW_DISP_EDDT
+		FROM TB_PLAN_CONTENTS PC INNER JOIN TB_PLAN_CONTENTS_ITEM PCI ON PC.PLAN_CONT_SQ = PCI.PLAN_CONT_SQ 
+		WHERE 1=1
+		 AND PC.TMPL_TYPE = 'G082_30'
+		 AND PC.PLAN_SQ = #{planSq}
+		 AND PC.DISP_YN = 'Y'
+	</select>
 
 </mapper>

src/main/webapp/WEB-INF/views/web/planning/PlanningDetailFormWeb.html

@@ -48,53 +48,6 @@
 							<th:block th:each="a, template : ${templateOrd}">
 								<div class="coner_item01" th:id="${a.tmplType}"></div>
 							</th:block>
-							<!--<div class="coner_item01">
-                             <div class="dp_listItems_wrap"> 추천아이템
-                                <div>
-                                    <a href="javascript:void(0)">겨울 아우터 추천템</a>
-                                </div>
-                                <div class="dp_listItems_cont">
-                                    <ul>
-                                        <li>
-                                            <div class="dp_listItems">
-                                                <div class="dp_listItems_img">
-                                                    <img src="/images/pc/thumb/dp_item01.jpg" alt="">
-                                                </div>
-                                                <div class="dp_listItems_info">
-                                                    <div class="dp_listItems_brand">BUCKAROO</div>
-                                                    <div class="dp_listItems_name">여성 유니 하이넥 벨트 빈티지 숏 기장 무스탕<br>(B204Z5010P)</div>
-                                                    <div class="dp_listItems_price">
-                                                        <span class="price">79,900</span>
-                                                        <del>98,000</del>
-                                                        <span class="percent">10%</span>
-                                                    </div>
-                                                    <div class="itemComment">#주문 폭주 상품</div>
-                                                    <div class="ui_row">
-                                                        <button type="button" class="btn btn_default"><span>자세히 보기</span></button>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </div> 
-                        </div>-->
-							<!-- <div class="coner_item02">
-	                        <div class="coner_visual">
-	                            <div class="swiper-container">
-	                                <div class="swiper-wrapper ">
-	                                    <div class="swiper-slide">
-	                                        <img alt="" src="/images/pc/thumb/dp_slide_banner1.png">
-	                                    </div>
-	                                    <div class="swiper-slide">
-	                                        <img alt="" src="/images/pc/thumb/dp_slide_banner1.png"> 
-	                                    </div>
-	                                </div>
-	                                <div class="swiper-button-prev "></div>
-	                                <div class="swiper-button-next "></div>
-	                            </div>
-	                            <div class="swiper-pagination"></div>
-                        </div> -->
 							<div class="coner_front">
 								<div class="promotion_visual" th:if="${fsrcInfoBtm != null}" th:utext="${fsrcInfoBtm.fsrcPc}"></div>
 								<!-- 하단배너 -->
@@ -241,6 +194,7 @@
 let review = [[${reviewInfo}]];
 let coupon = [[${couponInfo}]];
 let plan = [[${planInfo}]];
+let image = [[${imageInfo}]];
 
 if(review != null || review != ''){
 		
@@ -260,7 +214,7 @@ if(review != null || review != ''){
 		html += '						<div class="lap">';
 		html += '							<div class="pic">';
 		html += '								<span class="thumb"';
-		html += '									style="background-image: url('+ _imgUrl + review[i].reviewSysImg +');"></span>';
+		html += '									style="background-image: url('+ _imgUrl +'/'+review[i].reviewSysImg +');"></span>';
 		html += '								<!-- 동영상의 썸네일일 경우 mov 클래스 추가 -->';
 		html += '							</div>';
 		html += '							<div class="info">';
@@ -377,10 +331,31 @@ if(coupon != null || coupon != ''){
 	html += '	<br>';
 	html += '</div>';
 	html += '</div>';
+		
+	$("#G082_20").append(html);
+}
+
+if(image != null || image != ''){
+	var html = '';
 	
+	html += '	<div class="coner_item02">';
+	html += '    	<div class="coner_visual">';
+	html += '        	<div class="swiper-container">';
+	html += '            	<div class="swiper-wrapper ">';
 	
-	$("#G082_20").append(html);
+	for (var i = 0; i < image.length; i++) {
+		html += '                	<div class="swiper-slide">';
+		html += '                    	<img alt="" src="'+ _imgUrl +'/planning/'+image[i].itemVal +'">';
+		html += '                	</div>';
+	}
+	html += '            	</div>';
+	html += '            	<div class="swiper-button-prev "></div>';
+	html += '            	<div class="swiper-button-next "></div>';
+	html += '        	</div>';
+	html += '        <div class="swiper-pagination"></div>';
+	html += '	</div>';
 	
+	$("#G082_30").append(html);
 }
 	
 </script>