Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin.git into develop

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

@@ -689,6 +689,9 @@ public class TsaDisplayService {
 
 		for (Contents contents1 : contentsList){
 			if(contents1 != null && contents1.getGoodsCdArr() != null){
+				if(contents1.getContentsLoc().equals("SMM012")){
+					contents1.setCateNo(1700);
+				}
 				contents1.setContentsSq(contents1.getDispOrd());
 				contents1.setRegNo(TsaSession.getInfo().getUserNo());
 				displayDao.deleteContentsGoodsTemp(contents1);

src/main/java/com/style24/admin/biz/web/TsaBusinessController.java

@@ -301,7 +301,7 @@ public class TsaBusinessController extends TsaBaseController {
 		mav.addObject("siteList", rendererService.getAvailCommonCodeList("G000"));
 
 		// 구매적립포인트율
-		mav.addObject("pntInfo", cenvsetService.getEnvset(TscConstants.Site.STYLE24.value(), "C15"));
+		mav.addObject("pntInfo", cenvsetService.getEnvset(TscConstants.Site.STYLE24.value(), "C14"));
 
 		mav.setViewName("business/BrandForm");
 

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

@@ -1313,80 +1313,94 @@
 	<select id="getContentsPreviewList" parameterType="Contents" resultType="Contents">
 		/* TsaDisplay.getContentsPreviewList */
 		SELECT A.PRE_CONTENTS_SQ
-			 , A.CATE_NO
-			 , A.CONTENTS_LOC
-			 , A.CONTENTS_TYPE
-			 , A.DISP_STDT
-			 , A.DISP_EDDT
-			 , A.DISP_ORD
-			 , A.IMG_PATH1
-			 , A.IMG_PATH2
-			 , A.IMG_PATH3
-			 , A.IMG_PATH4
-			 , A.IMG_PATH5
-			 , A.IMG_PATH6
-			 , A.IMG_PATH7
-			 , A.IMG_PATH8
-			 , A.STR_VAR1
-			 , A.STR_VAR2
-			 , A.STR_VAR3
-			 , A.STR_VAR4
-			 , A.STR_VAR5
-			 , A.STR_VAR6
-			 , A.STR_VAR7
-			 , A.STR_VAR8
-			 , A.STR_TITLE1
-			 , A.STR_TITLE2
-			 , A.STR_TITLE3
-			 , A.STR_TITLE4
+		     , A.CATE_NO
+		     , A.CONTENTS_LOC
+		     , A.CONTENTS_TYPE
+		     , A.DISP_STDT
+		     , A.DISP_EDDT
+		     , A.DISP_ORD
+		     , A.IMG_PATH1
+		     , A.IMG_PATH2
+		     , A.IMG_PATH3
+		     , A.IMG_PATH4
+		     , A.IMG_PATH5
+		     , A.IMG_PATH6
+		     , A.IMG_PATH7
+		     , A.IMG_PATH8
+		     , A.STR_VAR1
+		     , A.STR_VAR2
+		     , A.STR_VAR3
+		     , A.STR_VAR4
+		     , A.STR_VAR5
+		     , A.STR_VAR6
+		     , A.STR_VAR7
+		     , A.STR_VAR8
+		     , A.STR_TITLE1
+		     , A.STR_TITLE2
+		     , A.STR_TITLE3
+		     , A.STR_TITLE4
 		     , A.SUB_TEXT1
-			 , A.SUB_TEXT2
-			 , A.SUB_TEXT3
-			 , A.SUB_TEXT4
+		     , A.SUB_TEXT2
+		     , A.SUB_TEXT3
+		     , A.SUB_TEXT4
 		     , A.HTML
-			 , A.BRAND_GROUP_NO
-			 , A.BRAND_GROUP_IMG
-			 , A.MD_TITLE
-			 ,(SELECT 	GROUP_CONCAT(B.GOODS_CD ORDER BY B.DISP_ORD SEPARATOR ',')
-			    FROM	TMP_CONTENTS_GOODS B
-			   WHERE	B.CATE_NO = A.CATE_NO
-				 AND	B.CONTENTS_LOC = A.CONTENTS_LOC
-				 AND	B.CONTENTS_SQ = A.DISP_ORD
-				 AND	B.CATE_NO = #{cateNo}
-				 AND	B.CONTENTS_LOC = #{contentsLoc}) AS GOODS_CD_LIST
-			 ,(SELECT 	GROUP_CONCAT(B.GOODS_NM ORDER BY B.DISP_ORD SEPARATOR ',')
-			   FROM	TMP_CONTENTS_GOODS B
-			   WHERE	B.CATE_NO = A.CATE_NO
-				 AND	B.CONTENTS_LOC = A.CONTENTS_LOC
-				 AND	B.CONTENTS_SQ = A.DISP_ORD
-				 AND	B.CATE_NO = #{cateNo}
-				 AND	B.CONTENTS_LOC = #{contentsLoc}) AS GOODS_NM_LIST
-			 ,(SELECT 	GROUP_CONCAT(GI.SYS_IMG_NM ORDER BY B.DISP_ORD SEPARATOR ',')
-			   FROM	TMP_CONTENTS_GOODS B
+		     , A.BRAND_GROUP_NO
+		     , A.BRAND_GROUP_IMG
+		     , A.MD_TITLE
+		     ,(SELECT GROUP_CONCAT(B.GOODS_CD ORDER BY B.DISP_ORD SEPARATOR ',')
+		        FROM  TMP_CONTENTS_GOODS B
+		       WHERE  1=1
+		       <if test="contentsLoc != 'SMM012'">
+		         AND  B.CATE_NO = A.CATE_NO
+		       </if>
+		         AND  B.CONTENTS_LOC = A.CONTENTS_LOC
+		         AND  B.CONTENTS_SQ = A.DISP_ORD
+		       <if test="contentsLoc != 'SMM012'">
+		         AND  B.CATE_NO = #{cateNo}
+		       </if>
+		         AND  B.CONTENTS_LOC = #{contentsLoc}) AS GOODS_CD_LIST
+		     ,(SELECT 	GROUP_CONCAT(B.GOODS_NM ORDER BY B.DISP_ORD SEPARATOR ',')
+		       FROM	TMP_CONTENTS_GOODS B
+		       WHERE 1=1
+		       <if test="contentsLoc != 'SMM012'">
+		         AND B.CATE_NO = A.CATE_NO
+		       </if>
+		         AND B.CONTENTS_LOC = A.CONTENTS_LOC
+		         AND B.CONTENTS_SQ = A.DISP_ORD
+		       <if test="contentsLoc != 'SMM012'">
+		         AND  B.CATE_NO = #{cateNo}
+		       </if>
+		         AND B.CONTENTS_LOC = #{contentsLoc}) AS GOODS_NM_LIST
+		     ,(SELECT GROUP_CONCAT(GI.SYS_IMG_NM ORDER BY B.DISP_ORD SEPARATOR ',')
+		       FROM TMP_CONTENTS_GOODS B
 		       JOIN TB_GOODS G ON B.GOODS_CD = G.GOODS_CD
 		       JOIN TB_GOODS_IMG GI ON G.GOODS_CD = GI.GOODS_CD AND G.MAIN_COLOR_CD = COLOR_CD AND GI.DEFAULT_IMG_YN = 'Y'
-			   WHERE	1=1
-			     AND 	B.CATE_NO = A.CATE_NO
-				 AND	B.CONTENTS_LOC = A.CONTENTS_LOC
-				 AND	B.CONTENTS_SQ = A.DISP_ORD
-				 AND	B.CATE_NO = #{cateNo}
-				 AND	B.CONTENTS_LOC = #{contentsLoc}) AS GOODS_IMG_LIST
-			 , A.USE_YN
-			 , A.REG_NO
-			 , A.REG_DT
-			 , A.UPD_NO
-			 , A.UPD_DT
+		       WHERE 1=1
+		       <if test="contentsLoc != 'SMM012'">
+		         AND B.CATE_NO = A.CATE_NO
+		       </if>
+		        AND B.CONTENTS_LOC = A.CONTENTS_LOC
+		        AND B.CONTENTS_SQ = A.DISP_ORD
+		       <if test="contentsLoc != 'SMM012'">
+		        AND  B.CATE_NO = #{cateNo}
+		       </if>
+		        AND B.CONTENTS_LOC = #{contentsLoc}) AS GOODS_IMG_LIST
+		     , A.USE_YN
+		     , A.REG_NO
+		     , A.REG_DT
+		     , A.UPD_NO
+		     , A.UPD_DT
 		FROM TB_CONTENTS_PREVIEW A
 		WHERE A.CATE_NO = #{cateNo}
 		  AND A.CONTENTS_LOC = #{contentsLoc}
 		<if test='cateNo == "1711" or cateNo == "1721"'>
-			<if test='brandGroupNo != null and brandGroupNo != ""'>
-				AND A.BRAND_GROUP_NO = #{brandGroupNo}
-		  	</if>
+		    <if test='brandGroupNo != null and brandGroupNo != ""'>
+		  AND A.BRAND_GROUP_NO = #{brandGroupNo}
+		    </if>
 		</if>
 		<if test='contentsLoc != null and contentsLoc != ""'>
 		  <if test='contentsLoc != "SCM002" and contentsLoc != "SCM003"'>
-			  AND A.USE_YN = 'Y'
+		  AND A.USE_YN = 'Y'
 		  </if>
 		</if>
 		ORDER BY A.DISP_ORD
@@ -1640,51 +1654,60 @@
 
 	<delete id="deleteContentsGoodsTemp" parameterType="Contents">
 		/* TsaDisplay.deleteContentsGoodsTemp */
-		DELETE	FROM TMP_CONTENTS_GOODS
-		WHERE	CATE_NO = #{cateNo}
-		AND 	CONTENTS_LOC = #{contentsLoc}
-		AND 	CONTENTS_SQ = #{contentsSq}
+		DELETE FROM TMP_CONTENTS_GOODS
+		WHERE 1=1
+		<if test="cateNo != null and cateNo != ''">
+		AND CATE_NO = #{cateNo}
+		</if>
+		AND CONTENTS_LOC = #{contentsLoc}
+		AND CONTENTS_SQ = #{contentsSq}
 	</delete>
 
 	<insert id="saveContentsGoodsTemp" parameterType="Contents">
 		/* TsaDisplay.saveContentsGoodsTemp */
 		INSERT INTO TMP_CONTENTS_GOODS
 		(
-			BRAND_GROUP_NO
-		 	,CATE_NO
-			,LEAF_CATE_NO
-			,CONTENTS_LOC
-			,PRE_CONTENTS_SQ
-			,CONTENTS_SQ
-			,GOODS_CD
-			,GOODS_NM
-			,IMG_PATH1
-			,DISP_ORD
-			,REG_NO
-			,REG_DT
+		    BRAND_GROUP_NO
+		    ,CATE_NO
+		    ,LEAF_CATE_NO
+		    ,CONTENTS_LOC
+		    ,PRE_CONTENTS_SQ
+		    ,CONTENTS_SQ
+		    ,GOODS_CD
+		    ,GOODS_NM
+		    ,IMG_PATH1
+		    ,DISP_ORD
+		    ,REG_NO
+		    ,REG_DT
 		)
 		VALUES
 		(
-			 IFNULL(NULLIF(#{brandGroupNo},''),0)
-		 	,#{cateNo}
-		 	,(SELECT LEAF_CATE_NO FROM (SELECT	LEAF_CATE_NO
-					   					FROM	TB_CATE_4SRCH
-					   					WHERE	CATE1_NO = #{cateNo}
-						 				AND		CONTENTS_LOC = #{contentsLoc}) TMP)
-			,#{contentsLoc}
-		 	,#{preContentsSq}
-		 	,#{contentsSq}
-		 	,#{goodsCd}
-		 	,#{goodsNm}
-		 	,#{imgPath1}
-		 	,(SELECT DISP_ORD FROM (SELECT IFNULL((MAX(DISP_ORD) + 1), 1) AS DISP_ORD
-		 							FROM	TMP_CONTENTS_GOODS
-		 							WHERE CATE_NO = #{cateNo}
-		 							  AND CONTENTS_LOC = #{contentsLoc}
-		 	    					  AND CONTENTS_SQ = #{contentsSq}
-		 	    					) TMP)
-		 	,#{regNo}
-		 	,NOW()
+		     IFNULL(NULLIF(#{brandGroupNo},''),0)
+		    ,#{cateNo}
+		    ,(SELECT LEAF_CATE_NO FROM (SELECT	LEAF_CATE_NO
+		                                FROM	TB_CATE_4SRCH
+		                                WHERE	1=1
+		                                <if test="cateNo != null and cateNo != ''">
+		                                AND     CATE1_NO = #{cateNo}
+		                                </if>
+		                                AND		CONTENTS_LOC = #{contentsLoc}) TMP)
+		    ,#{contentsLoc}
+		    ,#{preContentsSq}
+		    ,#{contentsSq}
+		    ,#{goodsCd}
+		    ,#{goodsNm}
+		    ,#{imgPath1}
+		    ,(SELECT DISP_ORD FROM (SELECT IFNULL((MAX(DISP_ORD) + 1), 1) AS DISP_ORD
+		                            FROM	TMP_CONTENTS_GOODS
+		                            WHERE 1=1
+		                            <if test="cateNo != null and cateNo != ''">
+		                            AND CATE_NO = #{cateNo}
+		                            </if>
+		                            AND CONTENTS_LOC = #{contentsLoc}
+		                            AND CONTENTS_SQ = #{contentsSq}
+		                        ) TMP)
+		    ,#{regNo}
+		    ,NOW()
 		)
 	</insert>
 
@@ -1692,10 +1715,13 @@
 	<delete id="deleteContentsGoods" parameterType="Contents">
 		/* TsaDisplay.deleteContentsGoods */
 		DELETE	FROM TB_CATE_GOODS
-		WHERE	CATE_NO = (SELECT LEAF_CATE_NO FROM (SELECT	LEAF_CATE_NO
-													  FROM	TB_CATE_4SRCH
-													  WHERE	CATE1_NO = #{cateNo}
-														AND		CONTENTS_LOC = #{contentsLoc}) TMP)
+		WHERE	CATE_NO = (SELECT LEAF_CATE_NO FROM (SELECT LEAF_CATE_NO
+		                                               FROM TB_CATE_4SRCH
+		                                              WHERE 1=1
+		                                              <if test="cateNo != null and cateNo != ''">
+		                                              AND CATE1_NO = #{cateNo}
+		                                              </if>
+		                                              AND CONTENTS_LOC = #{contentsLoc}) TMP)
 	</delete>
 
 	<!-- 메인전시 컨텐츠 상품 저장 -->
@@ -1708,24 +1734,27 @@
 		, DISP_ORD
 		, REG_NO
 		, REG_DT)
-			(
-				SELECT *
-				FROM (SELECT BRAND_GROUP_NO
-						   , LEAF_CATE_NO
-						   , GOODS_CD
-						   , DISP_ORD
-						   , #{regNo} AS REG_NO
-						   , NOW()
-					  FROM TMP_CONTENTS_GOODS
-					  WHERE CATE_NO = #{cateNo}
-						AND CONTENTS_LOC = #{contentsLoc}
-					 ) B
-			) ON DUPLICATE KEY
+		    (
+		        SELECT *
+		        FROM (SELECT BRAND_GROUP_NO
+		                   , LEAF_CATE_NO
+		                   , GOODS_CD
+		                   , DISP_ORD
+		                   , #{regNo} AS REG_NO
+		                   , NOW()
+		              FROM TMP_CONTENTS_GOODS
+		              WHERE 1=1
+		              <if test="cateNo != null and cateNo != ''">
+		              AND CATE_NO = #{cateNo}
+		              </if>
+		              AND CONTENTS_LOC = #{contentsLoc}
+		            ) B
+		    ) ON DUPLICATE KEY
 		UPDATE
-			GOODS_CD = B.GOODS_CD
-			, DISP_ORD = B.DISP_ORD
-			, REG_NO = B.REG_NO
-			, REG_DT = NOW()
+		    GOODS_CD = B.GOODS_CD
+		    , DISP_ORD = B.DISP_ORD
+		    , REG_NO = B.REG_NO
+		    , REG_DT = NOW()
 	</insert>
 
 	<!-- 메인전시 컨텐츠 탭영역 미리보기 리스트 -->

src/main/resources/config/application-run.yml

@@ -27,46 +27,40 @@ spring:
 logging.config: classpath:log/logback-run.xml
 
 domain:
-    admin: //admin.wivismall.com
-    wivis: //www.wivismall.com
-    image: //image.wivismall.com/speedy_image-wivismall
-    uximage: //www.wivismall.com
+    admin: //bos.style24.com
+    style24: //www.style24.com
+    image: //image.istyle24.com
+    uximage: //bos.style24.com
 
 upload:
-    dext.target.path: /app/was/deploy/admin/data/dext
+    dext.target.path: /usr/local/data/style24/dext
     default:
-        target.path: /app/was/deploy/admin/data
+        target.path: /usr/local/data/style24
         max.size: 10
         allow.extension: jpg|gif|jpeg|png|bmp|txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
-        view: //image.wivismall.com/speedy_image-wivismall
+        view: //image.istyle24.com
     goods:
-        target.path: /app/was/deploy/admin/data
+        target.path: /usr/local/data/style24/productimage
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
-        view: //image.wivismall.com/speedy_image-wivismall/goods
+        view: //image.istyle24.com/Upload/ProductImage
     image:
-        target.path: /app/was/deploy/admin/data
+        target.path: /usr/local/data/style24
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
-        view: //image.wivismall.com/speedy_image-wivismall
+        view: //image.istyle24.com
     excel:
-        target.path: /app/was/deploy/admin/data
+        target.path: /usr/local/data/style24/excel
         max.size: 10
         allow.extension: xls|xlsx
-        view: //admin.wivismall.com/data/excel
+        view: //image.istyle24.com/excel
     sample:
-        target.path: /app/was/deploy/admin/data
+        target.path: /usr/local/data/style24/sample
         max.size: 10
         allow.extension: txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
-        view: //admin.wivismall.com/data/sample
+        view: //image.style24.com/sample
 
-download.path: /app/was/deploy/admin/data
-
-# 사방넷 API
-sabangnet:
-    xml:
-        path: /app/was/deploy/api/data/sabangnet
-        url: http://api.wivismall.com/data/sabangnet
+download.path: /usr/local/data
 
 # SMTP
 mail:
@@ -85,7 +79,7 @@ mail:
 # PG
 pg:
     kcp:
-        log.dir: E:/Run/Payplus
+        log.dir: /logs/style24/kcpLogs/admin
         gw:
             url: paygw.kcp.co.kr
             port: 8090

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

@@ -421,7 +421,17 @@
 			var contentsLocCd = contentsLocList[i].cd;
 			contentsLocCd = contentsLocCd.replace(/[0-9]/g, "");
 			if(contentsLocCd==clocPrefix){
-				contentsLocHtml += '<option value="'+contentsLocList[i].cd+'">['+contentsLocList[i].cd+'] '+contentsLocList[i].cdNm+'</option>';
+				if(cate1No=='1700'){
+					if(contentsLocList[i].cd != 'SMM012'){
+						contentsLocHtml += '<option value="'+contentsLocList[i].cd+'">['+contentsLocList[i].cd+'] '+contentsLocList[i].cdNm+'</option>';
+					}
+				}else if(cate1No=='1720'){
+					if(contentsLocList[i].cd != 'SMM009'){
+						contentsLocHtml += '<option value="'+contentsLocList[i].cd+'">['+contentsLocList[i].cd+'] '+contentsLocList[i].cdNm+'</option>';
+					}
+				}else{
+					contentsLocHtml += '<option value="'+contentsLocList[i].cd+'">['+contentsLocList[i].cd+'] '+contentsLocList[i].cdNm+'</option>';
+				}
 			}
 		}
 
@@ -647,7 +657,7 @@
 		var contentsLoc = $(obj).closest("td").find('input:hidden[name="contentsLoc"]').val();
 
 		// 브랜드픽, MD추천 다른 팝업 사용
-		if(contentsLoc=='SMM007'||contentsLoc=='SMM009'){
+		if(contentsLoc=='SMM007'||contentsLoc=='SMM009'||contentsLoc=='SMM012'){
 			cfnOpenMainMultiContentsPopup(cateNo, contentsLoc, brandGroupNo);
 		}else if(contentsLoc=='STAB001' || contentsLoc=='STAB002' || contentsLoc=='SBM002'){
 			cfnOpenMainGnbContentsPopup(cateNo, contentsLoc, brandGroupNo);
@@ -774,7 +784,7 @@
 		var val = $("#searchForm select[name=cate1No]").val();
 		var cate1No = '';
 
-		if(val.split(',')[1]=='Y'){
+		/*if(val.split(',')[1]=='Y'){
 			if(val.split(',')[0]=='1711' || val.split(',')[0]=='1721'){
 				cate1No = '2100';
 			}else if(val.split(',')[0]=='1713' || val.split(',')[0]=='1723'){
@@ -784,6 +794,9 @@
 			}
 		}else{
 			cate1No = $("#searchForm select[name=cate2No]").val().split(',')[0];
+		}*/
+		if(val.split(',')[1]!='Y'){
+			cate1No = $("#searchForm select[name=cate2No]").val().split(',')[0];
 		}
 
 		var data = {

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

@@ -27,7 +27,7 @@
 					</li>
 					<li class="aR">
 						<button type="button" class="btn btn btn-base btn-sm" th:if="${contentsLoc == 'SMM007'}" onclick="fnAddBrand(this);">브랜드 추가</button> <!--id="btnBrandAddRow"-->
-						<button type="button" class="btn btn btn-base btn-sm" th:if="${contentsLoc == 'SMM009'}" onclick="fnAddBrand(this);">MD 탭 추가</button>
+						<button type="button" class="btn btn btn-base btn-sm" th:if="${contentsLoc == 'SMM009' or contentsLoc == 'SMM012'}" onclick="fnAddBrand(this);">MD 탭 추가</button>
 						<button type="button" class="btn btn btn-dark btn-sm" id="btnMultiPopSave">임시저장</button>
 						<input type="hidden" name="uploadDefaultUrlMultiPop" id="uploadDefaultUrlMultiPop" th:value="${@environment.getProperty('upload.image.view') + '/contents/'}"/>
 						<input type="hidden" name="uploadDefaultBrandUrlPop" id="uploadDefaultBrandUrlPop" th:value="${@environment.getProperty('upload.image.view') + '/contents/brand/'}"/>
@@ -102,7 +102,7 @@
 			html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddGoodsRow(this,this,this);">상품추가</button>';
 			html += '<button type="button" class="btn btn-danger btn-lg" onclick="fnDeleteBrandRow(this);">삭제</button></td>';
 			html += '</tr>';
-			if(contentsLoc=='SMM009'){
+			if(contentsLoc=='SMM009' || contentsLoc=='SMM012'){
 				html += '<tr>';
 				html += '<th>MD탭문구</th>';
 				html += '<td colspan="3"><input type="text" name="mdTitle" id="mdTitle" style="width:30%;" value="' + result[i].mdTitle + '"></td>';
@@ -229,7 +229,7 @@
 		html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddGoodsRow(this,this,this);">상품추가</button>';
 		html += '<button type="button" class="btn btn-danger btn-lg" onclick="fnDeleteBrandRow(this);">삭제</button></td>';
 		html += '</tr>';
-		if(contentsLoc=='SMM009'){
+		if(contentsLoc=='SMM009' || contentsLoc=='SMM012'){
 			html += '<tr>';
 			html += '<th>MD탭문구</th>';
 			html += '<td colspan="3"><input type="text" name="mdTitle" id="mdTitle" style="width:30%;"></td>';