Merge branch 'sowon' into develop

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

@@ -34,5 +34,16 @@ public interface TsfPlanningDao {
 	 * @since 2021.03.05
 	 */
 	int getPlanAllCount(Plan plan);
+	
+	/**
+	 * 기획전 목록
+	 *
+	 * @param
+	 * @return
+	 * @author sowon
+	 * @date 2021. 3. 8
+	 */
+	Collection<Plan> getPlanList(Plan plan);
+
 
 }

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

@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.style24.front.biz.dao.TsfPlanningDao;
+import com.style24.front.support.env.TsfConstants;
 import com.style24.persistence.domain.Cate4Srch;
 import com.style24.persistence.domain.Plan;
 import com.style24.persistence.domain.Point;
@@ -46,5 +47,18 @@ public class TsfPlanningService {
 	public int getPlanAllCount(Plan plan) {
 		return planningDao.getPlanAllCount(plan);
 	}
+	
+	/**
+	 * 기획전 목록
+	 *
+	 * @param
+	 * @return
+	 * @author sowon
+	 * @since 2021. 3. 8
+	 */
+	public Collection<Plan> getPlanList(Plan plan) {
+		//plan.setSiteCd(TsfConstants.SITE_CD);
+		return planningDao.getPlanList(plan);
+	}
 
 }

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

@@ -40,7 +40,7 @@ public class TsfPlanningController extends TsfBaseController {
 	
 	/**
 	 * 기획전 메인 화면
-	 *
+	 * 
 	 * @return
 	 * @author sowon
 	 * @since 2021. 3. 5
@@ -49,20 +49,25 @@ public class TsfPlanningController extends TsfBaseController {
 	public ModelAndView PlanningMainForm(Plan plan) throws Exception {
 		ModelAndView mav = new ModelAndView();
 		Cate4Srch cate = new Cate4Srch();
+		
+		// 디바이스 set
+		plan.setFrontGb(TsfSession.getFrontGb());
+		
 		// 카테고리 
 		mav.addObject("categoryList", planningService.getPlanCate1(cate));
 		mav.addObject("cateNo", plan.getCateNo());
 		
+		
+		
 		// 각 가테고리 기획전 갯수
 		mav.addObject("planCount",planningService.getPlanAllCount(plan));
 		
-		if (plan.getCateNo() != null) {
-			cate.setCate1No(plan.getCateNo());
-			mav.addObject("cateNm", planningService.getPlanCate1(cate).iterator().next().getCate1Nm());
+		cate.setCate1No(plan.getCateNo());
+		mav.addObject("cateNm", planningService.getPlanCate1(cate).iterator().next().getCate1Nm());
 			
-		}
 		
 		
+		mav.addObject("planList", planningService.getPlanList(plan));
 		mav.setViewName(super.getDeviceViewName("planning/PlanningMainForm"));
 		return mav;
 	}

src/main/java/com/style24/persistence/domain/Plan.java

@@ -228,6 +228,9 @@ public class Plan extends TscBaseDomain{
 		private String brandEnm;			//브랜드명
 		private Integer goodsPlanContSq;	//상품 컨텐츠일련번호
 		
+		private String brand;				// 기획전 리스트 (브랜드 명 외)
+		private String newPlan;				// 기획전 new 확인
+		private int cnt;					// 기획전 브랜드 카운트;
 		// Pagination
 		private TscPageRequest pageable;
 		private int pageNo = 1;

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

@@ -15,6 +15,7 @@
 	</sql>
 	
 	<select id="getPlanCate1" resultType="Cate4Srch" parameterType="Cate4Srch">
+		/* TsfPlanning.getPlanCate1 */
 		SELECT CATE1_NO 
       		  ,CATE1_NM 
 		      ,CATE_GB 
@@ -31,6 +32,7 @@
 	</select>
 	
 	<select id="getPlanAllCount" resultType="int" parameterType="Plan">
+		/* TsfPlanning.getPlanAllCount */
 		SELECT COUNT(*) AS CNT
 		FROM TB_PLAN P  
 		WHERE 1=1
@@ -42,6 +44,72 @@
 		   						WHERE CATE_NO = #{cateNo}
 		   					)
 		   </if>
+		    AND NOW() BETWEEN P.DISP_STDT AND P.DISP_EDDT
+		    AND P.FRONT_GB IN (#{frontGb}, 'A')
+	</select>
+	
+	<!-- 기획전 목록 -->
+	<select id="getPlanList" parameterType="Plan" resultType="Plan">
+		/* TsfPlanning.getPlanList */
+		SELECT P1.PLAN_SQ 
+		      ,P1.PLAN_NM 
+		      ,P1.DTL_TITLE1 
+		      ,P1.PLAN_GB 
+		      ,P1.FRONT_GB 
+		      ,P1.MAIN_PIMG 
+		      ,P1.MAIN_MIMG 
+		      ,P1.DISP_ORD
+		      ,P1.NEW_PLAN
+		      ,P1.DISP_STDT
+		      ,P1.DISP_EDDT
+		      ,P1.REG_NO 
+		      ,P2.BRAND
+		      ,P2.CNT
+		FROM 
+		(
+			SELECT P.PLAN_SQ 
+			      ,P.PLAN_NM 
+			      ,P.DTL_TITLE1 
+			      ,P.PLAN_GB 
+			      ,P.FRONT_GB 
+			      ,P.MAIN_PIMG 
+			      ,P.MAIN_MIMG 
+			      ,P.DISP_ORD 
+			      ,P.REG_NO 
+			      ,CASE WHEN DATE(P.REG_DT) BETWEEN DATE_ADD(NOW(),INTERVAL -3 DAY ) AND NOW() THEN 'NEW' END AS 'NEW_PLAN'   /*등록일 기준 3일 */
+			      ,P.DISP_EDDT 
+			      ,P.DISP_STDT 
+			      ,P.DEL_YN 
+			FROM TB_PLAN P
+			GROUP BY  P.PLAN_SQ 
+			      ,P.PLAN_NM 
+			      ,P.DTL_TITLE1 
+			      ,P.PLAN_GB 
+			      ,P.FRONT_GB 
+			      ,P.MAIN_PIMG 
+			      ,P.MAIN_MIMG 
+			      ,P.DISP_ORD 
+			      ,P.REG_NO
+		)P1 INNER JOIN (
+						SELECT  PB.PLAN_SQ 
+						      , COUNT(PLAN_SQ) AS CNT
+						      ,CASE WHEN COUNT(PLAN_SQ) = 1 THEN MAX(TBG.BRAND_GROUP_KNM) ELSE MAX(TBG.BRAND_GROUP_KNM)END AS BRAND
+						FROM TB_PLAN_BRAND PB INNER JOIN TB_BRAND_GROUP TBG  ON PB.BRAND_GROUP_NO = TBG.BRAND_GROUP_NO
+						GROUP BY PB.PLAN_SQ
+						)P2 ON P1.PLAN_SQ = P2.PLAN_SQ
+		WHERE 1=1
+		  AND P1.DEL_YN = 'N'
+		  AND P1.PLAN_GB = 'P'
+		  AND NOW() BETWEEN P1.DISP_STDT AND P1.DISP_EDDT
+		  AND P1.FRONT_GB IN (#{frontGb}, 'A')
+		  AND P1.PLAN_SQ IN (
+				   						SELECT PLAN_SQ 
+				   						FROM TB_PLAN_CATE 
+				   						 <if test="cateNo != null and cateNo != ''">
+				   						WHERE CATE_NO = #{cateNo}
+				   						</if>
+				   					)
+		ORDER BY P1.NEW_PLAN DESC, ABS(DATEDIFF(P1.DISP_EDDT,NOW())) 
 	</select>
 	
 	

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

@@ -24,7 +24,7 @@
 			<ul>
 				<li class="bread_home"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN);">홈</a></li>
 				<li class="bread_2depth"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_PLANNING_MAIN);">기획전</a></li>
-				<th:block th:if="${cateNm != null}">
+				<th:block th:if="${cateNo != null}">
 				<li class="bread_3depth"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_PLANNING_MAIN+'?cateNo='+[[${cateNo}]]);">[[${cateNm}]]</a></li>
 				</th:block>
 			</ul> 
@@ -70,19 +70,31 @@
                                 <button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_MAIN);"><span>홈으로 가기</span></button>
                             </div>
                         </div>
+                        
+                        
                         <div class="itemsGrp">
+                        <th:block th:each="PlanData, PlanStat : ${planList}">
                             <div class="exhi_item">
+                             
                                 <div class="exhi_item_img">
-                                    <a href="">
+                                    <a href="javascript:void(0);" th:onclick="fnEventGoToPage('[[${PlanData.planSq}]]');">
+                                    	<th:block th:if="${PlanData.newPlan != null}">
                                         <div class="shape ranker"><span>NEW</span></div>
-                                        <img src="/images/pc/thumb/ev_list_img01.jpg" alt=""> <!-- 430x430 사이즈 최적 -->
+                                        </th:block>
+                                        <img src="${@environment.getProperty('domain.image')+'/plan/'+PlanData.mainPimg}" alt=""> <!-- 430x430 사이즈 최적 -->
                                         <div class="exhi_detail">
-                                            <p class="brand">TBJ 외</p>
-                                            <h3 class="tit">ATTENTION! 20FW HOLIDAY TBJ 주목할 홀리데이 TBJ 컬렉션 ATTENTION! 20FW HOLIDAY TBJ 주목할 홀리데이 TBJ 컬렉션</h3>
+                                        	<th:block th:if="${PlanData.cnt > 1}">
+                                            <p class="brand">[[${PlanData.brand}]] 외</p>
+                                            </th:block>
+                                            <th:block th:if="${PlanData.cnt <= 1}">
+                                            <p class="brand">[[${PlanData.brand}]]</p>
+                                            </th:block>
+                                            <h3 class="tit">[[${PlanData.planNm}]]</h3>
                                             <p class="sale">신상 15%쿠폰할인</p>
                                         </div>
                                     </a>
                                 </div>
+                             	
                                 <div class="exhi_item_pr">
                                     <ul class="prod_list clear">
                                         <li>
@@ -107,156 +119,7 @@
                                                 </div>
                                             </a>
                                         </li>
-                                        <li>
-                                            <a href="">
-                                                <div class="img">
-                                                    <img src="/images/pc/thumb/dp_exhibition_pr03.jpg" alt="패딩 리버서블 FLEECE  점퍼">
-                                                </div>
-                                                <div class="txt">
-                                                    <p class="pr_tit">패딩 리버서블 FLEECE  점퍼</p>
-                                                    <p class="price"><span>25,410</span>원</p>
-                                                </div>
-                                            </a>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </div>
-                            <div class="exhi_item">
-                                <div class="exhi_item_img">
-                                    <a href="">
-                                        <div class="shape ranker"><span>NEW</span></div>
-                                        <img src="/images/pc/thumb/tmp_pdLookbook1.jpg" alt="">
-                                        <div class="exhi_detail">
-                                            <p class="brand">TBJ 외</p>
-                                            <h3 class="tit">ATTENTION! 20FW HOLIDAY TBJ 주목할 홀리데이 TBJ 컬렉션 ATTENTION! 20FW HOLIDAY TBJ 주목할 홀리데이 TBJ 컬렉션</h3>
-                                            <p class="sale">신상 15%쿠폰할인</p>
-                                        </div>
-                                    </a>
-                                </div>
-                                <div class="exhi_item_pr">
-                                    <ul class="prod_list clear">
-                                        <li>
-                                            <a href="">
-                                                <div class="img">
-                                                    <img src="/images/pc/thumb/dp_exhibition_pr01.jpg" alt="볼패딩 푸퍼점퍼">
-                                                </div>
-                                                <div class="txt">
-                                                    <p class="pr_tit">볼패딩 푸퍼점퍼 T204JP060P 볼패딩 푸퍼점퍼 T204JP060P</p>
-                                                    <p class="price"><span>25,410</span>원</p>
-                                                </div>
-                                            </a>
-                                        </li>
-                                        <li>
-                                            <a href="">
-                                                <div class="img">
-                                                    <img src="/images/pc/thumb/dp_exhibition_pr02.jpg" alt="테이퍼드 M톤 기모 데님 팬츠">
-                                                </div>
-                                                <div class="txt">
-                                                    <p class="pr_tit">테이퍼드 M톤 기모 데님 팬츠</p>
-                                                    <p class="price"><span>25,410</span>원</p>
-                                                </div>
-                                            </a>
-                                        </li>
-                                        <li>
-                                            <a href="">
-                                                <div class="img">
-                                                    <img src="/images/pc/thumb/dp_exhibition_pr03.jpg" alt="패딩 리버서블 FLEECE  점퍼">
-                                                </div>
-                                                <div class="txt">
-                                                    <p class="pr_tit">패딩 리버서블 FLEECE  점퍼</p>
-                                                    <p class="price"><span>25,410</span>원</p>
-                                                </div>
-                                            </a>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </div>
-                            <div class="exhi_item">
-                                <div class="exhi_item_img">
-                                    <a href="">
-                                        <div class="shape ranker"><span>NEW</span></div>
-                                        <img src="/images/pc/thumb/tmp_pdLookbook1.jpg" alt="">
-                                        <div class="exhi_detail">
-                                            <p class="brand">TBJ 외</p>
-                                            <h3 class="tit">ATTENTION! 20FW HOLIDAY TBJ 주목할 홀리데이 TBJ 컬렉션 ATTENTION! 20FW HOLIDAY TBJ 주목할 홀리데이 TBJ 컬렉션</h3>
-                                            <p class="sale">신상 15%쿠폰할인</p>
-                                        </div>
-                                    </a>
-                                </div>
-                                <div class="exhi_item_pr">
-                                    <ul class="prod_list clear">
-                                        <li>
-                                            <a href="">
-                                                <div class="img">
-                                                    <img src="/images/pc/thumb/dp_exhibition_pr01.jpg" alt="볼패딩 푸퍼점퍼">
-                                                </div>
-                                                <div class="txt">
-                                                    <p class="pr_tit">볼패딩 푸퍼점퍼 T204JP060P 볼패딩 푸퍼점퍼 T204JP060P</p>
-                                                    <p class="price"><span>25,410</span>원</p>
-                                                </div>
-                                            </a>
-                                        </li>
-                                        <li>
-                                            <a href="">
-                                                <div class="img">
-                                                    <img src="/images/pc/thumb/dp_exhibition_pr02.jpg" alt="테이퍼드 M톤 기모 데님 팬츠">
-                                                </div>
-                                                <div class="txt">
-                                                    <p class="pr_tit">테이퍼드 M톤 기모 데님 팬츠</p>
-                                                    <p class="price"><span>25,410</span>원</p>
-                                                </div>
-                                            </a>
-                                        </li>
-                                        <li>
-                                            <a href="">
-                                                <div class="img">
-                                                    <img src="/images/pc/thumb/dp_exhibition_pr03.jpg" alt="패딩 리버서블 FLEECE  점퍼">
-                                                </div>
-                                                <div class="txt">
-                                                    <p class="pr_tit">패딩 리버서블 FLEECE  점퍼</p>
-                                                    <p class="price"><span>25,410</span>원</p>
-                                                </div>
-                                            </a>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </div>
-                            <div class="exhi_item">
-                                <div class="exhi_item_img">
-                                    <a href="">
-                                        <img src="/images/pc/thumb/tmp_pdLookbook1.jpg" alt="">
-                                        <div class="exhi_detail">
-                                            <p class="brand">TBJ 외</p>
-                                            <h3 class="tit">ATTENTION! 20FW HOLIDAY TBJ 주목할 홀리데이 TBJ 컬렉션 ATTENTION! 20FW HOLIDAY TBJ 주목할 홀리데이 TBJ 컬렉션</h3>
-                                            <p class="sale">신상 15%쿠폰할인</p>
-                                        </div>
-                                    </a>
-                                </div>
-                                <div class="exhi_item_pr">
-                                    <ul class="prod_list clear">
-                                        <li>
-                                            <a href="">
-                                                <div class="img">
-                                                    <img src="/images/pc/thumb/dp_exhibition_pr01.jpg" alt="볼패딩 푸퍼점퍼">
-                                                </div>
-                                                <div class="txt">
-                                                    <p class="pr_tit">볼패딩 푸퍼점퍼 T204JP060P 볼패딩 푸퍼점퍼 T204JP060P</p>
-                                                    <p class="price"><span>25,410</span>원</p>
-                                                </div>
-                                            </a>
-                                        </li>
-                                        <li>
-                                            <a href="">
-                                                <div class="img">
-                                                    <img src="/images/pc/thumb/dp_exhibition_pr02.jpg" alt="테이퍼드 M톤 기모 데님 팬츠">
-                                                </div>
-                                                <div class="txt">
-                                                    <p class="pr_tit">테이퍼드 M톤 기모 데님 팬츠</p>
-                                                    <p class="price"><span>25,410</span>원</p>
-                                                </div>
-                                            </a>
-                                        </li>
-                                        <li>
+                                      <!--   <li>
                                             <a href="">
                                                 <div class="img">
                                                     <img src="/images/pc/thumb/dp_exhibition_pr03.jpg" alt="패딩 리버서블 FLEECE  점퍼">
@@ -266,59 +129,13 @@
                                                     <p class="price"><span>25,410</span>원</p>
                                                 </div>
                                             </a>
-                                        </li>
-                                    </ul>
-                                </div>
-                            </div>
-                            <div class="exhi_item">
-                                <div class="exhi_item_img">
-                                    <a href="">
-                                        <img src="/images/pc/thumb/tmp_pdLookbook1.jpg" alt="">
-                                        <div class="exhi_detail">
-                                            <p class="brand">TBJ 외</p>
-                                            <h3 class="tit">ATTENTION! 20FW HOLIDAY TBJ 주목할 홀리데이 TBJ 컬렉션 ATTENTION! 20FW HOLIDAY TBJ 주목할 홀리데이 TBJ 컬렉션</h3>
-                                            <p class="sale">신상 15%쿠폰할인</p>
-                                        </div>
-                                    </a>
-                                </div>
-                                <div class="exhi_item_pr">
-                                    <ul class="prod_list clear">
-                                        <li>
-                                            <a href="">
-                                                <div class="img">
-                                                    <img src="/images/pc/thumb/dp_exhibition_pr01.jpg" alt="볼패딩 푸퍼점퍼">
-                                                </div>
-                                                <div class="txt">
-                                                    <p class="pr_tit">볼패딩 푸퍼점퍼 T204JP060P 볼패딩 푸퍼점퍼 T204JP060P</p>
-                                                    <p class="price"><span>25,410</span>원</p>
-                                                </div>
-                                            </a>
-                                        </li>
-                                        <li>
-                                            <a href="">
-                                                <div class="img">
-                                                    <img src="/images/pc/thumb/dp_exhibition_pr02.jpg" alt="테이퍼드 M톤 기모 데님 팬츠">
-                                                </div>
-                                                <div class="txt">
-                                                    <p class="pr_tit">테이퍼드 M톤 기모 데님 팬츠</p>
-                                                    <p class="price"><span>25,410</span>원</p>
-                                                </div>
-                                            </a>
-                                        </li>
-                                        <li>
-                                            <a href="">
-                                                <div class="img">
-                                                    <img src="/images/pc/thumb/dp_exhibition_pr03.jpg" alt="패딩 리버서블 FLEECE  점퍼">
-                                                </div>
-                                                <div class="txt">
-                                                    <p class="pr_tit">패딩 리버서블 FLEECE  점퍼</p>
-                                                    <p class="price"><span>25,410</span>원</p>
-                                                </div>
-                                            </a>
-                                        </li>
+                                        </li> -->
                                     </ul>
                                 </div>
                             </div>
+                            </th:block>
+             		
+             				
                         </div>
                     </div>
                 </div>