Merge branch 'develop' into bin2107

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

@@ -985,10 +985,14 @@ public class TsaGoodsController extends TsaBaseController {
 				if (goodsImgInfo.getDefaultImgYn().equals("Y")) {
 					mav.addObject("defaultImgOrd", goodsImgInfo.getDispOrd());
 				}
+				if (goodsImgInfo.getMouseoverImgYn() .equals("Y")) {
+					mav.addObject("mouseoverImgOrd", goodsImgInfo.getDispOrd());
+				}
 			}
 		} else { // 대표이미지와 마우스오버이미지가 없으면
 			mav.addObject("goodsImgList", new ArrayList<GoodsImg>());
 			mav.addObject("defaultImgOrd", "1");
+			mav.addObject("mouseoverImgOrd", "1");
 		}
 
 		mav.addObject("goodsImg", goodsImg);

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

@@ -19,9 +19,11 @@ public class GoodsImg extends TscBaseDomain {
 	private String orgImgNm;
 	private String sysImgNm;
 	private String defaultImgYn;
+	private String mouseoverImgYn;
 	private String colorNm;
 	private String mode;
 	private int defaultImgOrd;
+	private int mouseoverImgOrd;
 	private String sysImgUrl;
 	private int brandNo;
 

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

@@ -1422,7 +1422,7 @@
 		     , A.DISP_ORD
 		     , A.DISP_YN
 		     , COUNT(*) OVER(PARTITION BY A.GOODS_CD ) AS RCOUNT
-		     , ROW_NUMBER() OVER(PARTITION BY A.GOODS_CD ORDER BY A.DISP_ORD) AS RNUM
+		     , ROW_NUMBER() OVER(PARTITION BY A.GOODS_CD ORDER BY A.DISP_ORD, A.OPT_CD1, A.OPT_CD2) AS RNUM
 		FROM  TMP_GOODS C 
 		INNER JOIN TB_OPTION A ON C.COMPS_GOODS_CD = A.GOODS_CD 
 		LEFT OUTER JOIN (
@@ -1439,7 +1439,7 @@
 		             AND A.OPT_CD = B.OPT_CD)
 		WHERE 1 = 1
 		AND C.GOODS_CD = #{goodsCd}
-		ORDER BY C.DISP_ORD, A.DISP_ORD
+		ORDER BY C.DISP_ORD, A.DISP_ORD, A.OPT_CD1, A.OPT_CD2
 	</select>
 	
 	<!-- 상품 색상목록 조회 -->
@@ -3567,6 +3567,7 @@
 		     , SUBSTRING_INDEX(SYS_IMG_NM , '/', -1) AS SYS_IMG_NM  /* S0001/20201221/14505664_L.jpg */
 		     , SUBSTRING_INDEX(SYS_IMG_NM , '/', 2) AS SYS_IMG_URL
 		     , DEFAULT_IMG_YN
+		     , MOUSEOVER_IMG_YN
 		FROM   TB_GOODS_IMG
 		WHERE  GOODS_CD = #{goodsCd}
 		AND    COLOR_CD = #{colorCd}
@@ -3601,6 +3602,7 @@
 		     , DISP_ORD
 		     , SYS_IMG_NM
 		     , DEFAULT_IMG_YN
+		     , MOUSEOVER_IMG_YN
 		     , REG_NO
 		     , REG_DT
 		)
@@ -3610,6 +3612,7 @@
 		     , #{dispOrd}
 		     , #{sysImgNm}
 		     , #{defaultImgYn}
+		     , #{mouseoverImgYn}
 		     , #{regNo}
 		     , NOW()
 		)

src/main/webapp/WEB-INF/views/goods/GoodsImageForm.html

@@ -14,7 +14,7 @@
  * 1.0  2020.11.27   eskim       최초 작성
  *******************************************************************************
  -->
-	<div class="modalPopup" data-width="1280">
+	<div class="modalPopup" data-width="1400" data-height="800">
 		<!-- PANELSTYLE -->
 			<div class="panelStyle">
 				<!-- TITLE -->
@@ -39,13 +39,13 @@
 					<table class="frmStyle">
 						<colgroup>
 							<col width="7%"/>
-							<col width="25%"/>
-							<col width="8%"/>
+							<col/>
+							<col width="10%"/>
+							<col width="10%"/>
+							<col width="10%"/>
+							<col width="10%"/>
 							<col width="10%"/>
-							<col width="8%"/>
 							<col width="10%"/>
-							<col width="8%"/>
-							<col/>
 						</colgroup>
 						<tr>
 							<th>상품코드</th>
@@ -54,7 +54,8 @@
 							<td th:text="${goodsImg.colorNm}">PINK</td>
 							<th>대표 이미지순번</th>
 							<td><input type="text" class="text-right" name="defaultImgOrd" maxlength="3" th:value="${defaultImgOrd}" required="required" data-valid-type="number" data-valid-name="대표이미지순번"/></td>
-							<td colspan="2"></td>
+							<th>마우스오버 이미지순번</th>
+							<td><input type="text" class="text-right" name="mouseoverImgOrd" maxlength="3" th:value="${mouseoverImgOrd}" required="required" data-valid-type="number" data-valid-name="마우스오버 이미지순번"/></td>
 						</tr>
 						<tr>
 							<th>이미지등록</th>
@@ -189,6 +190,7 @@
 				params.sysImgNm = item.name;
 				params.sysImgUrl = item.url;
 				params.defaultImgYn = ($('#goodsImgForm input[name=defaultImgOrd]').val() == (i + 1)) ? 'Y' : 'N';
+				params.mouseoverImgYn = ($('#goodsImgForm input[name=mouseoverImgOrd]').val() == (i + 1)) ? 'Y' : 'N';
 				updatedData.push(params);
 			}
 		}

src/main/webapp/dx5/dextuploadx5-configuration.js

@@ -8,15 +8,15 @@
 
     var gAuthkey = '';
     if (location.host.indexOf("ld") > -1) {
-    	gAuthkey = "wv0tVbqwjB3lq1Z7QxSK/RiA31WcFNDd45asJ8rF3Gnl28E5ZkW+9D+/zcDVVXq8yy1fkRjUK9EG41tLceWrPsCbmCOZqVGdr4/JOj11b2g4/DdhnPp7uaDtdL6lH/OLZmRi4aAhdBXhCRmCIsyAZ9qs6P0dpV3EoGFwTaFQqGA=";
+    	gAuthkey = "gx9EHEhXzTpbdxWjty/oHh9cfVi5WA5X4BV71AHaC/ORN/1fcs8nTTd4oUUvC5WhHqEa6Wt8cfmCBJ9w/pJpRhDd+tVu6kPDt9bxZL9n0bvaUn2rrbmJMA+HC9gzahwdEOcjr6ZOmNSEd6N0xN2BDBk55hvfPw02R77XjVuZrQU=";
     } else if (location.host.indexOf("lp") > -1) {
-    	gAuthkey = "wv0tVbqwjB3lq1Z7QxSK/RiA31WcFNDd45asJ8rF3Gnl28E5ZkW+9D+/zcDVVXq8yy1fkRjUK9EG41tLceWrPsCbmCOZqVGdr4/JOj11b2g4/DdhnPp7uaDtdL6lH/OLZmRi4aAhdBXhCRmCIsyAZ9qs6P0dpV3EoGFwTaFQqGA=";
+    	gAuthkey = "gx9EHEhXzTpbdxWjty/oHh9cfVi5WA5X4BV71AHaC/ORN/1fcs8nTTd4oUUvC5WhHqEa6Wt8cfmCBJ9w/pJpRhDd+tVu6kPDt9bxZL9n0bvaUn2rrbmJMA+HC9gzahwdEOcjr6ZOmNSEd6N0xN2BDBk55hvfPw02R77XjVuZrQU=";
     } else if (location.host.indexOf("dev") > -1) {
-    	gAuthkey = "wv0tVbqwjB3lq1Z7QxSK/RiA31WcFNDd45asJ8rF3Gnl28E5ZkW+9D+/zcDVVXq8yy1fkRjUK9EG41tLceWrPsCbmCOZqVGdr4/JOj11b2g4/DdhnPp7uaDtdL6lH/OLZmRi4aAhdBXhCRmCIsyAZ9qs6P0dpV3EoGFwTaFQqGA=";
+    	gAuthkey = "gx9EHEhXzTpbdxWjty/oHh9cfVi5WA5X4BV71AHaC/ORN/1fcs8nTTd4oUUvC5WhHqEa6Wt8cfmCBJ9w/pJpRhDd+tVu6kPDt9bxZL9n0bvaUn2rrbmJMA+HC9gzahwdEOcjr6ZOmNSEd6N0xN2BDBk55hvfPw02R77XjVuZrQU=";
     } else if (location.host.indexOf("qas") > -1) {
-    	gAuthkey = "wv0tVbqwjB3lq1Z7QxSK/RiA31WcFNDd45asJ8rF3Gnl28E5ZkW+9D+/zcDVVXq8yy1fkRjUK9EG41tLceWrPsCbmCOZqVGdr4/JOj11b2g4/DdhnPp7uaDtdL6lH/OLZmRi4aAhdBXhCRmCIsyAZ9qs6P0dpV3EoGFwTaFQqGA=";
+    	gAuthkey = "gx9EHEhXzTpbdxWjty/oHh9cfVi5WA5X4BV71AHaC/ORN/1fcs8nTTd4oUUvC5WhHqEa6Wt8cfmCBJ9w/pJpRhDd+tVu6kPDt9bxZL9n0bvaUn2rrbmJMA+HC9gzahwdEOcjr6ZOmNSEd6N0xN2BDBk55hvfPw02R77XjVuZrQU=";
     } else {
-    	gAuthkey = "wv0tVbqwjB3lq1Z7QxSK/RiA31WcFNDd45asJ8rF3Gnl28E5ZkW+9D+/zcDVVXq8yy1fkRjUK9EG41tLceWrPsCbmCOZqVGdr4/JOj11b2g4/DdhnPp7uaDtdL6lH/OLZmRi4aAhdBXhCRmCIsyAZ9qs6P0dpV3EoGFwTaFQqGA=";
+    	gAuthkey = "gx9EHEhXzTpbdxWjty/oHh9cfVi5WA5X4BV71AHaC/ORN/1fcs8nTTd4oUUvC5WhHqEa6Wt8cfmCBJ9w/pJpRhDd+tVu6kPDt9bxZL9n0bvaUn2rrbmJMA+HC9gzahwdEOcjr6ZOmNSEd6N0xN2BDBk55hvfPw02R77XjVuZrQU=";
     }
 
     win.dextuploadx5Configuration = {