브랜드 홈/ 상품리스트 좌측 카테고리 수정

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

@@ -298,7 +298,7 @@ public class TsfDisplayService {
 	}
 
 	/**
-	 * 브랜드 카테고리 목록
+	 * 아울렛 카테고리 목록
 	 * @param brandGroupNo - 브랜드그룹번호
 	 * @return
 	 * @author gagamel
@@ -317,6 +317,25 @@ public class TsfDisplayService {
 		return this.getAllCategoryList(cate);
 	}
 
+	/**
+	 * 카테고리 목록
+	 * @param brandGroupNo - 브랜드그룹번호
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 4. 12
+	 */
+	@Cacheable(value = "cate", key = "'reloadCate-'.concat(#cateGb)")
+	public Collection<Cate1> getCategoryReloadList(String cateGb) {
+		Cate4Srch cate = new Cate4Srch();
+		cate.setSiteCd(TscConstants.Site.STYLE24.value()); // 사이트코드
+
+		cate.setCateGb(TsfConstants.CateGb.BYITEM.value());
+		cate.setCateType(TsfConstants.CateType.GOODS.value()); // 상품분류카테고리
+		cate.setSoldoutGoodsDispYn(envsetService.getSoldoutGoodsDisplayYn(TscConstants.Site.STYLE24.value()));
+
+		return this.getAllCategoryList(cate);
+	}
+
 	/**
 	 * 메인 레이아웃 목록
 	 * @param cateNo - 카테고리No

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

@@ -684,7 +684,20 @@ public class TsfDisplayController extends TsfBaseController {
 	}
 
 	/**
-	 * 카테고리 목록
+	 * 아울렛 카테고리 목록
+	 * @param
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 5. 3
+	 */
+	@GetMapping("/category/reload/list")
+	@ResponseBody
+	public Collection<Cate1> getCategoryReloadList(String cateGb) {
+		return displayService.getCategoryReloadList(cateGb);
+	}
+
+	/**
+	 * 아울렛 카테고리 목록
 	 * @param
 	 * @return
 	 * @author bin2107

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

@@ -1543,144 +1543,144 @@
 		/* TsfDisplay.getCategoryGoodsCount */
 		SELECT COUNT(*)
 		FROM   (
-		SELECT CASE WHEN BG.DISP_NM_LANG = 'EN' THEN
-		BG.BRAND_GROUP_ENM
-		ELSE
-		BG.BRAND_GROUP_KNM
-		END                  AS BRAND_GROUP_NM /*브랜드그룹명*/
-		, G.GOODS_CD                             /*상품코드*/
-		, G.GOODS_NM                             /*상품명*/
-		, G.GOODS_GB                             /*상품구분*/
-		, G.SELF_GOODS_YN                        /*자사상품여부*/
-		, G.FOREIGN_BUY_YN                       /*해외구매대행여부*/
-		, G.PARALLEL_IMPORT_YN                   /*병행수입여부*/
-		, G.ORDER_MADE_YN                        /*주문제작여부*/
-		, G.GOODS_TNM                            /*상품타이틀명*/
-		, G.MAIN_COLOR_CD                        /*대표색상코드*/
-		, G.LIST_PRICE                           /*정상가(최초판매가)*/
-		, CASE WHEN #{frontGb} = 'P' AND #{custGb} = 'G100_20' THEN GBP.STAFF_PC_CURR_PRICE
-		WHEN #{frontGb} = 'M' AND #{custGb} = 'G100_20' THEN GBP.STAFF_MO_CURR_PRICE
-		WHEN #{frontGb} = 'A' AND #{custGb} = 'G100_20' THEN GBP.STAFF_APP_CURR_PRICE
-		WHEN #{frontGb} = 'P' AND #{custGb} != 'G100_20' THEN GBP.PC_CURR_PRICE
-		WHEN #{frontGb} = 'M' AND #{custGb} != 'G100_20' THEN GBP.MO_CURR_PRICE
-		WHEN #{frontGb} = 'A' AND #{custGb} != 'G100_20' THEN GBP.APP_CURR_PRICE
-		ELSE G.CURR_PRICE
-		END                  AS CURR_PRICE     /*현재판매가*/
-		, G.MIN_ORD_AMT                          /*최소주문금액*/
-		, G.FORMAL_GB                            /*정상이월구분*/
-		, G.REG_DT                               /*등록일시*/
-		, GS.SELL_WEEK_QTY                       /*주간판매수량*/
-		, GS.REVIEW_REG_CNT                      /*리뷰등록건수*/
-		FROM   TB_CATE_4SRCH C4
-		INNER JOIN TB_CATE_GOODS CG ON C4.LEAF_CATE_NO = CG.CATE_NO
-		INNER JOIN TB_GOODS G ON CG.GOODS_CD = G.GOODS_CD
-		INNER JOIN TB_GOODS_STOCK S ON CG.GOODS_CD = S.GOODS_CD
-		INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
-		INNER JOIN TB_BRAND_GROUP BG ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
-		INNER JOIN TB_GOODS_SUMMARY GS ON CG.GOODS_CD = GS.GOODS_CD
-		LEFT OUTER JOIN TB_GOODS_BENEFIT_PRICE GBP ON CG.GOODS_CD = GBP.GOODS_CD
-		WHERE  C4.SITE_CD = #{siteCd}
-		AND    C4.CATE_GB = #{cateGb}
-		AND    C4.CATE_TYPE = 'G031_10' /*상품카테고리*/
+		    SELECT CASE WHEN BG.DISP_NM_LANG = 'EN' THEN
+		           BG.BRAND_GROUP_ENM
+		           ELSE
+		           BG.BRAND_GROUP_KNM
+		           END                  AS BRAND_GROUP_NM /*브랜드그룹명*/
+		           , G.GOODS_CD                             /*상품코드*/
+		           , G.GOODS_NM                             /*상품명*/
+		           , G.GOODS_GB                             /*상품구분*/
+		           , G.SELF_GOODS_YN                        /*자사상품여부*/
+		           , G.FOREIGN_BUY_YN                       /*해외구매대행여부*/
+		           , G.PARALLEL_IMPORT_YN                   /*병행수입여부*/
+		           , G.ORDER_MADE_YN                        /*주문제작여부*/
+		           , G.GOODS_TNM                            /*상품타이틀명*/
+		           , G.MAIN_COLOR_CD                        /*대표색상코드*/
+		           , G.LIST_PRICE                           /*정상가(최초판매가)*/
+		           , CASE WHEN #{frontGb} = 'P' AND #{custGb} = 'G100_20' THEN GBP.STAFF_PC_CURR_PRICE
+		           WHEN #{frontGb} = 'M' AND #{custGb} = 'G100_20' THEN GBP.STAFF_MO_CURR_PRICE
+		           WHEN #{frontGb} = 'A' AND #{custGb} = 'G100_20' THEN GBP.STAFF_APP_CURR_PRICE
+		           WHEN #{frontGb} = 'P' AND #{custGb} != 'G100_20' THEN GBP.PC_CURR_PRICE
+		           WHEN #{frontGb} = 'M' AND #{custGb} != 'G100_20' THEN GBP.MO_CURR_PRICE
+		           WHEN #{frontGb} = 'A' AND #{custGb} != 'G100_20' THEN GBP.APP_CURR_PRICE
+		           ELSE G.CURR_PRICE
+		           END                  AS CURR_PRICE     /*현재판매가*/
+		           , G.MIN_ORD_AMT                          /*최소주문금액*/
+		           , G.FORMAL_GB                            /*정상이월구분*/
+		           , G.REG_DT                               /*등록일시*/
+		           , GS.SELL_WEEK_QTY                       /*주간판매수량*/
+		           , GS.REVIEW_REG_CNT                      /*리뷰등록건수*/
+		    FROM   TB_CATE_4SRCH C4
+		    INNER JOIN TB_CATE_GOODS CG ON C4.LEAF_CATE_NO = CG.CATE_NO
+		    INNER JOIN TB_GOODS G ON CG.GOODS_CD = G.GOODS_CD
+		    INNER JOIN TB_GOODS_STOCK S ON CG.GOODS_CD = S.GOODS_CD
+		    INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
+		    INNER JOIN TB_BRAND_GROUP BG ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
+		    INNER JOIN TB_GOODS_SUMMARY GS ON CG.GOODS_CD = GS.GOODS_CD
+		    LEFT OUTER JOIN TB_GOODS_BENEFIT_PRICE GBP ON CG.GOODS_CD = GBP.GOODS_CD
+		    WHERE  C4.SITE_CD = #{siteCd}
+		    AND    C4.CATE_GB = #{cateGb}
+		    AND    C4.CATE_TYPE = 'G031_10' /*상품카테고리*/
 		<if test="cate1No != null and cate1No != ''">
-			AND    C4.CATE1_NO = #{cate1No}
+		    AND    C4.CATE1_NO = #{cate1No}
 		</if>
 		<if test="cate2No != null and cate2No != ''">
-			AND    C4.CATE2_NO = #{cate2No}
+		    AND    C4.CATE2_NO = #{cate2No}
 		</if>
 		<if test="cate3No != null and cate3No != ''">
-			AND    C4.CATE3_NO = #{cate3No}
+		    AND    C4.CATE3_NO = #{cate3No}
 		</if>
 		<if test="cate4No != null and cate4No != ''">
-			AND    C4.CATE4_NO = #{cate4No}
+		    AND    C4.CATE4_NO = #{cate4No}
 		</if>
 		<if test="cate5No != null and cate5No != ''">
-			AND    C4.CATE5_NO = #{cate5No}
+		    AND    C4.CATE5_NO = #{cate5No}
 		</if>
 		<choose>
-			<when test="brandGroupNo != null and brandGroupNo > 0">
-				AND    CG.BRAND_GROUP_NO = #{brandGroupNo}
-			</when>
-			<otherwise>
-				AND    CG.BRAND_GROUP_NO = 0 /*브랜드메인에서 접근한 것이 아니면*/
-			</otherwise>
+		    <when test="brandGroupNo != null and brandGroupNo > 0">
+		        AND    B.BRAND_GROUP_NO = #{brandGroupNo}
+		    </when>
+		    <otherwise>
+		        AND    CG.BRAND_GROUP_NO = 0 /*브랜드메인에서 접근한 것이 아니면*/
+		    </otherwise>
 		</choose>
 		<if test="formalGb != null and formalGb !=''">
-			AND    G.FORMAL_GB = #{formalGb}
+		    AND    G.FORMAL_GB = #{formalGb}
 		</if>
 		AND    G.GOODS_STAT = 'G008_90' /*승인완료상품*/
 		AND    G.SELF_MALL_YN = 'Y' /*몰노출상품*/
 		AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT /*유효한 판매기간*/
 		<if test="ageArr != null and ageArr.length > 0"> <!-- 연령대 -->
-			AND    G.AGE_GRP_CD IN
-			<foreach collection="agesArr" item="item" index="index"  open="(" close=")" separator=",">
-				#{item}
-			</foreach>
+		    AND    G.AGE_GRP_CD IN
+		    <foreach collection="agesArr" item="item" index="index"  open="(" close=")" separator=",">
+		        #{item}
+		    </foreach>
 		</if>
 		<if test="seasonArr != null and seasonArr.length > 0"> <!-- 시즌 -->
-			AND    G.SEASON_CD IN
-			<foreach collection="seasonArr" item="item" index="index"  open="(" close=")" separator=",">
-				#{item}
-			</foreach>
+		    AND    G.SEASON_CD IN
+		    <foreach collection="seasonArr" item="item" index="index"  open="(" close=")" separator=",">
+		        #{item}
+		    </foreach>
 		</if>
 		AND    S.STOCK_QTY > 0 /*재고있는 상품*/
 		AND    B.USE_YN = 'Y' /*사용하는 브랜드*/
 		AND    BG.USE_YN = 'Y' /*사용하는 브랜드그룹*/
 		<if test="brandGroupArr != null and brandGroupArr.length > 0">
-			AND    BG.BRAND_GROUP_NO IN
-			<foreach collection="brandGroupArr" item="item" index="index"  open="(" close=")" separator=",">
-				#{item}
-			</foreach>
+		    AND    BG.BRAND_GROUP_NO IN
+		    <foreach collection="brandGroupArr" item="item" index="index"  open="(" close=")" separator=",">
+		        #{item}
+		    </foreach>
 		</if>
 		<if test="unisex != null and unisex != ''">
-			AND    G.SEX_GB = #{unisex}
+		    AND    G.SEX_GB = #{unisex}
 		</if>
 		<if test='sizeArr != null and sizeArr.length > 0'>
-			AND    EXISTS (SELECT 1
-			FROM   TB_OPTION
-			WHERE  GOODS_CD = CG.GOODS_CD
-			AND    OPT_CD2 IN
-			<foreach collection="brandGroupArr" item="item" index="index"  open="(" close=")" separator=",">
-				#{item}
-			</foreach>
-			AND    DISP_YN = 'Y'
-			)
+		    AND    EXISTS (SELECT 1
+		    FROM   TB_OPTION
+		    WHERE  GOODS_CD = CG.GOODS_CD
+		    AND    OPT_CD2 IN
+		    <foreach collection="brandGroupArr" item="item" index="index"  open="(" close=")" separator=",">
+		    	#{item}
+		    </foreach>
+		    AND    DISP_YN = 'Y'
+		    )
 		</if>
 		<if test="colorArr != null and colorArr.length > 0">
-			AND    EXISTS (SELECT 1
-			FROM   TB_OPTION O
-			, TB_COLOR C
-			WHERE  O.GOODS_CD = G.GOODS_CD
-			AND    O.OPT_CD1 = C.COLOR_CD
-			AND    O.DISP_YN = 'Y'
-			AND    C.COLOR_GRP_CD IN
-			<foreach collection="colorArr" item="item" index="index"  open="(" close=")" separator=",">
-				#{item}
-			</foreach>
-			AND    C.USE_YN = 'Y' /*사용하는색상*/
-			AND    G.SELF_GOODS_YN = 'Y' /*자사상품만*/
-			)
+		    AND    EXISTS (SELECT 1
+		    FROM   TB_OPTION O
+		    , TB_COLOR C
+		    WHERE  O.GOODS_CD = G.GOODS_CD
+		    AND    O.OPT_CD1 = C.COLOR_CD
+		    AND    O.DISP_YN = 'Y'
+		    AND    C.COLOR_GRP_CD IN
+		    <foreach collection="colorArr" item="item" index="index"  open="(" close=")" separator=",">
+		    	#{item}
+		    </foreach>
+		    AND    C.USE_YN = 'Y' /*사용하는색상*/
+		    AND    G.SELF_GOODS_YN = 'Y' /*자사상품만*/
+		    )
 		</if>
 		<if test="newGoods != null and newGoods != ''">
-			AND    EXISTS (SELECT 1
-			FROM   TB_GOODS_BENEFIT
-			WHERE  GOODS_CD = G.GOODS_CD
-			AND    BENEFIT_GB = #{newGoods}
-			)
+		    AND    EXISTS (SELECT 1
+		    FROM   TB_GOODS_BENEFIT
+		    WHERE  GOODS_CD = G.GOODS_CD
+		    AND    BENEFIT_GB = #{newGoods}
+		    )
 		</if>
 		) G
 		WHERE  1 = 1
 		<if test="priceFrom != null and priceFrom != ''">
-			AND    G.CURR_PRICE <![CDATA[>=]]> #{priceFrom}
+		    AND    G.CURR_PRICE <![CDATA[>=]]> #{priceFrom}
 		</if>
 		<if test="priceTo != null and priceTo != ''">
-			AND    G.CURR_PRICE <![CDATA[<=]]> #{priceTo}
+		    AND    G.CURR_PRICE <![CDATA[<=]]> #{priceTo}
 		</if>
 		<if test="dcRateFrom != null and dcRateFrom != ''">
-			AND    ((IF(G.LIST_PRICE = 0,0,G.LIST_PRICE) - G.CURR_PRICE) / IF(G.LIST_PRICE = 0,0,G.LIST_PRICE) * 100) <![CDATA[>=]]> #{dcRateFrom}
+		    AND    ((IF(G.LIST_PRICE = 0,0,G.LIST_PRICE) - G.CURR_PRICE) / IF(G.LIST_PRICE = 0,0,G.LIST_PRICE) * 100) <![CDATA[>=]]> #{dcRateFrom}
 		</if>
 		<if test="dcRateTo != null and dcRateTo != ''">
-			AND    ((IF(G.LIST_PRICE = 0,0,G.LIST_PRICE) - G.CURR_PRICE) / IF(G.LIST_PRICE = 0,0,G.LIST_PRICE) * 100) <![CDATA[<=]]> #{dcRateTo}
+		    AND    ((IF(G.LIST_PRICE = 0,0,G.LIST_PRICE) - G.CURR_PRICE) / IF(G.LIST_PRICE = 0,0,G.LIST_PRICE) * 100) <![CDATA[<=]]> #{dcRateTo}
 		</if>
 	</select>
 
@@ -1688,314 +1688,314 @@
 	<select id="getCategoryGoodsList" parameterType="SearchEngine" resultType="SearchEngine">
 		/* TsfDisplay.getCategoryGoodsList */
 		WITH TAB_GOODS AS (
-		SELECT G.BRAND_GROUP_NM     /*브랜드그룹명*/
-		, G.GOODS_CD           /*상품코드*/
-		, G.GOODS_NM           /*상품명*/
-		, G.GOODS_GB           /*상품구분*/
-		, G.SELF_GOODS_YN      /*자사상품여부*/
-		, G.FOREIGN_BUY_YN     /*해외구매대행여부*/
-		, G.PARALLEL_IMPORT_YN /*병행수입여부*/
-		, G.ORDER_MADE_YN      /*주문제작여부*/
-		, G.GOODS_TNM          /*상품타이틀명*/
-		, G.MAIN_COLOR_CD      /*대표색상코드*/
-		, G.LIST_PRICE         /*정상가(최초판매가)*/
-		, G.CURR_PRICE         /*현재판매가*/
-		, G.FORMAL_GB          /*정상이월구분*/
-		, G.REG_DT             /*등록일시*/
-		, G.SELL_WEEK_QTY      /*주간판매수량*/
-		, G.REVIEW_REG_CNT     /*리뷰등록건수*/
-		FROM   (
-		SELECT CASE WHEN BG.DISP_NM_LANG = 'EN' THEN
-		BG.BRAND_GROUP_ENM
-		ELSE
-		BG.BRAND_GROUP_KNM
-		END                   AS BRAND_GROUP_NM /*브랜드그룹명*/
-		, G.GOODS_CD                              /*상품코드*/
-		, G.GOODS_NM                              /*상품명*/
-		, G.GOODS_GB                              /*상품구분*/
-		, G.SELF_GOODS_YN                         /*자사상품여부*/
-		, G.FOREIGN_BUY_YN                        /*해외구매대행여부*/
-		, G.PARALLEL_IMPORT_YN                    /*병행수입여부*/
-		, G.ORDER_MADE_YN                         /*주문제작여부*/
-		, G.GOODS_TNM                             /*상품타이틀명*/
-		, G.MAIN_COLOR_CD                         /*대표색상코드*/
-		, G.LIST_PRICE                            /*정상가(최초판매가)*/
-		, CASE WHEN #{frontGb} = 'P' AND #{custGb} = 'G100_20' THEN GBP.STAFF_PC_CURR_PRICE
-		WHEN #{frontGb} = 'M' AND #{custGb} = 'G100_20' THEN GBP.STAFF_MO_CURR_PRICE
-		WHEN #{frontGb} = 'A' AND #{custGb} = 'G100_20' THEN GBP.STAFF_APP_CURR_PRICE
-		WHEN #{frontGb} = 'P' AND #{custGb} != 'G100_20' THEN GBP.PC_CURR_PRICE
-		WHEN #{frontGb} = 'M' AND #{custGb} != 'G100_20' THEN GBP.MO_CURR_PRICE
-		WHEN #{frontGb} = 'A' AND #{custGb} != 'G100_20' THEN GBP.APP_CURR_PRICE
-		ELSE G.CURR_PRICE
-		END                   AS CURR_PRICE     /*현재판매가*/
-		, G.MIN_ORD_AMT                           /*최소주문금액*/
-		, G.FORMAL_GB                             /*정상이월구분*/
-		, G.REG_DT                                /*등록일시*/
-		, GS.SELL_WEEK_QTY                        /*주간판매수량*/
-		, GS.REVIEW_REG_CNT                       /*리뷰등록건수*/
-		FROM   TB_CATE_4SRCH C4
-		INNER JOIN TB_CATE_GOODS CG ON C4.LEAF_CATE_NO = CG.CATE_NO
-		INNER JOIN TB_GOODS G ON CG.GOODS_CD = G.GOODS_CD
-		INNER JOIN TB_GOODS_STOCK S ON CG.GOODS_CD = S.GOODS_CD
-		INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
-		INNER JOIN TB_BRAND_GROUP BG ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
-		INNER JOIN TB_GOODS_SUMMARY GS ON CG.GOODS_CD = GS.GOODS_CD
-		LEFT OUTER JOIN TB_GOODS_BENEFIT_PRICE GBP ON CG.GOODS_CD = GBP.GOODS_CD
-		WHERE  C4.SITE_CD = #{siteCd}
-		AND    C4.CATE_GB = #{cateGb}
-		AND    C4.CATE_TYPE = 'G031_10' /*상품카테고리*/
-		<if test="cate1No != null and cate1No != ''">
-			AND    C4.CATE1_NO = #{cate1No}
-		</if>
-		<if test="cate2No != null and cate2No != ''">
-			AND    C4.CATE2_NO = #{cate2No}
-		</if>
-		<if test="cate3No != null and cate3No != ''">
-			AND    C4.CATE3_NO = #{cate3No}
-		</if>
-		<if test="cate4No != null and cate4No != ''">
-			AND    C4.CATE4_NO = #{cate4No}
-		</if>
-		<if test="cate5No != null and cate5No != ''">
-			AND    C4.CATE5_NO = #{cate5No}
-		</if>
-		<choose>
-			<when test="brandGroupNo != null and brandGroupNo > 0">
-				AND    CG.BRAND_GROUP_NO = #{brandGroupNo}
-			</when>
-			<otherwise>
-				AND    CG.BRAND_GROUP_NO = 0 /*브랜드메인에서 접근한 것이 아니면*/
-			</otherwise>
-		</choose>
-		<if test="formalGb != null and formalGb !=''">
-			AND    G.FORMAL_GB = #{formalGb}
-		</if>
-		AND    G.GOODS_STAT = 'G008_90' /*승인완료상품*/
-		AND    G.SELF_MALL_YN = 'Y' /*몰노출상품*/
-		AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT /*유효한 판매기간*/
-		<if test="ageArr != null and ageArr.length > 0"> <!-- 연령대 -->
-			AND    G.AGE_GRP_CD IN
-			<foreach collection="agesArr" item="item" index="index"  open="(" close=")" separator=",">
-				#{item}
-			</foreach>
-		</if>
-		<if test="seasonArr != null and seasonArr.length > 0"> <!-- 시즌 -->
-			AND    G.SEASON_CD IN
-			<foreach collection="seasonArr" item="item" index="index"  open="(" close=")" separator=",">
-				#{item}
-			</foreach>
-		</if>
-		AND    S.STOCK_QTY > 0 /*재고있는 상품*/
-		AND    B.USE_YN = 'Y' /*사용하는 브랜드*/
-		AND    BG.USE_YN = 'Y' /*사용하는 브랜드그룹*/
-		<if test="brandGroupArr != null and brandGroupArr.length > 0">
-			AND    BG.BRAND_GROUP_NO IN
-			<foreach collection="brandGroupArr" item="item" index="index"  open="(" close=")" separator=",">
-				#{item}
-			</foreach>
-		</if>
-		<if test="unisex != null and unisex != ''">
-			AND    G.SEX_GB = #{unisex}
-		</if>
-		<if test='sizeArr != null and sizeArr.length > 0'>
-			AND    EXISTS (SELECT 1
-			FROM   TB_OPTION
-			WHERE  GOODS_CD = CG.GOODS_CD
-			AND    OPT_CD2 IN
-			<foreach collection="brandGroupArr" item="item" index="index"  open="(" close=")" separator=",">
-				#{item}
-			</foreach>
-			AND    DISP_YN = 'Y'
-			)
-		</if>
-		<if test="newGoods != null and newGoods != ''">
-			AND    EXISTS (SELECT 1
-			FROM   TB_GOODS_BENEFIT
-			WHERE  GOODS_CD = G.GOODS_CD
-			AND    BENEFIT_GB = #{newGoods}
-			)
-		</if>
-		) G
-		WHERE  1 = 1
-		<if test="priceFrom != null and priceFrom != ''">
-			AND    G.CURR_PRICE <![CDATA[>=]]> #{priceFrom}
-		</if>
-		<if test="priceTo != null and priceTo != ''">
-			AND    G.CURR_PRICE <![CDATA[<=]]> #{priceTo}
-		</if>
-		<if test="dcRateFrom != null and dcRateFrom != ''">
-			AND    ((IF(G.LIST_PRICE = 0,0,G.LIST_PRICE) - G.CURR_PRICE) / IF(G.LIST_PRICE = 0,0,G.LIST_PRICE) * 100) <![CDATA[>=]]> #{dcRateFrom}
-		</if>
-		<if test="dcRateTo != null and dcRateTo != ''">
-			AND    ((IF(G.LIST_PRICE = 0,0,G.LIST_PRICE) - G.CURR_PRICE) / IF(G.LIST_PRICE = 0,0,G.LIST_PRICE) * 100) <![CDATA[<=]]> #{dcRateTo}
-		</if>
+		      SELECT G.BRAND_GROUP_NM     /*브랜드그룹명*/
+		           , G.GOODS_CD           /*상품코드*/
+		           , G.GOODS_NM           /*상품명*/
+		           , G.GOODS_GB           /*상품구분*/
+		           , G.SELF_GOODS_YN      /*자사상품여부*/
+		           , G.FOREIGN_BUY_YN     /*해외구매대행여부*/
+		           , G.PARALLEL_IMPORT_YN /*병행수입여부*/
+		           , G.ORDER_MADE_YN      /*주문제작여부*/
+		           , G.GOODS_TNM          /*상품타이틀명*/
+		           , G.MAIN_COLOR_CD      /*대표색상코드*/
+		           , G.LIST_PRICE         /*정상가(최초판매가)*/
+		           , G.CURR_PRICE         /*현재판매가*/
+		           , G.FORMAL_GB          /*정상이월구분*/
+		           , G.REG_DT             /*등록일시*/
+		           , G.SELL_WEEK_QTY      /*주간판매수량*/
+		           , G.REVIEW_REG_CNT     /*리뷰등록건수*/
+		      FROM   (
+		         SELECT CASE WHEN BG.DISP_NM_LANG = 'EN' THEN
+		               BG.BRAND_GROUP_ENM
+		               ELSE
+		               BG.BRAND_GROUP_KNM
+		               END                   AS BRAND_GROUP_NM /*브랜드그룹명*/
+		               , G.GOODS_CD                              /*상품코드*/
+		               , G.GOODS_NM                              /*상품명*/
+		               , G.GOODS_GB                              /*상품구분*/
+		               , G.SELF_GOODS_YN                         /*자사상품여부*/
+		               , G.FOREIGN_BUY_YN                        /*해외구매대행여부*/
+		               , G.PARALLEL_IMPORT_YN                    /*병행수입여부*/
+		               , G.ORDER_MADE_YN                         /*주문제작여부*/
+		               , G.GOODS_TNM                             /*상품타이틀명*/
+		               , G.MAIN_COLOR_CD                         /*대표색상코드*/
+		               , G.LIST_PRICE                            /*정상가(최초판매가)*/
+		               , CASE WHEN #{frontGb} = 'P' AND #{custGb} = 'G100_20' THEN GBP.STAFF_PC_CURR_PRICE
+		                      WHEN #{frontGb} = 'M' AND #{custGb} = 'G100_20' THEN GBP.STAFF_MO_CURR_PRICE
+		                      WHEN #{frontGb} = 'A' AND #{custGb} = 'G100_20' THEN GBP.STAFF_APP_CURR_PRICE
+		                      WHEN #{frontGb} = 'P' AND #{custGb} != 'G100_20' THEN GBP.PC_CURR_PRICE
+		                      WHEN #{frontGb} = 'M' AND #{custGb} != 'G100_20' THEN GBP.MO_CURR_PRICE
+		                      WHEN #{frontGb} = 'A' AND #{custGb} != 'G100_20' THEN GBP.APP_CURR_PRICE
+		                      ELSE G.CURR_PRICE
+		                END                   AS CURR_PRICE     /*현재판매가*/
+		               , G.MIN_ORD_AMT                           /*최소주문금액*/
+		               , G.FORMAL_GB                             /*정상이월구분*/
+		               , G.REG_DT                                /*등록일시*/
+		               , GS.SELL_WEEK_QTY                        /*주간판매수량*/
+		               , GS.REVIEW_REG_CNT                       /*리뷰등록건수*/
+		         FROM   TB_CATE_4SRCH C4
+		         INNER JOIN TB_CATE_GOODS CG ON C4.LEAF_CATE_NO = CG.CATE_NO
+		         INNER JOIN TB_GOODS G ON CG.GOODS_CD = G.GOODS_CD
+		         INNER JOIN TB_GOODS_STOCK S ON CG.GOODS_CD = S.GOODS_CD
+		         INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
+		         INNER JOIN TB_BRAND_GROUP BG ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
+		         INNER JOIN TB_GOODS_SUMMARY GS ON CG.GOODS_CD = GS.GOODS_CD
+		         LEFT OUTER JOIN TB_GOODS_BENEFIT_PRICE GBP ON CG.GOODS_CD = GBP.GOODS_CD
+		         WHERE  C4.SITE_CD = #{siteCd}
+		         AND    C4.CATE_GB = #{cateGb}
+		         AND    C4.CATE_TYPE = 'G031_10' /*상품카테고리*/
+		        <if test="cate1No != null and cate1No != ''">
+		         AND    C4.CATE1_NO = #{cate1No}
+		        </if>
+		        <if test="cate2No != null and cate2No != ''">
+		         AND    C4.CATE2_NO = #{cate2No}
+		        </if>
+		        <if test="cate3No != null and cate3No != ''">
+		         AND    C4.CATE3_NO = #{cate3No}
+		        </if>
+		        <if test="cate4No != null and cate4No != ''">
+		         AND    C4.CATE4_NO = #{cate4No}
+		        </if>
+		        <if test="cate5No != null and cate5No != ''">
+		        AND    C4.CATE5_NO = #{cate5No}
+		        </if>
+		        <choose>
+		            <when test="brandGroupNo != null and brandGroupNo > 0">
+		                AND    B.BRAND_GROUP_NO = #{brandGroupNo}
+		            </when>
+		            <otherwise>
+		                AND    CG.BRAND_GROUP_NO = 0 /*브랜드메인에서 접근한 것이 아니면*/
+		            </otherwise>
+		        </choose>
+		        <if test="formalGb != null and formalGb !=''">
+		            AND    G.FORMAL_GB = #{formalGb}
+		        </if>
+		        AND    G.GOODS_STAT = 'G008_90' /*승인완료상품*/
+		        AND    G.SELF_MALL_YN = 'Y' /*몰노출상품*/
+		        AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT /*유효한 판매기간*/
+		        <if test="ageArr != null and ageArr.length > 0"> <!-- 연령대 -->
+		            AND    G.AGE_GRP_CD IN
+		            <foreach collection="agesArr" item="item" index="index"  open="(" close=")" separator=",">
+		                #{item}
+		            </foreach>
+		        </if>
+		        <if test="seasonArr != null and seasonArr.length > 0"> <!-- 시즌 -->
+		            AND    G.SEASON_CD IN
+		        <foreach collection="seasonArr" item="item" index="index"  open="(" close=")" separator=",">
+		                #{item}
+		            </foreach>
+		        </if>
+		        AND    S.STOCK_QTY > 0 /*재고있는 상품*/
+		        AND    B.USE_YN = 'Y' /*사용하는 브랜드*/
+		        AND    BG.USE_YN = 'Y' /*사용하는 브랜드그룹*/
+		        <if test="brandGroupArr != null and brandGroupArr.length > 0">
+		            AND    BG.BRAND_GROUP_NO IN
+		            <foreach collection="brandGroupArr" item="item" index="index"  open="(" close=")" separator=",">
+		                #{item}
+		            </foreach>
+		        </if>
+		        <if test="unisex != null and unisex != ''">
+		            AND    G.SEX_GB = #{unisex}
+		        </if>
+		        <if test='sizeArr != null and sizeArr.length > 0'>
+		            AND    EXISTS (SELECT 1
+		                           FROM   TB_OPTION
+		                           WHERE  GOODS_CD = CG.GOODS_CD
+		                           AND    OPT_CD2 IN
+		                           <foreach collection="brandGroupArr" item="item" index="index"  open="(" close=")" separator=",">
+		                               #{item}
+		                           </foreach>
+		                           AND    DISP_YN = 'Y'
+		                        )
+		        </if>
+		        <if test="newGoods != null and newGoods != ''">
+		            AND    EXISTS (SELECT 1
+		                           FROM   TB_GOODS_BENEFIT
+		                           WHERE  GOODS_CD = G.GOODS_CD
+		                           AND    BENEFIT_GB = #{newGoods}
+		                         )
+		        </if>
+		      ) G
+		      WHERE  1 = 1
+		      <if test="priceFrom != null and priceFrom != ''">
+		        AND    G.CURR_PRICE <![CDATA[>=]]> #{priceFrom}
+		      </if>
+		      <if test="priceTo != null and priceTo != ''">
+		        AND    G.CURR_PRICE <![CDATA[<=]]> #{priceTo}
+		      </if>
+		      <if test="dcRateFrom != null and dcRateFrom != ''">
+		        AND    ((IF(G.LIST_PRICE = 0,0,G.LIST_PRICE) - G.CURR_PRICE) / IF(G.LIST_PRICE = 0,0,G.LIST_PRICE) * 100) <![CDATA[>=]]> #{dcRateFrom}
+		      </if>
+		      <if test="dcRateTo != null and dcRateTo != ''">
+		        AND    ((IF(G.LIST_PRICE = 0,0,G.LIST_PRICE) - G.CURR_PRICE) / IF(G.LIST_PRICE = 0,0,G.LIST_PRICE) * 100) <![CDATA[<=]]> #{dcRateTo}
+		      </if>
 		)
 		, TAB_OPTION AS (
-		/* 자사상품 색상 목록 */
-		SELECT O.GOODS_CD
-		, O.OPT_CD1  AS MAIN_COLOR_CD
-		FROM   TAB_GOODS G
-		, TB_OPTION O
-		WHERE  G.GOODS_CD = O.GOODS_CD
-		AND    G.SELF_GOODS_YN = 'Y' /*자사상품만*/
-		<if test="colorArr != null and colorArr.length > 0"> <!-- 색상 -->
-			AND    O.OPT_CD1 IN (SELECT COLOR_CD
-			FROM   TB_COLOR
-			WHERE  1 = 1
-			AND    COLOR_GRP_CD IN
-			<foreach collection="colorArr" item="item" index="index"  open="(" close=")" separator=",">
-				#{item}
-			</foreach>
-			AND    USE_YN = 'Y' /*사용하는색상*/
-			)
-		</if>
-		AND    O.DISP_YN = 'Y'
-		GROUP  BY O.GOODS_CD, O.OPT_CD1
+		     /* 자사상품 색상 목록 */
+		     SELECT O.GOODS_CD
+		          , O.OPT_CD1  AS MAIN_COLOR_CD
+		     FROM   TAB_GOODS G
+		          , TB_OPTION O
+		     WHERE  G.GOODS_CD = O.GOODS_CD
+		     AND    G.SELF_GOODS_YN = 'Y' /*자사상품만*/
+		     <if test="colorArr != null and colorArr.length > 0"> <!-- 색상 -->
+		       AND    O.OPT_CD1 IN (SELECT COLOR_CD
+		                            FROM   TB_COLOR
+		                            WHERE  1 = 1
+		                            AND    COLOR_GRP_CD IN
+		                            <foreach collection="colorArr" item="item" index="index"  open="(" close=")" separator=",">
+		                            	#{item}
+		                            </foreach>
+		                            AND    USE_YN = 'Y' /*사용하는색상*/
+		                        )
+		     </if>
+		     AND    O.DISP_YN = 'Y'
+		     GROUP  BY O.GOODS_CD, O.OPT_CD1
 		)
 		, TAB_ALL_GOODS AS (
-		SELECT BRAND_GROUP_NM     /*브랜드그룹명*/
-		, GOODS_CD           /*상품코드*/
-		, GOODS_NM           /*상품명*/
-		, GOODS_GB           /*상품구분*/
-		, SELF_GOODS_YN      /*자사상품여부*/
-		, FOREIGN_BUY_YN     /*해외구매대행여부*/
-		, PARALLEL_IMPORT_YN /*병행수입여부*/
-		, ORDER_MADE_YN      /*주문제작여부*/
-		, GOODS_TNM          /*상품타이틀명*/
-		, MAIN_COLOR_CD      /*대표색상코드*/
-		, LIST_PRICE         /*정상가(최초판매가)*/
-		, CURR_PRICE         /*현재판매가*/
-		, FORMAL_GB          /*정상이월구분*/
-		, REG_DT             /*등록일시*/
-		, SELL_WEEK_QTY      /*주간판매수량*/
-		, REVIEW_REG_CNT     /*리뷰등록건수*/
-		, NUMB
-		FROM   (
-		SELECT G.BRAND_GROUP_NM                                         /*브랜드그룹명*/
-		, G.GOODS_CD                                               /*상품코드*/
-		, G.GOODS_NM                                               /*상품명*/
-		, G.GOODS_GB                                               /*상품구분*/
-		, G.SELF_GOODS_YN                                          /*자사상품여부*/
-		, G.FOREIGN_BUY_YN                                         /*해외구매대행여부*/
-		, G.PARALLEL_IMPORT_YN                                     /*병행수입여부*/
-		, G.ORDER_MADE_YN                                          /*주문제작여부*/
-		, G.GOODS_TNM                                              /*상품타이틀명*/
-		, IFNULL(O.MAIN_COLOR_CD,G.MAIN_COLOR_CD) AS MAIN_COLOR_CD /*대표색상코드*/
-		, G.LIST_PRICE                                             /*정상가(최초판매가)*/
-		, G.CURR_PRICE                                             /*현재판매가*/
-		, G.FORMAL_GB                                              /*정상이월구분*/
-		, G.REG_DT                                                 /*등록일시*/
-		, G.SELL_WEEK_QTY                                          /*주간판매수량*/
-		, G.REVIEW_REG_CNT                                         /*리뷰등록건수*/
-		<choose>
-			<when test="sortingType == 'BEST'"> <!-- 인기상품순 -->
-				, RANK() OVER(ORDER BY G.FORMAL_GB, G.SELL_WEEK_QTY DESC, G.GOODS_CD) AS NUMB
-			</when>
-			<when test="sortingType == 'REVIEW'"> <!-- 리뷰많은순 -->
-				, RANK() OVER(ORDER BY G.FORMAL_GB, G.REVIEW_REG_CNT DESC, G.GOODS_CD) AS NUMB
-			</when>
-			<otherwise> <!-- 최신상품순 -->
-				, RANK() OVER(ORDER BY G.FORMAL_GB, G.REG_DT DESC, G.GOODS_CD) AS NUMB
-			</otherwise>
-		</choose>
-		FROM   TAB_GOODS G
-		LEFT OUTER JOIN TAB_OPTION O ON G.GOODS_CD = O.GOODS_CD
-		) ORIGINAL
-		WHERE  1 = 1
-		<if test="pageable != null and pageable.endRow != null and pageable.endRow > 0">
-			AND    NUMB BETWEEN #{pageable.startRow} AND #{pageable.endRow}
-		</if>
+		          SELECT BRAND_GROUP_NM     /*브랜드그룹명*/
+		               , GOODS_CD           /*상품코드*/
+		               , GOODS_NM           /*상품명*/
+		               , GOODS_GB           /*상품구분*/
+		               , SELF_GOODS_YN      /*자사상품여부*/
+		               , FOREIGN_BUY_YN     /*해외구매대행여부*/
+		               , PARALLEL_IMPORT_YN /*병행수입여부*/
+		               , ORDER_MADE_YN      /*주문제작여부*/
+		               , GOODS_TNM          /*상품타이틀명*/
+		               , MAIN_COLOR_CD      /*대표색상코드*/
+		               , LIST_PRICE         /*정상가(최초판매가)*/
+		               , CURR_PRICE         /*현재판매가*/
+		               , FORMAL_GB          /*정상이월구분*/
+		               , REG_DT             /*등록일시*/
+		               , SELL_WEEK_QTY      /*주간판매수량*/
+		               , REVIEW_REG_CNT     /*리뷰등록건수*/
+		               , NUMB
+		          FROM   (
+		                SELECT G.BRAND_GROUP_NM                                         /*브랜드그룹명*/
+		                     , G.GOODS_CD                                               /*상품코드*/
+		                     , G.GOODS_NM                                               /*상품명*/
+		                     , G.GOODS_GB                                               /*상품구분*/
+		                     , G.SELF_GOODS_YN                                          /*자사상품여부*/
+		                     , G.FOREIGN_BUY_YN                                         /*해외구매대행여부*/
+		                     , G.PARALLEL_IMPORT_YN                                     /*병행수입여부*/
+		                     , G.ORDER_MADE_YN                                          /*주문제작여부*/
+		                     , G.GOODS_TNM                                              /*상품타이틀명*/
+		                     , IFNULL(O.MAIN_COLOR_CD,G.MAIN_COLOR_CD) AS MAIN_COLOR_CD /*대표색상코드*/
+		                     , G.LIST_PRICE                                             /*정상가(최초판매가)*/
+		                     , G.CURR_PRICE                                             /*현재판매가*/
+		                     , G.FORMAL_GB                                              /*정상이월구분*/
+		                     , G.REG_DT                                                 /*등록일시*/
+		                     , G.SELL_WEEK_QTY                                          /*주간판매수량*/
+		                     , G.REVIEW_REG_CNT                                         /*리뷰등록건수*/
+		                <choose>
+		                    <when test="sortingType == 'BEST'"> <!-- 인기상품순 -->
+		                        , ROW_NUMBER() OVER(ORDER BY G.FORMAL_GB, G.SELL_WEEK_QTY DESC, G.GOODS_CD) AS NUMB
+		                    </when>
+		                    <when test="sortingType == 'REVIEW'"> <!-- 리뷰많은순 -->
+		                        , ROW_NUMBER() OVER(ORDER BY G.FORMAL_GB, G.REVIEW_REG_CNT DESC, G.GOODS_CD) AS NUMB
+		                    </when>
+		                    <otherwise> <!-- 최신상품순 -->
+		                        , ROW_NUMBER() OVER(ORDER BY G.FORMAL_GB, G.REG_DT DESC, G.GOODS_CD) AS NUMB
+		                    </otherwise>
+		                </choose>
+		                FROM   TAB_GOODS G
+		                LEFT OUTER JOIN TAB_OPTION O ON G.GOODS_CD = O.GOODS_CD
+		        ) ORIGINAL
+		        WHERE  1 = 1
+		        <if test="pageable != null and pageable.endRow != null and pageable.endRow > 0">
+		        AND    NUMB BETWEEN #{pageable.startRow} AND #{pageable.endRow}
+		        </if>
 		)
 		, TAB_GOODS_IMG AS (
-		/* 상품의 이미지 */
-		SELECT GOODS_CD
-		, MAX(SYS_IMG_NM)  AS SYS_IMG_NM
-		, MAX(SYS_IMG_NM2) AS SYS_IMG_NM2
-		FROM   (
-		SELECT G.GOODS_CD
-		, CASE WHEN GI.DEFAULT_IMG_YN = 'Y' THEN GI.SYS_IMG_NM ELSE NULL END   AS SYS_IMG_NM
-		, CASE WHEN GI.MOUSEOVER_IMG_YN = 'Y' THEN GI.SYS_IMG_NM ELSE NULL END AS SYS_IMG_NM2
-		FROM   TAB_ALL_GOODS G
-		, TB_GOODS_IMG GI
-		WHERE  G.GOODS_CD = GI.GOODS_CD
-		AND    G.MAIN_COLOR_CD = GI.COLOR_CD
-		) Z
-		GROUP  BY GOODS_CD
+		        /* 상품의 이미지 */
+		        SELECT GOODS_CD
+		        , MAX(SYS_IMG_NM)  AS SYS_IMG_NM
+		        , MAX(SYS_IMG_NM2) AS SYS_IMG_NM2
+		        FROM   (
+		              SELECT G.GOODS_CD
+		              , CASE WHEN GI.DEFAULT_IMG_YN = 'Y' THEN GI.SYS_IMG_NM ELSE NULL END   AS SYS_IMG_NM
+		              , CASE WHEN GI.MOUSEOVER_IMG_YN = 'Y' THEN GI.SYS_IMG_NM ELSE NULL END AS SYS_IMG_NM2
+		              FROM   TAB_ALL_GOODS G
+		              , TB_GOODS_IMG GI
+		              WHERE  G.GOODS_CD = GI.GOODS_CD
+		              AND    G.MAIN_COLOR_CD = GI.COLOR_CD
+		        ) Z
+		        GROUP  BY GOODS_CD
 		)
 		SELECT G.BRAND_GROUP_NM
-		, G.GOODS_CD
-		, FN_GET_GOODS_NM(G.GOODS_NM,G.GOODS_GB,G.FOREIGN_BUY_YN,G.PARALLEL_IMPORT_YN,G.ORDER_MADE_YN) AS GOODS_FULL_NM /*상품FULL명*/
-		, G.GOODS_TNM
-		, G.MAIN_COLOR_CD
-		, G.LIST_PRICE
-		, G.CURR_PRICE
-		, GI.SYS_IMG_NM
-		, GI.SYS_IMG_NM2
-		, (
-		SELECT GROUP_CONCAT(CONCAT(VIDEO_GB,':',KMC_KEY) ORDER BY NUMB SEPARATOR ',')
-		FROM   (
-		SELECT GV.VIDEO_GB
-		, GV.KMC_KEY
-		, GV.REG_DT
-		, RANK() OVER(ORDER BY GV.REG_DT, GV.KMC_KEY) AS NUMB
-		FROM   TB_GOODS_VIDEO GV
-		WHERE  GV.GOODS_CD = G.GOODS_CD
-		AND    GV.DISP_YN = 'Y'
-		AND    GV.KMC_KEY IS NOT NULL
-		) Z
-		WHERE  NUMB <![CDATA[<=]]> 2
+		      , G.GOODS_CD
+		      , FN_GET_GOODS_NM(G.GOODS_NM,G.GOODS_GB,G.FOREIGN_BUY_YN,G.PARALLEL_IMPORT_YN,G.ORDER_MADE_YN) AS GOODS_FULL_NM /*상품FULL명*/
+		      , G.GOODS_TNM
+		      , G.MAIN_COLOR_CD
+		      , G.LIST_PRICE
+		      , G.CURR_PRICE
+		      , GI.SYS_IMG_NM
+		      , GI.SYS_IMG_NM2
+		      , (
+		      SELECT GROUP_CONCAT(CONCAT(VIDEO_GB,':',KMC_KEY) ORDER BY NUMB SEPARATOR ',')
+		      FROM   (
+		             SELECT GV.VIDEO_GB
+		             , GV.KMC_KEY
+		             , GV.REG_DT
+		             , RANK() OVER(ORDER BY GV.REG_DT, GV.KMC_KEY) AS NUMB
+		             FROM   TB_GOODS_VIDEO GV
+		             WHERE  GV.GOODS_CD = G.GOODS_CD
+		             AND    GV.DISP_YN = 'Y'
+		             AND    GV.KMC_KEY IS NOT NULL
+		            ) Z
+		      WHERE  NUMB <![CDATA[<=]]> 2
 		) AS VIDEOS
 		, (
-		SELECT GROUP_CONCAT(DISTINCT CONCAT(C.COLOR_CD,':',CC.CD_DESC) ORDER BY CC.DISP_ORD SEPARATOR ',') AS COLOR_CHIPS
-		FROM   TB_OPTION O
-		, TB_COLOR C
-		, TB_COMMON_CODE CC
-		WHERE  O.OPT_CD1 = C.COLOR_CD
-		AND    C.COLOR_GRP_CD = CC.CD
-		AND    O.GOODS_CD = G.GOODS_CD
-		AND    O.DISP_YN = 'Y'
-		AND    C.USE_YN = 'Y'
-		AND    CC.USE_YN = 'Y'
+		     SELECT GROUP_CONCAT(DISTINCT CONCAT(C.COLOR_CD,':',CC.CD_DESC) ORDER BY CC.DISP_ORD SEPARATOR ',') AS COLOR_CHIPS
+		     FROM   TB_OPTION O
+		     , TB_COLOR C
+		     , TB_COMMON_CODE CC
+		     WHERE  O.OPT_CD1 = C.COLOR_CD
+		     AND    C.COLOR_GRP_CD = CC.CD
+		     AND    O.GOODS_CD = G.GOODS_CD
+		     AND    O.DISP_YN = 'Y'
+		     AND    C.USE_YN = 'Y'
+		     AND    CC.USE_YN = 'Y'
 		) AS COLOR_CHIPS /*컬러칩*/
 		, (
-		SELECT GROUP_CONCAT(DISTINCT CONCAT(OPT_CD2 ,':' ,CASE WHEN SOLDOUT_YN = 'Y' THEN 'Y'
-		ELSE CASE WHEN CURR_STOCK_QTY - BASE_STOCK_QTY > 0 THEN 'N' ELSE 'Y' END
-		END) ORDER BY DISP_ORD SEPARATOR ',') AS SIZES
-		FROM   VW_STOCK
-		WHERE  GOODS_CD = G.GOODS_CD
-		AND    OPT_CD1 = G.MAIN_COLOR_CD
-		AND    DISP_YN = 'Y'
+		     SELECT GROUP_CONCAT(DISTINCT CONCAT(OPT_CD2 ,':' ,CASE WHEN SOLDOUT_YN = 'Y' THEN 'Y'
+		     ELSE CASE WHEN CURR_STOCK_QTY - BASE_STOCK_QTY > 0 THEN 'N' ELSE 'Y' END
+		     END) ORDER BY DISP_ORD SEPARATOR ',') AS SIZES
+		     FROM   VW_STOCK
+		     WHERE  GOODS_CD = G.GOODS_CD
+		     AND    OPT_CD1 = G.MAIN_COLOR_CD
+		     AND    DISP_YN = 'Y'
 		) AS SIZES /*사이즈*/
 		, (
-		SELECT GROUP_CONCAT(CONCAT(BENEFIT_GB,':',BENEFIT_NM) ORDER BY NUMB SEPARATOR ',')
-		FROM   (
-		SELECT GB.BENEFIT_GB
-		, CASE WHEN GB.BENEFIT_GB = '10' THEN '쿠폰할인'
-		WHEN GB.BENEFIT_GB = '20' THEN '무료배송'
-		WHEN GB.BENEFIT_GB = '30' THEN '사은품'
-		WHEN GB.BENEFIT_GB = '40' THEN '신상'
-		ELSE '총알배송' END AS BENEFIT_NM
-		, RANK() OVER(ORDER BY GB.BENEFIT_GB, GB.GOODS_CD) AS NUMB
-		FROM   TB_GOODS_BENEFIT GB
-		WHERE  GB.GOODS_CD = G.GOODS_CD
-		) Z
+		    SELECT GROUP_CONCAT(CONCAT(BENEFIT_GB,':',BENEFIT_NM) ORDER BY NUMB SEPARATOR ',')
+		    FROM   (
+		            SELECT GB.BENEFIT_GB
+		            , CASE WHEN GB.BENEFIT_GB = '10' THEN '쿠폰할인'
+		            WHEN GB.BENEFIT_GB = '20' THEN '무료배송'
+		            WHEN GB.BENEFIT_GB = '30' THEN '사은품'
+		            WHEN GB.BENEFIT_GB = '40' THEN '신상'
+		            ELSE '총알배송' END AS BENEFIT_NM
+		            , RANK() OVER(ORDER BY GB.BENEFIT_GB, GB.GOODS_CD) AS NUMB
+		            FROM   TB_GOODS_BENEFIT GB
+		            WHERE  GB.GOODS_CD = G.GOODS_CD
+		    ) Z
 		) AS BENEFITS
 		, G.FORMAL_GB
 		, G.REG_DT
 		, G.NUMB
 		<choose>
-			<when test="custNo != null and custNo > 0"> <!-- 로그인 했으면 -->
-				, IF(W.GOODS_CD IS NULL,'','likeit')                                                           AS LIKE_IT       /*위시리스트담긴상품*/
-			</when>
-			<otherwise>
-				, ''                                                                                           AS LIKE_IT       /*위시리스트담긴상품*/
-			</otherwise>
+		    <when test="custNo != null and custNo > 0"> <!-- 로그인 했으면 -->
+		        , IF(W.GOODS_CD IS NULL,'','likeit')                                                           AS LIKE_IT       /*위시리스트담긴상품*/
+		    </when>
+		    <otherwise>
+		        , ''                                                                                           AS LIKE_IT       /*위시리스트담긴상품*/
+		    </otherwise>
 		</choose>
 		FROM   TAB_ALL_GOODS G
 		LEFT OUTER JOIN TAB_GOODS_IMG GI ON G.GOODS_CD = GI.GOODS_CD
 		<if test="custNo != null and custNo > 0"> <!-- 로그인 했으면 -->
-			LEFT OUTER JOIN TB_WISHLIST W ON G.GOODS_CD = W.GOODS_CD
-			AND    W.CUST_NO = #{custNo}
+		    LEFT OUTER JOIN TB_WISHLIST W ON G.GOODS_CD = W.GOODS_CD
+		    AND    W.CUST_NO = #{custNo}
 		</if>
 	</select>
 	

src/main/webapp/WEB-INF/views/web/common/fragments/BrandGnbWeb.html

@@ -27,7 +27,7 @@
 				</a>
 			</div>
 			<div class="util_group">
-				<span><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN);" title="STYLE24 홈화면 바로가기"><b>STYLE24</b></a></span>
+				<span><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN);" title="STYLE24 홈화면 바로가기"><b>STYLE24 홈</b></a></span>
 				<span th:if="${sessionInfo == null}"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_LOGIN);" title="로그인 바로가기">로그인</a></span>
 				<span th:if="${sessionInfo != null}"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_LOGOUT);" title="로그아웃">로그아웃</a></span>
 				<span th:if="${sessionInfo == null}"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_CUSTOMER_JOIN_TYPE);" title="회원가입 바로가기">회원가입</a></span>

src/main/webapp/WEB-INF/views/web/display/BrandMainFormWeb.html

@@ -76,9 +76,11 @@
 									<a th:if="${ContentsData.contentsType=='SELF'}" th:href="${ContentsData.strVar1}" target="_self">브랜드 사이트</a>
 									<a th:unless="${ContentsData.contentsType=='SELF'}" th:href="${ContentsData.strVar1}" target="_blank">브랜드 사이트</a>
 								</div>
-								<div class="brand_desc">
+								<div class="brand_desc" id="brandDesc">
 									<p class="cate" th:text="${ContentsData.strTitle1}"></p>
-									<p class="desc" th:text="${ContentsData.subText1}"></p>
+									<p class="desc" > <!--th:text="${ContentsData.subText1}"-->
+										<input type="hidden" name="brandNote" th:value="${ContentsData.subText1}"/>
+									</p>
 								</div>
 							</div>
 						</div>
@@ -685,18 +687,36 @@ $(document).ready( function() {
 	// 브랜드메인 배너 <br> 처리
 	$('.bMainTitle').each(function (){
 		let tag = '';
-		var brText = $(this).find("input[name=mainTitle]").val();
-
+		var brText = $(this).find("input[name=mainTitle]").val().replaceAll("<BR>", "<br>").replaceAll("<bR>", "<br>").replaceAll("<Br>", "<br>").replaceAll("<br/>", "<br>");
 		if(brText.indexOf('<br>') > -1){
 			var reText = brText.split("<br>");
+			tag += '</dd>';
 			tag += reText[0];
-			tag += '<br>';
+			// tag += '<br>';
+			tag += '<dd>';
 			tag += reText[1];
 		}else{
 			tag += brText;
 		}
 		$(this).append(tag);
 	});
+
+	// 브랜드소개 <br> 처리
+	var brandDesc = $("#brandDesc").find("input[name=brandNote]").val().replaceAll("<BR>", "<br>").replaceAll("<bR>", "<br>").replaceAll("<Br>", "<br>");
+	if(!gagajf.isNull(brandDesc)){
+		if(brandDesc.indexOf('<br>') > -1){
+			let tag = '';
+			var reText = brandDesc.split("<br>");
+			tag += reText[0];
+			tag += '<br>';
+			tag += reText[1];
+			$("#brandDesc .desc").append(tag);
+		}else{
+			let tag = '';
+			tag += brandDesc;
+			$("#brandDesc .desc").append(tag);
+		}
+	}
 });
 /*]]>*/
 </script>

src/main/webapp/WEB-INF/views/web/display/CategoryGoodsListFormWeb.html

@@ -23,6 +23,7 @@
 		<div class="breadcrumb">
 			<ul id="navArea">
 				<li class="bread_home" id="idHome"><a href="javascript:void(0);" id="navHome">홈</a></li>
+				<li class="bread_2depth" id="brandNm" style="display: none;"></li>
 				<li class="bread_2depth" id="navNm"></li>
 			</ul>
 		</div>
@@ -79,7 +80,7 @@
 										<input id="unisex" type="checkbox" onclick="fnFilterOption(this,'on');"><label for="unisex"> <span>남여 공용만 보기</span> </label>
 									</div>
 									<div>
-										<input id="newGoods" type="checkbox" onclick="fnFilterOption(this,'on');"><label for="newGoods"> <span>신상품만 보기</span> </label>
+										<input id="newGoods" type="checkbox" onclick="fnFilterOption(this,'off');" checked="checked"><label for="newGoods"> <span>신상품만 보기</span> </label>
 									</div>
 								</div>
 							</div>
@@ -292,6 +293,7 @@
 		<input type="hidden" name="cate3No" th:value="${cateInfo.cate3No}"/>
 		<input type="hidden" name="cate4No" th:value="${cateInfo.cate4No}"/>
 		<input type="hidden" name="sortingType" value="NEW"/>
+		<input type="hidden" name="newGoods" value="40"/>
 	</form>
 
 	<script src="/ux/plugins/gaga/gaga.infinite.scrollSession.js"></script>
@@ -303,6 +305,11 @@
 		var custom_values = [];
 		var custom_values02  = [];
 		var currUrl = document.location.href;
+		var brandGroupInfo =  [[${brandGroupInfo}]];
+		var brandGroupNm = '';
+		if(!gagajf.isNull(brandGroupInfo)){
+			brandGroupNm = brandGroupInfo.brandGroupNm;
+		}
 
 		// 컨텐츠 호출
 		$(document).ready( function() {
@@ -490,8 +497,7 @@
 				if( [[${cateInfo.formalGb}]] == 'G009_20'){
 					actionUrl = '/display/outlet/cate/list?cate1No='+cate1No+'&formalGb='+ [[${cateInfo.formalGb}]];
 				}else{
-					actionUrl = '/display/gnb/tab/list';
-					//actionUrl = '/display/category/cate/list?cate1No='+cate1No+'&formalGb=';
+					actionUrl = '/display/category/reload/list?cateGb='+[[${cateInfo.cateGb}]];
 				}
 			}else{
 				actionUrl = '/display/brand/cate/list?brandGroupNo=' + [[${cateInfo.brandGroupNo}]];
@@ -502,36 +508,37 @@
 					//if (status == 'success') {
 					if (result.length > 0) {
 						let formalGb = [[${cateInfo.formalGb}]];
+						if(formalGb == 'G009_10'){
+							formalGb = '';
+						}
 						let cateGb = 'G032_101';
 						let navNm = '';
 						$('#ulAllCate').html('');
-						if(formalGb=='G009_20'){
-							$("#navNm").hide();
-							$('#ulAllCate').append('<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(0,\''+cateGb+'\',\'\',\'\',\'\',\'\',\'\',\''+formalGb+'\');">전체</a></li>\n');
-							navNm += '<li class="bread_2depth" id="navNm">아울렛</li><li class="bread_2depth" id="navNm1">전체</li>';
-						}else{
+						if(brandGroupNo>0) {
+							$("#brandNm").show();
+							$("#brandNm").text(brandGroupNm);
 							$("#navNm").hide();
-							$('#ulAllCate').append('<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(0,\''+cateGb+'\');">전체</a></li>\n');
+							$('#ulAllCate').append('<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(\''+brandGroupNo+'\',\''+cateGb+'\');">전체</a></li>\n');
 							navNm += '<li class="bread_2depth" id="navNm1">전체</li>';
+						}else{
+							if(formalGb=='G009_20'){
+								$("#navNm").hide();
+								$('#ulAllCate').append('<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(0,\''+cateGb+'\',\'\',\'\',\'\',\'\',\'\',\''+formalGb+'\');">전체</a></li>\n');
+								navNm += '<li class="bread_2depth" id="navNm">아울렛</li><li class="bread_2depth" id="navNm1">전체</li>';
+							}else{
+								$("#navNm").hide();
+								$('#ulAllCate').append('<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(0,\''+cateGb+'\');">전체</a></li>\n');
+								navNm += '<li class="bread_2depth" id="navNm1">전체</li>';
+							}
 						}
-						
+
 						if(gagajf.isNull($("#searchGoodsForm").find("[name=cate1No]").val())){
 							$("#navArea").append(navNm);
 							$("#formTitle").text('전체');
 						}
 
 						let allCate = [[${cateList}]];
-						if(gagajf.isNull(brandGroupNo) || brandGroupNo == 0){
-							$.each(result, function(idx, item) {
-								// if (allCateItem.contentsType == 'C') { // 컨텐츠유형:카테고리
-									$.each(allCate, function(allCateIdx, allCateItem) {
-										if (item.cate1No == allCateItem.cate1No) {
-											$('#ulAllCate').append(fnGetCategoryList(item));
-										}
-									});
-								// }
-							});
-						}else{
+						if(brandGroupNo > 0){
 							$.each(result, function(idx, item) {
 								$.each(allCate, function(brandCateIdx, brandCateItem) {
 									if (item.cate1No == brandCateItem.cate1No) {
@@ -539,6 +546,24 @@
 									}
 								});
 							});
+						}else{
+							if(formalGb == 'G009_20'){
+								$.each(result, function(idx, item) {
+									$.each(allCate, function(allCateIdx, allCateItem) {
+										if (item.cate1No == allCateItem.cate1No) {
+											$('#ulAllCate').append(fnGetCategoryList(item));
+										}
+									});
+								});
+							}else{
+								$.each(result, function(idx, item) {
+									$.each(allCate, function(allCateIdx, allCateItem) {
+										if (item.cate1No == allCateItem.cate1No) {
+											$('#ulAllCate').append(fnGetCategoryList(item));
+										}
+									});
+								});
+							}
 						}
 					}
 					//}
@@ -557,8 +582,6 @@
 			var navNm = "";
 			var formTitle = "";
 			let tag = '';
-			
-			console.log('cate1No>>>'+cate1No);
 		
 			if(cate1 != null){
 				tag += '<li';
@@ -583,10 +606,14 @@
 					$("#navNm").hide();
 				}
 				tag += '	onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + cate1.cate1No + ');" >' + cate1.cate1Nm + '</a>\n';
-				
-				
+
 				if (cate1.leafYn == 'N' && cate1.cate2List.length > 0) {
-					tag += '<div class="sub_cate" style="display: block;">\n';
+					if (cate1.cate1No == cate1No) {
+						tag += '<div class="sub_cate" style="display: block;">\n';
+					}else{
+						tag += '<div class="sub_cate">\n';
+					}
+
 					tag += '	<ul>\n';
 					$.each(cate1.cate2List, function (idx2, cate2) {
 						tag += '		<li';

src/main/webapp/WEB-INF/views/web/display/MallMainFormWeb.html

@@ -1296,7 +1296,7 @@ $(document).ready(function() {
 	// 몰메인 <br> 태그
 	$('.mainTitle').each(function (){
 		let tag = '';
-		var brText = $(this).find("input[name=mainTitlee]").val().replace("<BR>", "<br>").replace("<bR>", "<br>").replace("<Br>", "<br>");
+		var brText = $(this).find("input[name=mainTitlee]").val().replaceAll("<BR>", "<br>").replaceAll("<bR>", "<br>").replaceAll("<Br>", "<br>");
 		if(brText.indexOf('<br>') > -1){
 			var reText = brText.split("<br>");
 			tag += '</dd>';
@@ -1312,7 +1312,7 @@ $(document).ready(function() {
 	// 가로긴배너 슬라이드
 	$('.silderBannerArea').each(function (){
 		let tag = '';
-		var noteText = $(this).find("input[name=bannerNote]").val().replace("<BR>", "<br>").replace("<bR>", "<br>").replace("<Br>", "<br>");
+		var noteText = $(this).find("input[name=bannerNote]").val().replaceAll("<BR>", "<br>").replaceAll("<bR>", "<br>").replaceAll("<Br>", "<br>");
 		if(noteText.indexOf('<br>') > -1){
 			var reText = noteText.split("<br>");
 			tag += reText[0];
@@ -1328,8 +1328,8 @@ $(document).ready(function() {
 	$('.styleArea').each(function (){
 		let tag = '';
 		let tag2 = '';
-		var titleText = $(this).find("input[name=styleTitle]").val().replace("<BR>", "<br>").replace("<bR>", "<br>").replace("<Br>", "<br>");
-		var noteText = $(this).find("input[name=styleNote]").val().replace("<BR>", "<br>").replace("<bR>", "<br>").replace("<Br>", "<br>");
+		var titleText = $(this).find("input[name=styleTitle]").val().replaceAll("<BR>", "<br>").replaceAll("<bR>", "<br>").replaceAll("<Br>", "<br>");
+		var noteText = $(this).find("input[name=styleNote]").val().replaceAll("<BR>", "<br>").replaceAll("<bR>", "<br>").replaceAll("<Br>", "<br>");
 
 		if(titleText.indexOf('<br>') > -1){
 			var reText = titleText.split("<br>");
@@ -1354,7 +1354,7 @@ $(document).ready(function() {
 	});
 
 	// 잇아이템 <br> 태그
-	var id004Text = $("#id004").find("input[name=title]").val().replace("<BR>", "<br>").replace("<bR>", "<br>").replace("<Br>", "<br>");
+	var id004Text = $("#id004").find("input[name=title]").val().replaceAll("<BR>", "<br>").replaceAll("<bR>", "<br>").replaceAll("<Br>", "<br>");
 	if(id004Text.indexOf('<br>') > -1){
 		let tag = '';
 		var reText = id004Text.split("<br>");
@@ -1369,7 +1369,7 @@ $(document).ready(function() {
 	}
 
 	// 핫딜 <br> 태그
-	var id006Text = $("#id006").find("input[name=title]").val().replace("<BR>", "<br>").replace("<bR>", "<br>").replace("<Br>", "<br>");
+	var id006Text = $("#id006").find("input[name=title]").val().replaceAll("<BR>", "<br>").replaceAll("<bR>", "<br>").replaceAll("<Br>", "<br>");
 	if(!gagajf.isNull(id006Text)){
 		if(id006Text.indexOf('<br>') > -1){
 			let tag = '';
@@ -1388,7 +1388,7 @@ $(document).ready(function() {
 	// 브랜드픽 <br> 태그
 	$('#id007 .title').each(function (){
 		let tag = '';
-		var brText = $(this).find("input[name=title]").val().replace("<BR>", "<br>").replace("<bR>", "<br>").replace("<Br>", "<br>");
+		var brText = $(this).find("input[name=title]").val().replaceAll("<BR>", "<br>").replaceAll("<bR>", "<br>").replaceAll("<Br>", "<br>");
 
 		if(brText.indexOf('<br>') > -1){
 			var reText = brText.split("<br>");

src/main/webapp/biz/goods.js

@@ -267,8 +267,8 @@ var fnCreateGoodsList = function(result, ithrCd, contentLoc, goodsUrl, lastPage,
 		}
 		tag += '			</div>';
 
-		if(!gagajf.isNull(item.icon)){
-			var iconArr = item.icon.split(",");
+		if(!gagajf.isNull(item.benefits)){
+			var iconArr = item.benefits.split(",");
 			var iconGb = '';
 			var iconNm = '';
 			tag += '	<p class="itemBadge">';