메인전시 수정

src/main/java/com/style24/admin/biz/service/TsaDisplayService.java

@@ -346,6 +346,7 @@ public class TsaDisplayService {
 		for(int i=0; i<categoryGoods.getMultiGoods().length; i++){
 			goodsCategory.setGoodsCd(categoryGoods.getMultiGoods()[i]);
 			goodsCategory.setCateCd((categoryGoods.getCateNo()).toString());
+			goodsCategory.setBrandGroupNo(categoryGoods.getBrandGroupNo());
 			displayDao.saveGoodsCategory(goodsCategory);
 		}
 	}

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

@@ -66,6 +66,8 @@ public class CategoryGoods extends TscBaseDomain {
 	private String imgPath1;
 	private String goodsAddYn;
 
+	private String brandGroupNo;
+
 	// Pagination
 	private TscPageRequest pageable;
 	private int pageNo = 1;

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

@@ -94,6 +94,7 @@ public class GoodsCategory extends TscBaseDomain {
 	private String[] goodsCdList;
 
 	private String goodsCds;
+	private String brandGroupNo;
 
 	List<CategoryGoods> goodsList;
 

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

@@ -779,14 +779,16 @@
 	<insert id="saveGoodsCategory" parameterType="GoodsCategory">
 		/* TsaDisplay.saveGoodsCategory */
 		INSERT INTO TB_CATE_GOODS(
-					CATE_NO
+					BRAND_GROUP_NO
+		            ,CATE_NO
 					,GOODS_CD
 					,DISP_ORD
 					,REG_NO
 					,REG_DT
 				)
 				VALUES (
-				    #{cateCd}
+					IFNULL(#{brandGroupNo},0)
+				    ,#{cateCd}
 				    ,#{goodsCd}
 				    ,(SELECT	IFNULL((MAX(DISP_ORD) + 1), 1) AS DISP_ORD
 				        FROM	TB_CATE_GOODS ALIAS_FOR_SUBQUERY
@@ -853,10 +855,13 @@
 								<if test='selLvl == "6"'>
 									AND CATE4_NO  = #{cate4No}
 								</if>
+							<if test="contentsLoc != null and contentsLoc !=''">
+								AND CONTENTS_LOC = #{contentsLoc}
+							</if>
 				)
-				<if test="contentsLoc != null and contentsLoc !=''">
-					AND A.CONTENTS_LOC = #{contentsLoc}
-				</if>
+			<if test="brandGroupNo != null and brandGroupNo !=''">
+				AND A.BRAND_GROUP_NO = #{brandGroupNo}
+			</if>
 		) A
 		<if test="searchGb == null or searchGb =='BASIC'">
 			, TB_GOODS G
@@ -905,13 +910,11 @@
 							, G.SUPPLY_GOODS_CD
 							, G.STYLE_YEAR
 							, FN_GET_CODE_NM('G009',IFNULL(G.FORMAL_GB,'10'))  AS FORMAL_GB
-							, A.CONTENTS_LOC
 						FROM ( SELECT A.GOODS_CD
 									, A.CATE_NO
 									, A.DISP_ORD
 									, A.REG_NO
 									, A.REG_DT
-									, A.CONTENTS_LOC
 								FROM TB_CATE_GOODS A
 								WHERE 1=1
 								AND A.CATE_NO IN ( SELECT LEAF_CATE_NO
@@ -929,10 +932,13 @@
 												<if test='selLvl == "6"'>
 													AND CATE4_NO  = #{cate4No}
 												</if>
+											<if test="contentsLoc != null and contentsLoc !=''">
+												AND CONTENTS_LOC = #{contentsLoc}
+											</if>
 								)
-								<if test="contentsLoc != null and contentsLoc !=''">
-								AND A.CONTENTS_LOC = #{contentsLoc}
-								</if>
+						<if test="brandGroupNo != null and brandGroupNo !=''">
+							AND A.BRAND_GROUP_NO = #{brandGroupNo}
+						</if>
 					) A
 				<if test="searchGb == null or searchGb =='BASIC'">
 					, TB_GOODS G
@@ -1635,7 +1641,8 @@
 		/* TsaDisplay.saveContentsGoodsTemp */
 		INSERT INTO TMP_CONTENTS_GOODS
 		(
-			CATE_NO
+			BRAND_GROUP_NO
+		 	,CATE_NO
 			,LEAF_CATE_NO
 			,CONTENTS_LOC
 			,PRE_CONTENTS_SQ
@@ -1649,7 +1656,8 @@
 		)
 		VALUES
 		(
-		 	#{cateNo}
+			IFNULL(#{brandGroupNo},0)
+		 	,#{cateNo}
 		 	,(SELECT LEAF_CATE_NO FROM (SELECT	LEAF_CATE_NO
 					   					FROM	TB_CATE_4SRCH
 					   					WHERE	CATE1_NO = #{cateNo}
@@ -1679,7 +1687,6 @@
 													  FROM	TB_CATE_4SRCH
 													  WHERE	CATE1_NO = #{cateNo}
 														AND		CONTENTS_LOC = #{contentsLoc}) TMP)
-		AND 	CONTENTS_LOC = #{contentsLoc}
 	</delete>
 
 	<!-- 메인전시 컨텐츠 상품 저장 -->
@@ -1687,7 +1694,8 @@
 		/* TsaDisplay.saveContentsGoods */
 		INSERT INTO TB_CATE_GOODS
 		(
-			CATE_NO
+			 BRAND_GROUP_NO
+		    ,CATE_NO
 			,GOODS_CD
 			,CONTENTS_LOC
 			,CONTENTS_SQ
@@ -1695,7 +1703,9 @@
 			,REG_NO
 			,REG_DT
 		)
-		SELECT	LEAF_CATE_NO
+		SELECT
+		     BRAND_GROUP_NO
+			 ,LEAF_CATE_NO
 			 ,GOODS_CD
 		     ,CONTENTS_LOC
 			 ,PRE_CONTENTS_SQ

src/main/webapp/WEB-INF/views/display/GoodsDispOrdChangePopupForm.html

@@ -27,6 +27,7 @@
 			<input type="hidden" id="searchGb" name="searchGb" value="BASIC"/>
 			<input type="hidden" id="cateCd" name="cateCd" th:value="${params.cateCd}"/>
 			<input type="hidden" id="contentsLoc" name="contentsLoc" th:value="${params.contentsLoc}"/>
+			<input type="hidden" id="brandGroupNo" name="brandGroupNo" th:value="${params.brandGroupNo}"/>
 			<button type="button" class="btn btn-base btn-lg" id="btnSearch" style="display: none;">조회</button>
 			<div class="panelTitle">
 				<h2>상품 순서변경</h2>
@@ -206,6 +207,7 @@
 					mode : 'add'
 					,cateNo : $("#goodsDispOrdChangeForm input[name=cateCd]").val()
 					,multiGoods : multiGoods
+					,brandGroupNo : $("#goodsDispOrdChangeForm input[name=brandGroupNo]").val()
 				}
 				var jsonData = JSON.stringify(data);
 				gagajf.ajaxJsonSubmit('/display/category/goods/save', jsonData, fnSearchData);

src/main/webapp/WEB-INF/views/display/MainListForm.html

@@ -265,7 +265,7 @@
 					html += '<button type="button" class="btn btn-default btn-lg" onclick="fnUpdateContents(\''+result[i].contentsLoc+'\');">적용</button>';
 					html += '<br/>';
 				}
-				html += '<button type="button" class="btn btn-success btn-lg" onclick="fnSearchCategory(\''+result[i].contentsLoc+'\');">상품관리</button>';
+					html += '<button type="button" class="btn btn-success btn-lg" onclick="fnSearchCategory(\''+result[i].contentsLoc+'\');">상품관리</button>';
 			}
 			html += '<input type="hidden" name="contentsLoc" value="'+result[i].contentsLoc+'"/>';
 			html += '<input type="hidden" name="colCnt" value="'+result[i].colCnt+'"/>';
@@ -522,7 +522,7 @@
 		var cateNm = '';
 		if(val.split(',')[1]=='Y'){
 			cateNo = val.split(',')[0];
-			if(cateNo == '1711' || cateNo == '1711'){
+			if(cateNo == '1711' || cateNo == '1721'){
 				if(!fnCate2BrandCheck()){
 					return false;
 				}
@@ -716,11 +716,14 @@
 		var cate1No = '';
 
 		if(val.split(',')[1]=='Y'){
-			cate1No = val.split(',')[0];
+			if(val.split(',')[0]=='1711' || val.split(',')[0]=='1721'){
+				cate1No = '2100';
+			}else{
+				cate1No = val.split(',')[0];
+			}
 		}else{
 			cate1No = $("#searchForm select[name=cate2No]").val().split(',')[0];
 		}
-
 		var data = {
 			contentsLoc : contentsLoc
 			,cate1No : cate1No
@@ -753,6 +756,8 @@
 		params += '&cateCd='+result.leafCateNo;
 		params += '&goodsAddYn=Y';
 		params += '&contentsLoc='+result.contentsLoc;
+		params += '&brandGroupNo='+$("#searchForm input[name=brandGroupNo]").val();
+
 		cfnOpenGoodsDispOrdChangePopup('', params);
 	};