Merge branch 'develop' into order

src/main/java/com/style24/core/biz/service/TscLookbookService.java

@@ -3,8 +3,6 @@ package com.style24.core.biz.service;
 import java.io.File;
 import java.util.Collection;
 
-import com.style24.persistence.domain.LookbookBanner;
-import com.style24.persistence.domain.LookbookGoods;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
@@ -13,6 +11,8 @@ import org.springframework.util.StringUtils;
 
 import com.style24.core.biz.dao.TscLookbookDao;
 import com.style24.persistence.domain.Lookbook;
+import com.style24.persistence.domain.LookbookBanner;
+import com.style24.persistence.domain.LookbookGoods;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -218,6 +218,7 @@ public class TscLookbookService {
 		Collection<Lookbook> lookbookBannerList = lookbookDao.getLookbookBannerList(lookbook);
 
 		for (Lookbook tempLookbook : lookbookBannerList) {
+			tempLookbook.setCustNo(lookbook.getCustNo());
 			tempLookbook.setLookbookGoodsList(lookbookDao.getLookbookBannerGoodsList(tempLookbook));
 		}
 

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

@@ -45,6 +45,7 @@ public class Lookbook extends TscBaseDomain {
 	private String goodsCd; 		// 상품상세검색용
 	private String frontGb; 		// 상품상세검색용
 	private String custGb; 			// 상품상세검색용
+	private Integer custNo; 		// 상품상세검색용
 
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] selectDataArr;
@@ -56,6 +57,10 @@ public class Lookbook extends TscBaseDomain {
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] multiBrandCd;
 
+	private Integer	brandGroupNo;
+	private String imgDesc;
+	private String lookbookGb;
+
 	// Pagination
 	private TscPageRequest pageable;
 	private int pageNo = 1;

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

@@ -1,11 +1,11 @@
 package com.style24.persistence.domain;
 
+import java.util.Collection;
+
 import com.style24.persistence.TscBaseDomain;
 
 import lombok.Data;
 
-import java.util.Collection;
-
 /**
  * 룩북 상품 도메인
  * @author bin2107
@@ -37,11 +37,9 @@ public class LookbookGoods extends TscBaseDomain {
 	private int stockQty;
 	private String soldoutYn;
 	private float dcRate;
-	private String videoGbM;
-	private String videoValM;
-	private String videoGbS;
-	private String videoValS;
 	private String mainColorCd;
 	private String minOrdQty;
 	private String optCd;
+	private String wishYn;
+	
 }

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

@@ -292,12 +292,14 @@
 	
 	<!-- 룩북 베너 목록 조회 -->
 	<select id="getLookbookBannerList" parameterType="Lookbook" resultType="Lookbook">
-		/* TsfGoods.getLookbookBannerList */
+		/* TscLookbook.getLookbookBannerList */
 		SELECT A.LOOKBOOK_SQ
 		     , A.BRAND_CD
+		     , FN_GET_BRAND_GROUP_NM(A.BRAND_CD) AS BRAND_NM
 		     , A.TITLE
 		     , B.LOOKBOOKB_SQ
 		     , B.SYS_FILE_NM
+		     , B.IMG_DESC
 		FROM TB_LOOKBOOK A
 		INNER JOIN TB_LOOKBOOK_BANNER B ON A.LOOKBOOK_SQ = B.LOOKBOOK_SQ 
 			                            AND B.DISP_YN = 'Y'
@@ -308,28 +310,29 @@
 										AND A.BRAND_CD = #{brandCd}
 										</if>
 										<if test='mainDispYn != null and mainDispYn != ""'>
-											AND A.MAIN_DISP_YN = #{mainDispYn}
+										AND A.MAIN_DISP_YN = #{mainDispYn}
 										</if>
 		                                <if test='lookbookSq != null and lookbookSq != ""'>
-		                                	AND A.LOOKBOOK_SQ = #{lookbookSq}
+		                                AND A.LOOKBOOK_SQ = #{lookbookSq}
 		                                </if>
 		WHERE NOW() BETWEEN A.DISP_STDT AND A.DISP_EDDT
 		AND A.DISP_YN  = 'Y'
 		<choose>
 			<when test='brandCd != null and brandCd != ""'>
-				ORDER BY B.LOOKBOOKB_SQ, A.DISP_ORD, B.DISP_ORD
+		ORDER BY B.LOOKBOOKB_SQ, A.DISP_ORD, B.DISP_ORD
 			</when>
 			<otherwise>
-				ORDER BY A.DISP_ORD, B.DISP_ORD
+		ORDER BY A.DISP_ORD, B.DISP_ORD
 			</otherwise>
 		</choose>
 	</select>
 	
 	<!-- 룩북 베너 상품 목록 조회 -->
 	<select id="getLookbookBannerGoodsList" parameterType="Lookbook" resultType="LookbookGoods">
-		/* TsfGoods.getLookbookBannerGoodsList */
+		/* TscLookbook.getLookbookBannerGoodsList */
 		SELECT Z.*
 		     , 100 - ROUND((CURR_PRICE / LIST_PRICE) * 100 ,0) AS DC_RATE
+		     , FN_GET_GOODS_NM(GOODS_NM,GOODS_GB,FOREIGN_BUY_YN,PARALLEL_IMPORT_YN,ORDER_MADE_YN) AS GOODS_FULL_NM /*상품FULL명*/
 		FROM (
 		      SELECT A.LOOKBOOK_SQ
 		           , B.LOOKBOOKB_SQ 
@@ -339,27 +342,23 @@
 		           , P.XLIM
 		           , P.YLIM
 		           , G.GOODS_NM
-		           , CONCAT(IF(IFNULL(G.GOODS_GB,'') IN ('G073_11','G073_15', ''), '',IFNULL(CONCAT('[',FN_GET_CODE_NM('G073',G.GOODS_GB),']'),'') )
-		                   ,IF(G.FOREIGN_BUY_YN='Y','[해외구매대행]','' )
-		                   ,IF(G.PARALLEL_IMPORT_YN = 'Y','[병행수입]','')
-		                   ,IF(G.ORDER_MADE_YN='Y','[주문제작]','')
-		                   ,G.GOODS_NM ) AS GOODS_FULL_NM
-		          , G.GOODS_STAT
-		          , G.GOODS_TYPE
-		          , G.MIN_ORD_QTY 
-		          , (CASE WHEN E.DISP_NM_LANG = 'EN' THEN E.BRAND_GROUP_ENM ELSE E.BRAND_GROUP_KNM END) AS BRAND_GROUP_NM
-		          , G.LIST_PRICE
-		          , FN_GET_BENEFIT_PRICE(#{frontGb},G.GOODS_CD, G.CURR_PRICE,#{custGb}) AS CURR_PRICE
-		          , G.MAIN_COLOR_CD
-		          , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = IFNULL(G.MAIN_COLOR_CD,'XX') AND DEFAULT_IMG_YN = 'Y') AS SYS_IMG_NM
-		          , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = IFNULL(G.MAIN_COLOR_CD,'XX') AND MOUSEOVER_IMG_YN = 'Y') AS SYS_IMG_NM2
-		          , S.STOCK_QTY
-		          , S.SOLDOUT_YN
-		          , S.OPT_CD
-		          , V.VIDEO_GB_M
-		          , V.VIDEO_VAL_M
-		          , V.VIDEO_GB_S
-		          , V.VIDEO_VAL_S
+		           , G.GOODS_GB
+		           , G.FOREIGN_BUY_YN
+		           , G.PARALLEL_IMPORT_YN
+		           , G.ORDER_MADE_YN
+		           , G.GOODS_STAT
+		           , G.GOODS_TYPE
+		           , G.MIN_ORD_QTY 
+		           , (CASE WHEN E.DISP_NM_LANG = 'EN' THEN E.BRAND_GROUP_ENM ELSE E.BRAND_GROUP_KNM END) AS BRAND_GROUP_NM
+		           , G.LIST_PRICE
+		           , FN_GET_BENEFIT_PRICE(#{frontGb},G.GOODS_CD, G.CURR_PRICE,#{custGb}) AS CURR_PRICE
+		           , G.MAIN_COLOR_CD
+		           , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = IFNULL(G.MAIN_COLOR_CD,'XX') AND DEFAULT_IMG_YN = 'Y') AS SYS_IMG_NM
+		           , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = IFNULL(G.MAIN_COLOR_CD,'XX') AND MOUSEOVER_IMG_YN = 'Y') AS SYS_IMG_NM2
+		           , S.STOCK_QTY
+		           , S.SOLDOUT_YN
+		           , S.OPT_CD
+		           , (CASE WHEN W.GOODS_CD IS NULL THEN 'N' ELSE 'Y' END) AS WISH_YN
 		      FROM TB_LOOKBOOK A
 		      INNER JOIN TB_LOOKBOOK_BANNER B ON A.LOOKBOOK_SQ = B.LOOKBOOK_SQ 
 		                                      AND B.DISP_YN = 'Y'
@@ -382,61 +381,32 @@
 		                       FROM VW_STOCK
 		                       WHERE DISP_YN = 'Y'
 		                       GROUP BY GOODS_CD) S ON G.GOODS_CD = S.GOODS_CD
-		      LEFT OUTER JOIN (SELECT MAX(GOODS_CD) AS GOODS_CD 
-		                             , MAX(CASE WHEN  RNUM = 1 THEN  VIDEO_GB END) AS  VIDEO_GB_M
-		                             , MAX(CASE WHEN  RNUM = 1 THEN  VIDEO_VAL END) AS  VIDEO_VAL_M
-		                             , MAX(CASE WHEN  RNUM = 2 THEN  VIDEO_GB END) AS  VIDEO_GB_S
-		                             , MAX(CASE WHEN  RNUM = 2 THEN  VIDEO_VAL END) AS  VIDEO_VAL_S
-		                       FROM (
-		                             SELECT A.DISPLOC_VAL AS GOODS_CD
-		                                  , B.VIDEO_GB 
-		                                  , B.VIDEO_VAL 
-		                                  , A.REG_DT 
-		                                  , RANK() OVER(PARTITION BY A.DISPLOC_VAL ORDER BY A.REG_DT ) RNUM 
-		                             FROM TB_VIDEO_DISPLOC  A
-		                             INNER JOIN  TB_VIDEO B ON A.VIDEO_SQ = B.VIDEO_SQ 
-		                                                    AND B.DISP_YN ='Y'
-		                             WHERE A.DISPLOC_GB ='G'
-		                             AND A.DISP_YN = 'Y'
-		                            ) V
-		                       ) V ON G.GOODS_CD = V.GOODS_CD
+		      LEFT OUTER JOIN TB_WISHLIST W ON G.GOODS_CD = W.GOODS_CD
+		                                    AND IFNULL(#{custNo}, 0) = W.CUST_NO
 		      WHERE NOW() BETWEEN A.DISP_STDT AND A.DISP_EDDT
 		      AND A.DISP_YN  = 'Y'
 		      AND A.LOOKBOOK_SQ = #{lookbookSq}
+
 		) Z
 	</select>
 
 	<!-- 다른 룩북 조회 -->
 	<select id="getOtherLookbookList" parameterType="Lookbook" resultType="Lookbook">
 		/* TscLookbook.getOtherLookbookList */
-		SELECT A.LOOKBOOK_SQ
-		     , A.BRAND_CD
-		     , A.TITLE
-		     , B.LOOKBOOKB_SQ
-		     , B.SYS_FILE_NM
-		FROM TB_LOOKBOOK A
-		INNER JOIN TB_LOOKBOOK_BANNER B ON A.LOOKBOOK_SQ = B.LOOKBOOK_SQ
-		                               AND B.DISP_YN = 'Y'
-		                            <if test='goodsCd != null and goodsCd != ""'>
-		                            	AND B.LOOKBOOKB_SQ IN (SELECT LOOKBOOKB_SQ FROM TB_LOOKBOOK_GOODS WHERE  GOODS_CD = #{goodsCd} AND DEL_YN  ='N')
-		                            </if>
-		                            <if test='brandCd != null and brandCd != ""'>
-		                            	AND A.BRAND_CD = #{brandCd}
-		                            </if>
-		                            <if test='mainDispYn != null and mainDispYn != ""'>
-		                            	AND A.MAIN_DISP_YN = #{mainDispYn}
-		                            </if>
-		WHERE NOW() BETWEEN A.DISP_STDT AND A.DISP_EDDT
-		AND A.DISP_YN  = 'Y'
-		AND A.LOOKBOOK_SQ <![CDATA[ <> ]]> #{lookbookSq}
-		<choose>
-			<when test='brandCd != null and brandCd != ""'>
-				ORDER BY B.LOOKBOOKB_SQ, A.DISP_ORD, B.DISP_ORD
-			</when>
-			<otherwise>
-				ORDER BY A.DISP_ORD, B.DISP_ORD
-			</otherwise>
-		</choose>
+		SELECT LOOKBOOK_SQ
+		     , BRAND_CD
+		     , TITLE
+		     , SYS_TNFILE_NM AS SYS_FILE_NM
+		FROM TB_LOOKBOOK
+		WHERE NOW() BETWEEN DISP_STDT AND DISP_EDDT
+		AND DISP_YN  = 'Y'
+		AND LOOKBOOK_SQ <![CDATA[ <> ]]> #{lookbookSq}
+		<if test='lookbookGb != null and lookbookGb == "BL"'>
+		     <if test='brandCd != null and brandCd != ""'>
+		AND BRAND_CD = #{brandCd}
+			 </if>
+		</if>
+		ORDER BY REG_DT DESC
 	</select>
 
 </mapper>