임시커밋

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

@@ -294,6 +294,27 @@ public class TsfDisplayService {
 		return this.getAllCategoryList(cate);
 	}
 
+	/**
+	 * 브랜드 카테고리 목록
+	 * @param brandGroupNo - 브랜드그룹번호
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 4. 12
+	 */
+	@Cacheable(value = "cate", key = "'category-'.concat(#cate1No).concat(#formalGb)")
+	public Collection<Cate1> getCategoryList(Integer cate1No, String formalGb) {
+		Cate4Srch cate = new Cate4Srch();
+		cate.setSiteCd(TscConstants.Site.STYLE24.value()); // 사이트코드
+
+		cate.setCate1No(cate1No);
+		cate.setFormalGb(formalGb);
+		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/service/TsfGoodsService.java

@@ -762,6 +762,7 @@ public class TsfGoodsService {
 			if(cate.getContentsLoc().equals("SBM003")){
 				maxRow = 3;
 			}
+
 			goodsList = goodsDao.getContentsCategoryGoodsList(cate);
 
 			// 조회된 데이터가 없거나 건수가 20개 미만이면 신규상품(=정상상품) 조회
@@ -778,6 +779,7 @@ public class TsfGoodsService {
 				}
 				maxRow = maxRow - goodsList.size();
 				cate.setMaxRow(maxRow);
+				cate.setCateGb("G032_101");
 				if(cate.getContentsLoc().equals("SBM003")){
 					cate.setCate1No(null);
 				}

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

@@ -668,6 +668,19 @@ public class TsfDisplayController extends TsfBaseController {
 		return displayService.getBrandCategoryList(brandGroupNo);
 	}
 
+	/**
+	 * 카테고리 목록
+	 * @param
+	 * @return
+	 * @author bin2107
+	 * @since 2021. 5. 3
+	 */
+	@GetMapping("/category/cate/list")
+	@ResponseBody
+	public Collection<Cate1> getCategoryList(Integer cate1No, String formalGb) {
+		return displayService.getCategoryList(cate1No, formalGb);
+	}
+
 	/**
 	 * 베스트 메인
 	 * @param

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

@@ -1382,7 +1382,7 @@
 		            WHERE  C4.LEAF_CATE_NO = CG.CATE_NO
 		            <choose>
 		                <when test="brandGroupNo != null and brandGroupNo != ''">
-		            AND    CG.BRAND_GROUP_NO = #{brandGroupNo}
+		            AND    B.BRAND_GROUP_NO = #{brandGroupNo}
 		                </when>
 		                <otherwise>
 		            AND    CG.BRAND_GROUP_NO = 0 /*브랜드메인에서 접근한 것이 아니면*/

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

@@ -697,7 +697,6 @@
 			});
 	}
 
-	// OUTLET 탭 생성
 	var fnGetOutletCategory = function (outletNm){
 		let formalGb = 'G009_20';
 		var tag = '';
@@ -727,7 +726,11 @@
 		return tag;
 	}
 
-	var fnGetOutletLeafCategory = function(){
+	var fnGetOutletLeafCategory = function (){
+
+	}
+
+	var fnGetOutletLeafCategory2 = function(){
 		let allCate = [[${allCateList}]];
 		$.each(allCate, function(allCateIdx, allCateItem) {
 			let gnbCate = fnGetOutletLeafData(allCateIdx,allCateItem);

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

@@ -481,8 +481,10 @@
 		var fnCreateCategoryList = function (){
 			let actionUrl = '';
 			let brandGroupNo = [[${cateInfo.brandGroupNo}]];
+			let cate1No = [[${cateInfo.cate1No}]];
 			if(gagajf.isNull(brandGroupNo) || brandGroupNo == 0){
-				actionUrl = '/display/gnb/tab/list';
+				//actionUrl = '/display/gnb/tab/list';
+				actionUrl = '/display/category/cate/list?cate1No='+cate1No+'&formalGb='+ [[${cateInfo.formalGb}]];
 			}else{
 				actionUrl = '/display/brand/cate/list?brandGroupNo=' + [[${cateInfo.brandGroupNo}]];
 			}
@@ -513,13 +515,15 @@
 						let allCate = [[${allCateList}]];
 						if(gagajf.isNull(brandGroupNo) || brandGroupNo == 0){
 							$.each(result, function(idx, item) {
-								if (item.contentsType == 'C') { // 컨텐츠유형:카테고리
+								// if (allCateItem.contentsType == 'C') { // 컨텐츠유형:카테고리
 									$.each(allCate, function(allCateIdx, allCateItem) {
 										if (item.cate1No == allCateItem.cate1No) {
+											$('#ulAllCate').append(fnGetCategoryList(item));
+										}else{
 											$('#ulAllCate').append(fnGetCategoryList(allCateItem));
 										}
 									});
-								}
+								// }
 							});
 						}else{
 							$.each(result, function(idx, item) {