몰메인 속도개선 테스트

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

@@ -536,4 +536,12 @@ public interface TsfGoodsDao {
 	Collection<GoodsStock> getProductNoByGoodsColor(Goods goods);
 	
 
+	/**
+	 * 컨텐츠카테고리상품 목록
+	 * @param cate - 카테고리 정보
+	 * @return
+	 * @author gagamel
+	 * @date 2021. 3. 25
+	 */
+	Collection<Goods> getContentsCategoryGoodsList_TEST(Cate4Srch cate);
 }

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

@@ -984,4 +984,100 @@ public class TsfDisplayService {
 		return displayDao.getBrandpickTitleBrandList(contents);
 	}
 
+	
+	/**
+	 * 몰메인 BESTITEM 목록 - 테스트
+	 * @param
+	 * @return
+	 * @author jmh
+	 * @date 2021. 8. 4
+	 */
+	public Collection<Contents> getBestItemForGoods_TEST(Contents contents) {
+		contents.setContentsLoc("SCM003");
+		contents.setCateNo(null);
+		Collection<Contents> contentsList = displayDao.getBestItemCategoryList(contents);
+		Cate4Srch tempCate = new Cate4Srch();
+
+		for (Contents data : contentsList) {
+			tempCate.setContentsLoc(data.getContentsLoc());
+			tempCate.setMaxRow(10);
+			tempCate.setCustNo(TsfSession.isLogin() ? TsfSession.getInfo().getCustNo() : 0);
+			tempCate.setCateNo(data.getCateNo());
+			tempCate.setSiteCd(data.getSiteCd());
+			tempCate.setCateGb(data.getCateGb());
+			Collection<Goods> cateGoodsList = goodsDao.getContentsCategoryGoodsList_TEST(tempCate);
+			if(10 > cateGoodsList.size()){
+				//TODO : 추천솔루션
+				int cnt = 0;
+				cnt = 10 - cateGoodsList.size();
+
+				Collection<Eigeneai.Result> itemList = eigeneaiApi.getCategoryWeeklySellBestGoodsList(cnt, data.getCateNo());
+				for(Eigeneai.Result tempData : itemList){
+					Goods tempBest = new Goods();
+					tempBest.setBrandGroupNm(tempData.getProduct().getBrandName());
+					tempBest.setGoodsCd(tempData.getProduct().getItemId());
+					tempBest.setGoodsFullNm(tempData.getProduct().getItemName());
+					tempBest.setListPrice((int) tempData.getProduct().getOriginalPrice());
+					tempBest.setCurrPrice((int) tempData.getProduct().getSalePrice());
+					tempBest.setSysImgNm(tempData.getProduct().getItemImage());
+					tempBest.setItemUrl(tempData.getProduct().getItemUrl());
+					cateGoodsList.add(tempBest);
+				}
+			}
+
+			data.setGoodsList(cateGoodsList);
+		}
+
+		return contentsList;
+	}
+	
+	/**
+	 * 몰메인 MD PICK 목록 테스트
+	 * @param
+	 * @return
+	 * @author bin2107
+	 * @date 2021. 3. 30
+	 */
+	public Collection<Contents> getContentsForGoods_TEST(Contents contents) {
+		Collection<Contents> contentsList = new ArrayList<>();
+		if(contents.getContentsLoc().equals("SMM007")){
+			contentsList = displayDao.getBrandpickTitleBrandList(contents);
+		}else{
+			contentsList = displayDao.getContentsList(contents);
+		}
+
+		Collection<Goods> goodsList = new ArrayList<>();
+		Cate4Srch tempContents = new Cate4Srch();
+		for (Contents data : contentsList) {
+			tempContents.setContentsLoc(data.getContentsLoc());
+			tempContents.setDispOrd(data.getDispOrd());
+			tempContents.setMaxRow(20);
+			tempContents.setCustNo(TsfSession.isLogin() ? TsfSession.getInfo().getCustNo() : 0);
+			if ("SMM007".equals(data.getContentsLoc())) {
+				if(!"".equals(data.getBrandGroupNo()) && !"null".equals(data.getBrandGroupNo()) && !data.getBrandGroupNo().equals(null)){
+					tempContents.setBrandGroupNo(Integer.parseInt(data.getBrandGroupNo()));
+				}
+				data.setFrontGb(TsfSession.getFrontGb());
+				data.setBannerList(displayDao.getContentsBannerList(data));
+			}
+			goodsList = (goodsDao.getContentsCategoryGoodsList_TEST(tempContents));
+			if ("SMM007".equals(data.getContentsLoc())) {
+				int maxrow = 3;
+				if (goodsList == null || goodsList.size() < 3) {
+					Cate4Srch cate = new Cate4Srch();
+					cate.setSiteCd(TscConstants.Site.STYLE24.value());
+					cate.setCateGb(TsfConstants.CateGb.BYITEM.value());
+					cate.setFrontGb(data.getFrontGb());
+					cate.setBrandGroupNo(Integer.parseInt(data.getBrandGroupNo()));
+					cate.setMaxRow(maxrow - goodsList.size());
+					goodsList.addAll(goodsDao.getContentsCategoryNewGoodsList(cate));
+				}
+			}
+			data.setGoodsList(goodsList);
+		}
+
+		log.info("getContentsForGoods contentsList.size()::{}", contentsList.size());
+
+		return contentsList;
+	}
 }

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

@@ -1202,4 +1202,132 @@ public class TsfGoodsService {
 		return goodsDao.getProductNoByGoodsColor(goods);
 	}
 
+	
+	
+	/**
+	 * 컨텐츠카테고리상품 목록
+	 * @param cate - 카테고리 정보
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 3. 25
+	 */
+	public Collection<Goods> getContentsCategoryGoodsList_TEST(Cate4Srch cate) {
+		cate.setSiteCd(TscConstants.Site.STYLE24.value());
+		cate.setFrontGb(TsfSession.getFrontGb());
+		cate.setCustGb(TsfSession.getCustGb());
+		cate.setCustNo(TsfSession.isLogin() ? TsfSession.getInfo().getCustNo() : 0);
+
+		Collection<Goods> goodsList = new ArrayList<>();
+
+		if (cate.getContentsLoc().equals("SCM002") || cate.getContentsLoc().equals("SBM007") || cate.getContentsLoc().equals("SMM003") || cate.getContentsLoc().equals("SBM003") || cate.getContentsLoc().equals("SBMM007")) { // 신상품인 경우
+			int maxRow = 20;
+			if (cate.getContentsLoc().equals("SBM003")) {
+				maxRow = 3;
+			}
+
+			goodsList = goodsDao.getContentsCategoryGoodsList_TEST(cate);
+
+			// 조회된 데이터가 없거나 건수가 20개 미만이면 신규상품(=정상상품) 조회
+			if (goodsList == null || goodsList.size() < maxRow) {
+				if (goodsList != null) {
+					// 제외상품 설정
+					StringBuilder sb = new StringBuilder();
+					for (Goods goods : goodsList) {
+						sb.append(goods.getGoodsCd()).append(",");
+					}
+					if (sb != null && !sb.toString().equals("")) {
+						cate.setExceptGoodsArr(sb.toString().substring(0, sb.toString().length() - 1).split(","));
+					}
+				}
+				maxRow = maxRow - goodsList.size();
+				cate.setMaxRow(maxRow);
+				cate.setCateGb("G032_101");
+				if (cate.getContentsLoc().equals("SMM003") || cate.getContentsLoc().equals("SBM003") || cate.getContentsLoc().equals("SBM007")) {
+					cate.setCate1No(null);
+				}
+
+				if (cate.getContentsLoc().equals("SCM002")) {
+					goodsList.addAll(goodsDao.getCategoryMainNewGoodsList(cate));
+				} else {
+					goodsList.addAll(goodsDao.getContentsCategoryNewGoodsList(cate));
+				}
+			}
+		} else if (cate.getContentsLoc().equals("SCM003") || cate.getContentsLoc().equals("SBM008") || cate.getContentsLoc().equals("SBM009") || cate.getContentsLoc().equals("SOM003") || cate.getContentsLoc().equals("SOM002")) { // 베스트상품인 경우
+			// TODO: 추천솔루션
+			int dispCnt = cate.getMaxRow();
+
+			goodsList = goodsDao.getContentsCategoryGoodsList_TEST(cate);
+			// 수동설정 데이터 없거나 노출갯수보다 작으면 추천솔루션 데이터 표출
+			if(dispCnt > goodsList.size()){
+				int cnt = 0;
+				cnt = dispCnt - goodsList.size();
+
+				// TODO : 추천솔루션
+				Collection<Eigeneai.Result> itemList = new ArrayList<>();
+				if(cate.getContentsLoc().equals("SCM003")){
+					itemList = eigeneaiApi.getCategoryWeeklySellBestGoodsList(cnt, cate.getCate1No());
+				}else if(cate.getContentsLoc().equals("SBM008")){
+					itemList = eigeneaiApi.getBrandWeeklySellBestGoodsList(cnt, cate.getBrandGroupNo());
+				}else if(cate.getContentsLoc().equals("SBM009")){
+					itemList = eigeneaiApi.getBrandMonthlyClickBestGoodsList(cnt, cate.getBrandGroupNo());
+				}else if(cate.getContentsLoc().equals("SOM002")){
+					itemList = eigeneaiApi.getOutletMonthlyClickBestGoodsList(cnt);
+				}else{
+					// SOM003 아울렛 베스트
+					itemList = eigeneaiApi.getOutletWeeklySellBestGoodsList(cnt);
+				}
+
+				for(Eigeneai.Result tempData: itemList){
+					Goods tempBest = new Goods();
+					tempBest.setBrandGroupNm(tempData.getProduct().getBrandName());
+					tempBest.setGoodsCd(tempData.getProduct().getItemId());
+					tempBest.setGoodsFullNm(tempData.getProduct().getItemName());
+					tempBest.setListPrice((int) tempData.getProduct().getOriginalPrice());
+					tempBest.setCurrPrice((int) tempData.getProduct().getSalePrice());
+					tempBest.setSysImgNm(tempData.getProduct().getItemImage());
+					tempBest.setItemUrl(tempData.getProduct().getItemUrl());
+					goodsList.add(tempBest);
+				}
+			}
+
+			for (Goods temp : goodsList) {
+				if (temp.getSizes() != null) {
+					temp.setSizeArr(temp.getSizes().split(","));
+				}
+				if (temp.getColorChips() != null) {
+					temp.setColorArr(temp.getColorChips().split(","));
+				}
+				if (temp.getIcon() != null) {
+					temp.setBenefitArr(temp.getIcon().split(","));
+				}
+			}
+		} else if (cate.getContentsLoc().equals("SBM013") || cate.getContentsLoc().equals("SBMM013")) {
+			GoodsSearch goodsSearch = new GoodsSearch();
+			goodsSearch.setSiteCd(TscConstants.Site.STYLE24.value());
+			goodsSearch.setCateGb("G032_101");
+			goodsSearch.setFrontGb(TsfSession.getFrontGb());
+			goodsSearch.setFormalGb(cate.getFormalGb());
+			goodsSearch.setCustGb(cate.getCustGb());
+			goodsSearch.setCustNo(cate.getCustNo());
+			goodsSearch.setBrandGroupNo(cate.getBrandGroupNo());
+			goodsSearch.setMaxRow(cate.getMaxRow());
+			goodsList = goodsDao.getBrandNewGoodsList(goodsSearch);
+
+			for (Goods temp : goodsList) {
+				if (temp.getSizes() != null) {
+					temp.setSizeArr(temp.getSizes().split(","));
+				}
+				if (temp.getColorChips() != null) {
+					temp.setColorArr(temp.getColorChips().split(","));
+				}
+				if (temp.getBenefits() != null) {
+					temp.setBenefitArr(temp.getBenefits().split(","));
+				}
+			}
+		} else {
+			goodsList = goodsDao.getContentsCategoryGoodsList_TEST(cate);
+		}
+
+		return goodsList;
+	}
 }

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

@@ -266,6 +266,129 @@ public class TsfDisplayController extends TsfBaseController {
 		return mav;
 	}
 	
+	/**
+	 * 몰 메인 테스트 폼
+	 * @return
+	 * @author jmh
+	 * @since 2021. 8. 4
+	 */
+	@GetMapping("/mall/main/form5")
+	public ModelAndView mallMain5(Device device, @RequestParam HashMap<String, String> paramMap) {
+		ModelAndView mav = new ModelAndView();
+		MainLayout mallMainLayout = new MainLayout();
+		// 로그인 유무 확인 (로그인이 되어 있지 않으면 regNo 를 0으로 장바구니에 저장한다.)
+		Login login = new Login();
+		if (TsfSession.isLogin()) {
+			login = TsfSession.getInfo();
+		} else {
+			login.setCustNo(0);
+		}
+
+		String mainCateNo = "1700";
+		// 몰메인 PC,MOBILE 동일하게 사용으로 인한 주석처리
+//		if (device.isMobile() || "Y".equals(paramMap.get("mobileYn"))) {
+//			mainCateNo = "1720";
+//		} else {
+//			mainCateNo = "1700";
+//		}
+
+		mallMainLayout.setCateNo(Integer.parseInt(mainCateNo));
+		mallMainLayout.setPreview(paramMap.get("preview"));
+		Collection<MainLayout> mainLayoutCollection = displayService.getMainLayout(mallMainLayout);
+
+		Collection<MainLayout> mainLayoutList = new ArrayList<MainLayout>();
+
+		for (MainLayout mainLayout : mainLayoutCollection) {
+			String contentsLoc = mainLayout.getContentsLoc();
+			Contents contents = new Contents();
+			log.info("mallMain contentsLoc:::{}", contentsLoc);
+			contents.setContentsCnt(mainLayout.getContentsCnt());
+			contents.setContentsLoc(contentsLoc);
+			contents.setPreview(paramMap.get("preview"));
+			contents.setViewDt(paramMap.get("viewDt"));
+			contents.setCateNo(Integer.parseInt(mainCateNo));
+			if (contentsLoc.equals("SGNB001") || contentsLoc.equals("SGNB002") || contentsLoc.equals("STAB001") || contentsLoc.equals("SMM003") || contentsLoc.equals("SMM004") || contentsLoc.equals("SMM005") || contentsLoc.equals("SMM006")) {
+				contents.setMaxRow(1);
+			}
+			if (contentsLoc.equals("SMM011")) {
+				contents.setMaxRow(5);
+			}
+
+			Cate4Srch cate4Srch = new Cate4Srch();
+			cate4Srch.setContentsLoc(contentsLoc);
+			cate4Srch.setCustNo(login.getCustNo());
+			cate4Srch = displayService.getCate4srch(cate4Srch);
+			mainLayout.setCate4Srch(cate4Srch);
+
+			if ("C".equals(mainLayout.getContentsYn())) {
+				if(contentsLoc.equals("SMM007")){
+					mainLayout.setContentsList(displayService.getBrandpickTitleBrandList(contents));
+				}else{
+					mainLayout.setContentsList(displayService.getContentsList(contents));
+				}
+			} else {
+				log.info("nullpoint contentsLoc::::{}", contentsLoc);
+				if ("SMM001".equals(contentsLoc)) {
+					cate4Srch.setMaxRow(3);
+				} else {
+					cate4Srch.setMaxRow(20);
+				}
+
+				Collection<Goods> goodsList = goodsService.getContentsCategoryGoodsList_TEST(cate4Srch);
+				mainLayout.setGoodsList(goodsList);
+
+				if ("A".equals(mainLayout.getContentsYn())) {
+					mainLayout.setContentsList(displayService.getContentsList(contents));
+				}
+			}
+
+			if (contentsLoc.equals("SMM004")) {
+				contents.setPageGb("MALL");
+				mainLayout.setBestItemList(displayService.getBestItemForGoods_TEST(contents));
+			}
+
+			if (contentsLoc.equals("SMM006")) {
+				Social social = new Social();
+				social.setSiteCd("G000_10");
+				social.setFrontGb(TsfSession.getFrontGb());
+				mainLayout.setSocialInfo(socialService.getSocialForGoods(social));
+			}
+
+			if (contentsLoc.equals("SMM007")) {
+				mainLayout.setBrandPickList(displayService.getContentsForGoods_TEST(contents));
+			}
+
+			if (contentsLoc.equals("SMM009") || contentsLoc.equals("SMM012")) {
+				if (contentsLoc.equals("SMM009")) {
+					contents.setMaxRow(5);
+				}
+				mainLayout.setMdPickList(displayService.getContentsForGoods_TEST(contents));
+			}
+
+			if (contentsLoc.equals("SMM003") || contentsLoc.equals("SBM007")) {
+				if (Integer.parseInt(mainLayout.getContentsCnt()) > 0) {
+					mainLayout.setNewItemList(displayService.getContentsForGoods_TEST(contents));
+				} else {
+					mainLayout.setNewItemList(displayService.getMainNewGoodsList(contents));
+				}
+			}
+
+			mainLayoutList.add(mainLayout);
+		}
+
+		mav.addObject((StringUtils.isBlank(paramMap.get("preview"))) ? "" : paramMap.get("preview"));
+		mav.addObject((StringUtils.isBlank(paramMap.get("viewDt"))) ? "" : paramMap.get("viewDt"));
+		mav.addObject("viewPage", "G037_20");
+		//mav.addObject("popupCateNo", "");
+
+		//log.info("mainLayoutList::{}", mainLayoutList);
+		mav.addObject("mainLayoutList", mainLayoutList);
+		mav.setViewName(super.getDeviceViewName("display/MallMainForm"));
+
+		return mav;
+	}
+	
+		
 	/**
 	 * GNB탭 > 브랜드그룹 목록
 	 * @param contents - 컨텐츠 정보

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

@@ -3787,6 +3787,7 @@
 	
 	<!-- 컨텐츠카테고리상품 목록 (JMH 이선미매니저 테스트 요청)  -->
 	<select id="getContentsCategoryGoodsList_TEST"  parameterType="Cate4Srch" resultType="Goods">
+	/* TsfGoods.getContentsCategoryGoodsList_TEST */
 		WITH TAB_GOODS AS (
 		    SELECT
 		           <if test="contentsLoc == 'SMM003' or contentsLoc == 'SBM007' or contentsLoc == 'SBM008' or contentsLoc == 'SBM009' or contentsLoc == 'SBM017' or contentsLoc == 'SBM018' or contentsLoc == 'SBM019' or contentsLoc == 'SOM003' or contentsLoc == 'SOM002'">
@@ -3814,24 +3815,20 @@
 		                   <if test="contentsLoc == 'SCM003' and pageGb != null and pageGb == 'BEST'">
 		                      DISTINCT
 		                   </if>
-		                   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                                             /*정상가(최초판매가)*/
-		                 , G.CURR_PRICE                                             /*현재판매가*/
-		                 , G.REG_DT                                                 /*등록일시*/
-		                 , G.UPD_DT
+		                   TT.BRAND_GROUP_NM 									     /*브랜드그룹명*/
+		                 , TT.GOODS_CD                                               /*상품코드*/
+		                 , TT.GOODS_NM                                               /*상품명*/
+		                 , TT.GOODS_GB                                               /*상품구분*/
+		                 , TT.SELF_GOODS_YN      /*자사상품여부*/
+		                 , TT.FOREIGN_BUY_YN                                         /*해외구매대행여부*/
+		                 , TT.PARALLEL_IMPORT_YN                                     /*병행수입여부*/
+		                 , TT.ORDER_MADE_YN                                          /*주문제작여부*/
+		                 , TT.GOODS_TNM                                              /*상품타이틀명*/
+		                 , TT.MAIN_COLOR_CD                                          /*대표색상코드*/
+		                 , TT.LIST_PRICE                                             /*정상가(최초판매가)*/
+		                 , TT.CURR_PRICE                                             /*현재판매가*/
+		                 , TT.REG_DT                                                 /*등록일시*/
+		                 , TT.UPD_DT
 		            <choose>
 		                <when test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007' or contentsLoc == 'SMM012'">
 		                 , CT.DISP_ORD
@@ -3851,10 +3848,9 @@
 		                <when test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007' or contentsLoc == 'SMM012' or contentsLoc == 'SMM003' or contentsLoc == 'SBM007' or contentsLoc == 'SBM008' or contentsLoc == 'SBM009' or contentsLoc == 'SBM017' or contentsLoc == 'SBM018' or contentsLoc == 'SBM019' or contentsLoc == 'SOM003' or contentsLoc == 'SCM002' or contentsLoc == 'SCM003' or contentsLoc == 'SOM002'"> <!-- md추천 -->
 		                    FROM	TB_CONTENTS CT
 		                    , TB_CONTENTS_GOODS CTG
-		                    , TB_GOODS G 
+		                    , TB_CONTENTS_GOODS_MAIN TT
 		                    , TB_GOODS_STOCK S
-		                    , TB_BRAND B
-		                    , TB_BRAND_GROUP BG
+		                    
 		                    <if test="contentsLoc == 'SCM003' and pageGb != null and pageGb == 'BEST'">
 		                    , TB_GOODS_SUMMARY GS
 		                    </if>
@@ -3867,10 +3863,10 @@
 		                    <if test="contentsLoc == 'SCM003' and pageGb != null and pageGb == 'BEST'"> <!-- 베스트 -->
 		                    AND    CTG.GOODS_CD = GS.GOODS_CD
 		                    </if>
-		                    AND		CTG.GOODS_CD = G.GOODS_CD
+		                    AND		CTG.GOODS_CD = TT.GOODS_CD
 		                    AND		CTG.GOODS_CD = S.GOODS_CD
-		                    AND		G.BRAND_CD = B.BRAND_CD
-		                    AND     B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
+		                   -- AND		G.BRAND_CD = B.BRAND_CD
+		                   -- AND     B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
 		                    AND		CT.CONTENTS_LOC = #{contentsLoc}
 		                    <if test="contentsLoc == 'SMM009' or contentsLoc == 'SMM012'">
 		                    AND 	CTG.CONTENTS_SQ = #{dispOrd}
@@ -3911,10 +3907,9 @@
 		                <otherwise>
 		                    FROM   TB_CATE_4SRCH C4
 		                    , TB_CATE_GOODS CG
-		                    , TB_GOODS G USE INDEX (`PRIMARY`, IX_GOODS_11)
+		                    , TB_CONTENTS_GOODS_MAIN TT
 		                    , TB_GOODS_STOCK S
-		                    , TB_BRAND B
-		                    , TB_BRAND_GROUP BG
+		                    
 		                    <if test="contentsLoc == 'SCM003'"> <!-- 베스트 -->
 		                    , TB_GOODS_SUMMARY GS
 		                    </if>
@@ -3927,10 +3922,9 @@
 		                    AND    CG.BRAND_GROUP_NO = 0 /*브랜드메인에서 접근한 것이 아니면*/
 		                        </otherwise>
 		                    </choose>
-		                    AND    CG.GOODS_CD = G.GOODS_CD
+		                    AND    CG.GOODS_CD = TT.GOODS_CD
 		                    AND    CG.GOODS_CD = S.GOODS_CD
-		                    AND    G.BRAND_CD = B.BRAND_CD
-		                    AND    B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
+		                    
 		                    <if test="contentsLoc == 'SCM003'"> <!-- 베스트 -->
 		                    AND    CG.GOODS_CD = GS.GOODS_CD
 	                        </if>
@@ -3950,12 +3944,12 @@
 		                    AND    C4.CONTENTS_LOC = #{contentsLoc}
 		              </otherwise>
 		           </choose>
-		            AND    G.GOODS_STAT = 'G008_90' /*승인완료상품*/
-		            AND    G.SELF_MALL_YN = 'Y'   /*몰노출상품*/
-		            AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT   /*판매기간*/
+		           -- AND    G.GOODS_STAT = 'G008_90' /*승인완료상품*/
+		           -- AND    G.SELF_MALL_YN = 'Y'   /*몰노출상품*/
+		           -- AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT   /*판매기간*/
 		            AND    S.STOCK_QTY <![CDATA[>]]> 0 /*재고있는상품*/
-		            AND    B.USE_YN = 'Y'
-		            AND    BG.USE_YN = 'Y'
+		           -- AND    B.USE_YN = 'Y'
+		           -- AND    BG.USE_YN = 'Y'
 		            <if test="pageGb != null and pageGb == 'BEST'">
 		            ORDER BY CT.CATE_NO
 		            LIMIT 100
@@ -4008,32 +4002,7 @@
 		      ) 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'
-		     ) AS COLOR_CHIPS /*컬러칩*/
-		     , (
-		         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 ICON
+		   
 		     <choose>
 		         <when test="custNo != null and custNo > 0"> <!-- 로그인 했으면 -->
 		     , IF(W.GOODS_CD IS NULL,'','likeit')                                                           AS LIKE_IT       /*위시리스트담긴상품*/