다다익선 추가수정

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

@@ -344,12 +344,13 @@ public class TsaMorebetterService {
 
         morebetterDao.deleteTmtbApplyGoodsTemp(moreBetterGoods);
 
+        // 적용상품 그리드 데이터
         List<MoreBetterGoods> applyGoodsList = moreBetterGoods.getApplyGoodsList();
 
         if(moreBetterGoods.getMultiSupplyCompCd().length > 0 || moreBetterGoods.getMultiBrand().length > 0){
+            // 공급업체, 브랜드에 해당하는 상품
             List<MoreBetterGoods> compBrandGoodsList = morebetterDao.getMorebetterCompBrandGoodsList(moreBetterGoods);
             if(compBrandGoodsList.size() > 0){
-
                 for(int i=0; i<compBrandGoodsList.size(); i++){
                     moreBetterGoods.setGoodsCd(compBrandGoodsList.get(i).getGoodsCd());
                     morebetterDao.createTmtbApplyGoodsTemp(moreBetterGoods);

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

@@ -267,7 +267,7 @@
 			,DATE_FORMAT(#{tmtbStdt},'%Y-%m-%d %H:%i:%s')
 			,DATE_FORMAT(#{tmtbEddt},'%Y-%m-%d %H:%i:%s')
 			,#{applyGb}
-			,#{multiYn}
+			,'Y'
 			,'N'
 			,#{regNo}
 			,NOW()
@@ -279,7 +279,6 @@
 			,TMTB_STAT = #{tmtbStat}
 			,TMTB_ST_DT = #{tmtbStdt}
 			,TMTB_ED_DT = #{tmtbEddt}
-			,MULTI_YN = #{multiYn}
 			,UPD_NO = #{updNo}
 			,UPD_DT = NOW()
 	</insert>
@@ -561,40 +560,16 @@
 
 	<select id="getMorebetterDuplicateList" parameterType="MoreBetterGoods" resultType="MoreBetterGoods">
 		/* TsaMarketing.getMorebetterDuplicateList */
-		SELECT TMP.GOODS_CD
-			  ,TMP.GOODS_NM
-		  FROM TB_TMTB_USING_GOODS_TEMP TMP
-		 WHERE 1=1
-		   AND TMP.REG_NO = #{regNo}
-		   AND TMP.GOODS_CD IN (
-				   SELECT  G.GOODS_CD
-					 FROM  TB_GOODS G
-					WHERE  1=1
-						<if test="multiSupplyCompCd != null and multiSupplyCompCd.length>0">
-							AND G.SUPPLY_COMP_CD IN
-							<foreach collection="multiSupplyCompCd" item="item" index="index"  open="(" close=")" separator=",">
-								#{item}
-							</foreach>
-						</if>
-						<if test="multiBrand != null and multiBrand.length>0">
-							AND G.BRAND_CD IN
-							<foreach collection="multiBrand" item="item" index="index"  open="(" close=")" separator=",">
-								#{item}
-							</foreach>
-						</if>
-						<if test="multiApplyGoods != null and multiApplyGoods.length>0">
-							OR G.GOODS_CD IN
-							<foreach collection="multiApplyGoods" item="item" index="index"  open="(" close=")" separator=",">
-								#{item}
-							</foreach>
-						</if>
-				)
-		   <if test="multiExceptGoods != null and multiExceptGoods.length>0">
-		   AND TMP.GOODS_CD NOT IN
-			   <foreach collection="multiExceptGoods" item="item" index="index"  open="(" close=")" separator=",">
-				   #{item}
-			   </foreach>
-		   </if>
+		SELECT 	B.REG_NO
+				, B.GOODS_CD
+				, B.GOODS_NM
+		FROM 	TB_TMTB_APPLY_GOODS_TEMP A
+		JOIN 	TB_TMTB_USING_GOODS_TEMP B
+			ON 	A.REG_NO = B.REG_NO
+			AND A.GOODS_CD = B.GOODS_CD
+		WHERE 1=1
+		  AND A.REG_NO = #{regNo}
+		;
 	</select>
 
 	<update id="updateMorebetterStat" parameterType="MoreBetter">

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

@@ -845,21 +845,21 @@
 		if(usableCustGbCnt<1){
 			mcxDialog.alert("사용가능고객구분을 체크해주세요.");
 			$('#CouponForm input:checkbox[name=usableCustGbArr]').focus();
-			return;
+			return false;
 		}
 		// 사용가능고객등급 체크박스 체크
 		var usableCustGradeCnt = $('#CouponForm input:checkbox[name=usableCustGradeArr]').length;
 		if(usableCustGradeCnt<1){
 			mcxDialog.alert("사용가능고객등급을 체크해주세요.");
 			$('#CouponForm input:checkbox[name=usableCustGradeArr]').focus();
-			return;
+			return false;
 		}
 		// 결제수단 체크박스 체크
 		var payTypeCnt = $('#CouponForm input:checkbox[name=payTypeArr]').length;
 		if(payTypeCnt<1){
 			mcxDialog.alert("사용가능고객등급을 체크해주세요.");
 			$('#CouponForm input:checkbox[name=payTypeArr]').focus();
-			return;
+			return false;
 		}
 
 		//신규가입 지급한다면 validation 체크

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

@@ -103,11 +103,6 @@
 						</td>
 					</tr>
 					<tr>
-						<th>상품여부<em class="required" title="필수"></em></th>
-						<td>
-							<label class="rdoBtn"><input type="radio" name="multiYn" id="multiYnY" value="Y" checked="checked"/>복합상품</label>
-							<label class="rdoBtn"><input type="radio" name="multiYn" id="multiYnN" value="N"/>단일상품</label>
-						</td>
 						<th>상태<em class="required" title="필수"></em></th>
 						<td>
 							<!-- 상태 입력 : before
@@ -525,7 +520,6 @@
 			$("input:radio[name='disTmtbStat']:radio[value="+tmtbMstInfo.tmtbStat+"]").prop('checked', true); // 선택하기
 			$("input:radio[name='sectionGb']:radio[value="+tmtbMstInfo.sectionGb+"]").prop('checked', true); // 선택하기
 			$("input:radio[name='dcWay']:radio[value="+tmtbMstInfo.dcWay+"]").prop('checked', true); // 선택하기
-			$("input:radio[name='multiYn']:radio[value="+tmtbMstInfo.multiYn+"]").prop('checked', true); // 선택하기
 
 			let edDtArr = tmtbMstInfo.tmtbEddt.split(" ");
 			if(edDtArr[1] == "23:59:59") {
@@ -584,6 +578,8 @@
 			mcxDialog.alert("기본상품을 1개 이상 지정해주세요.");
 			return false;
 		}
+
+		return true;
 	};
 
 	var fnBurdenValueCheck = function (){
@@ -597,6 +593,8 @@
 			mcxDialog.alert("업체분담율의 합이 100을 넘을수 없습니다.");
 			return false;
 		}
+
+		return true;
 	};
 
 	// 저장
@@ -647,11 +645,15 @@
 		}
 
 		// 적용상품 그리드에 기본상품 1개이상 있는지 체크
-		fnGoodsGbCheck();
+		if(!fnGoodsGbCheck()) {
+			return false;
+		}
 
 		// 업체분담율 토탈 100% 넘는지 체크
-		fnBurdenValueCheck();
-
+		if(!fnBurdenValueCheck()) {
+			return false;
+		}
+		
 		// 공급업체+브랜드 상품조회
 		var multiSupplyCompCd = [];
 		$.each(allSupplyCompData, function(idx, item) {
@@ -683,7 +685,6 @@
 			, sectionGb : $('input:radio[name="sectionGb"]:checked').val()
 			, applyGb : $('input:radio[name="sectionGb"]:checked').val()
 			, dcWay : $('input:radio[name="dcWay"]:checked').val()
-			, multiYn : $('#moreBetterForm input[name=multiYn]').val()
 			, supplyCompList : allSupplyCompData
 			, brandList : allBrandData
 			, applyGoodsList : allApplyGoodsData
@@ -702,8 +703,7 @@
 	});
 
 	var fnMorebetterSaveCollback = function(result){
-		mcxDialog.alert(result.message);
-
+		//mcxDialog.alert(result.message);
 		if(result.duplicateYn == "Y"){
 			//console.log('duplicateGoodsList Size::'+ result.duplicateGoodsList.length);
 			for(let i=0; i<result.duplicateGoodsList.length; i++){