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

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

@@ -194,18 +194,26 @@ public class TsaMorebetterService {
         List<MoreBetterGoods> dgList = moreBetter.getDefaultGoodsList();
         List<MoreBetterGoods> agList = moreBetter.getGridApplyGoodsList();
         List<MoreBetterGoods> applyList = new ArrayList<>();
+        int dupCnt = 0;
         if(agList.size() > 0){
+            applyList = dgList;
             for(int i=0; i<agList.size(); i++){
                 for(int j=0; j<dgList.size(); j++){
-                    if(!agList.get(i).getGoodsCd().equals(dgList.get(j).getGoodsCd())){
-                        applyList.add(agList.get(i));
+                    if(agList.get(i).getGoodsCd().equals(dgList.get(j).getGoodsCd())){
+                        //applyList.add(agList.get(i));
+                        dupCnt++;
                     }
                 }
+                if(dupCnt==0){
+                    applyList.add(agList.get(i));
+                }
             }
         }else{
             applyList = dgList;
         }
 
+        log.info("applyList ::::{}",applyList);
+
         for(MoreBetterGoods regApplyGoods : applyList){
             // 다다익선 적용대상 설정(TB_TMTB_GOODS) 저장
             regApplyGoods.setTmtbSq(moreBetter.getTmtbSq());
@@ -254,6 +262,7 @@ public class TsaMorebetterService {
         StringBuilder sb = new StringBuilder();
         StringBuilder sb3 = new StringBuilder();
         //int i = 1;
+        log.info("applyList2 ::::{}",applyList);
 
         if(applyList.size()>0){
             for(int i=0; i<applyList.size(); i++){

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

@@ -1028,7 +1028,8 @@ public class TsaMarketingController extends TsaBaseController {
 				if (duplicateGoodsList.size() > 0) {
 					map.set("duplicateYn", "Y");
 					map.set("duplicateGoodsList", duplicateGoodsList);
-					map.set("message", message.getMessage("FAIL_0001"));
+//					map.set("message", message.getMessage("FAIL_0001"));
+					map.set("message", "다다익선 진행중인 상품이 있어 상태 변경되지 않았습니다. 재확인 후 상태 변경해주세요.");
 				} else {
 					// 조회 건수 없으면 -> 저장으로 넘어감
 					map.set("duplicateYn", "N");

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

@@ -540,22 +540,25 @@
 		</if>
 	</delete>
 
+	<!-- 진행중인 다다익선 상품과 중복 체크 -->
 	<select id="getMorebetterDuplicateList" parameterType="MoreBetterGoods" resultType="MoreBetterGoods">
 		/* TsaMorebetter.getMorebetterDuplicateList */
-		SELECT 	REG_NO
-		      , GOODS_CD
-		      , GOODS_NM
-		 FROM	TB_TMTB_APPLY_GOODS_TEMP
-		WHERE	1=1
-		  AND	REG_NO = #{regNo}
-		  AND	GOODS_CD NOT IN (
-		                SELECT	B.GOODS_CD
-		                FROM	TB_TMTB A, TB_TMTB_APPLY_GOODS B
-		                WHERE	1=1
-		                AND		A.TMTB_SQ = B.TMTB_SQ
-		                AND		NOW() BETWEEN A.TMTB_ST_DT AND A.TMTB_ED_DT
-		                AND		B.TMTB_SQ = #{tmtbSq}
-		              )
+		SELECT  TG.GOODS_CD
+		      , (SELECT GOODS_NM FROM TB_GOODS WHERE GOODS_CD = TG.GOODS_CD) AS GOODS_NM
+		FROM    TB_TMTB T, TB_TMTB_APPLY_GOODS TG
+		WHERE   T.TMTB_SQ = TG.TMTB_SQ
+		  AND   T.TMTB_STAT = 'G232_11'
+		  AND   NOW() BETWEEN T.TMTB_ST_DT AND T.TMTB_ED_DT
+		  AND   T.TMTB_SQ NOT IN (#{tmtbSq})
+		  AND   EXISTS (
+		            SELECT  B.GOODS_CD
+		            FROM    TB_TMTB A, TB_TMTB_APPLY_GOODS B
+		            WHERE   1=1
+		              AND   A.TMTB_SQ = B.TMTB_SQ
+		              AND   NOW() BETWEEN A.TMTB_ST_DT AND A.TMTB_ED_DT
+		              AND   B.TMTB_SQ =  #{tmtbSq}
+		              AND   TG.GOODS_CD = B.GOODS_CD
+			)
 	</select>
 
 	<update id="updateMorebetterStat" parameterType="MoreBetter">

src/main/webapp/WEB-INF/views/marketing/MorebetterPopupForm.html

@@ -777,11 +777,15 @@
 
 		var multiApplyGoods = [];
 		$.each(allApplyGoodsData, function(agIdx, agItem) {
+			var dupCnt = 0;
 			$.each(allDefaultGoodsData, function(idx, item) {
-				if(agItem.goodsCd != item.goodsCd){
-					multiApplyGoods.push(agItem.goodsCd);
+				if(agItem.goodsCd == item.goodsCd){
+					dupCnt++;
 				}
 			});
+			if(dupCnt==0){
+				multiApplyGoods.push(agItem.goodsCd);
+			}
 		});
 
 		var multiExceptGoods = [];
@@ -815,7 +819,7 @@
 		};
 
 		var jsonData = JSON.stringify(data);
-// console.log(jsonData);
+console.log(jsonData);
 		gagajf.ajaxJsonSubmit($('#moreBetterForm').prop('action'), jsonData, fnMorebetterSaveCollback);
 	});
 
@@ -1008,7 +1012,7 @@
         gridOptionsFGBrandList.api.updateRowData({remove:gagaAgGrid.selectedRowData(gridOptionsFGBrandList)});
     });
 	// 기준상품 선택삭제 버튼 클릭시
-	$('#moreBetterForm #btnAddDefaultGoods').on('click', function() {
+	$('#moreBetterForm #btnDeleteDefaultGoods').on('click', function() {
 		gridOptionsDefaultGoodsList.api.updateRowData({remove:gagaAgGrid.selectedRowData(gridOptionsDefaultGoodsList)});
 	});
     // 적용상품 선택삭제 버튼 클릭시

src/main/webapp/WEB-INF/views/order/OrderMemoRegistForm.html

@@ -47,7 +47,7 @@
 							<th>파일</th>
 							<td><div class="uFile">
 								<input id="imageFile" name="imageFile" type="file" class="uFileInput"/>
-								<label for="imageFile" class="uFileLabel" th:text="${#strings.isEmpty(orderMemo.sysFileNm) ? '파일선택' : orderMemo.sysFileNm}">파일선택</label>
+								<label for="imageFile" class="uFileLabel" th:text="${mode == 'U' and orderMemo.sysFileNm != null and orderMemo.sysFileNm != '' ? orderMemo.sysFileNm : '파일선택'}">파일선택</label>
 								<input type="hidden" name="orgFileNm"/>
 								<input type="hidden" name="sysFileNm"/>
 							</div>