Merge branch 'develop' into order

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

@@ -160,4 +160,24 @@ public interface TsfPlanningDao {
 	 */
 	Collection<Plan> getPlanEventList(Plan plan);
 
+	/**
+	 * 기획전 목록 + 상품
+	 *
+	 * @param
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 3. 26
+	 */
+	Collection<Plan> getPlanningList(Plan plan);
+
+	/**
+	 * 기획전 목록 + 상품
+	 *
+	 * @param
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 3. 26
+	 */
+	Collection<Plan> getPlanningGoodsList(Plan plan);
+
 }

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

@@ -226,4 +226,19 @@ public class TsfPlanningService {
 		return planningDao.getPlanEventList(plan);
 	}
 
+	/**
+	 * 기획전 목록 + 상품
+	 *
+	 * @param
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 3. 26
+	 */
+	public Collection<Plan> getPlanningListForGoods(Plan plan){
+		Collection<Plan> planningList = planningDao.getPlanningList(plan);
+		for(Plan tempPlan : planningList){
+			tempPlan.setPlanningGoodsList(planningDao.getPlanningGoodsList(tempPlan));
+		}
+		return null;
+	}
 }

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

@@ -8,6 +8,7 @@ import java.util.HashMap;
 import javax.servlet.http.HttpServletResponse;
 
 import com.style24.core.biz.service.TscLookbookService;
+import com.style24.front.biz.service.TsfPlanningService;
 import com.style24.persistence.domain.Lookbook;
 import com.style24.persistence.domain.MainLayout;
 import com.style24.persistence.domain.Contents;
@@ -16,6 +17,7 @@ import com.style24.persistence.domain.Cate4Srch;
 import com.style24.persistence.domain.GoodsSearch;
 import com.style24.persistence.domain.BrandGroup;
 import com.style24.persistence.domain.Goods;
+import com.style24.persistence.domain.Plan;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mobile.device.Device;
@@ -57,9 +59,13 @@ public class TsfDisplayController extends TsfBaseController {
 
 	@Autowired
 	private TsfGoodsService goodsService;
+
 	@Autowired
 	private TscLookbookService coreLookbookService;
 
+	@Autowired
+	private TsfPlanningService planningService;
+
 	/**
 	 * 몰 메인
 	 * @return
@@ -250,6 +256,13 @@ public class TsfDisplayController extends TsfBaseController {
 				}
 			}
 
+			// 기획전 컨텐츠일때
+			if("SBM011".equals(brandMain.getContentsLoc())){
+				Plan plan = new Plan();
+				plan.setBrandGroupNo(paramMap.get("brandGroupNo"));
+				planningService.getPlanningListForGoods(plan);
+			}
+
 			// 룩북일때
 			if("SBM010".equals(brandMain.getContentsLoc()) || "SBMM010".equals(brandMain.getContentsLoc())){
 				Lookbook lookbook = new Lookbook();

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

@@ -30,5 +30,6 @@ public class MainLayout extends TscBaseDomain {
     private Collection<Contents> contentsList;
     private Collection<Goods> goodsList;
     private Collection<Lookbook> lookbookList;
+    private Collection<Plan> planningList;
 
 }

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

@@ -298,5 +298,7 @@ public class Plan extends TscBaseDomain{
 		@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 		List<Plan> multiPlanGoodsContentVal9; 
 		@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
-		List<Plan> multiPlanGoodsContentVal10; 
+		List<Plan> multiPlanGoodsContentVal10;
+
+		Collection<Plan> planningGoodsList;	//베너별 상품목록
 }

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

@@ -612,4 +612,61 @@
 		 )Z
 	</select>
 
+	<select id="getPlanningList" parameterType="Plan" resultType="Plan">
+		/* TsfPlanning.getPlanningList */
+		SELECT    A.PLAN_SQ
+			 , B.BRAND_GROUP_NO
+			 , A.PLAN_NM
+			 , A.PLAN_GB
+			 , A.FRONT_GB
+			 , A.DISP_STDT
+			 , A.DISP_EDDT
+			 , A.MAIN_PIMG
+			 , A.MAIN_MIMG
+			 , A.DTL_PIMG
+			 , A.DTL_MIMG
+			 , A.DTL_TITLE1
+			 , A.DTL_TITLE2
+			 , A.DEL_YN
+			 , A.OPEN_YN
+		FROM	TB_PLAN A
+		LEFT OUTER JOIN	TB_PLAN_BRAND B
+		ON	A.PLAN_SQ = B.PLAN_SQ
+		WHERE	1=1
+		  AND A.DISP_STDT <![CDATA[<=]]> NOW()
+		  AND A.DISP_EDDT <![CDATA[>=]]> NOW()
+		  AND A.PLAN_GB = 'P'
+		  AND A.DEL_YN = 'N'
+		  AND A.OPEN_YN = 'Y'
+		  AND B.BRAND_GROUP_NO = #{brandGroupNo}
+	</select>
+
+	<select id="getPlanningGoodsList" parameterType="Plan" resultType="Plan">
+		SELECT	B.PLAN_SQ
+			 , B.PLAN_DTL_SQ
+			 , B.CORNER_NM
+			 , B.DISP_ORD
+			 , B.DISP_STDT
+			 , B.DISP_EDDT
+			 , B.DISP_YN
+			 , C.GOODS_CD
+		FROM	TB_PLAN A
+		JOIN	TB_PLAN_DETAIL B
+		  ON	A.PLAN_SQ = B.PLAN_SQ
+		LEFT JOIN TB_PLAN_GOODS C
+		  ON	B.PLAN_DTL_SQ = C.PLAN_DTL_SQ
+		WHERE	1=1
+		  AND	A.PLAN_GB = 'P'
+		  AND	A.FRONT_GB = 'A'
+		  AND	A.DISP_STDT <![CDATA[<=]]> NOW()
+		  AND	A.DISP_EDDT <![CDATA[>=]]> NOW()
+		  AND	A.DEL_YN = 'N'
+		  AND	A.OPEN_YN = 'Y'
+		  AND	B.DISP_STDT <![CDATA[<=]]> NOW()
+		  AND	B.DISP_EDDT <![CDATA[>=]]> NOW()
+		  AND	B.DISP_YN = 'Y'
+		  AND	C.DEL_YN = 'N'
+		ORDER BY B.PLAN_SQ, B.PLAN_DTL_SQ, B.DISP_ORD, C.DISP_ORD
+	</select>
+
 </mapper>