다다익선 임시 커밋

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

@@ -855,13 +855,18 @@ public class TsaMarketingController extends TsaBaseController {
 	@ResponseBody
 	public GagaResponse updateMorebetterStat(@RequestBody MoreBetter moreBetter) {
 		try {
-			morebetterService.updateMorebetterStat(moreBetter);
+			log.info("getTmtbStat :::{}",moreBetter.getTmtbStat());
+			if("G232_11".equals(moreBetter.getTmtbStat())){
+
+			}else{
+				morebetterService.updateMorebetterStat(moreBetter);
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 			return super.error(message.getMessage("FAIL_0001"));
 		}
 
-		return super.ok(message.getMessage("SUCC_0003"));
+		return super.ok(message.getMessage("SUCC_0002"));
 	}
 
 	/**

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

@@ -597,8 +597,8 @@
 		return true;
 	};
 
-	// 저장
-	$('#btnMorebetterSave').on('click', function() {
+	var fnCheckData = function (){
+		console.log('[fnCheckData]');
 		// validation
 		if (!gagajf.validation('#moreBetterForm'))
 			return false;
@@ -631,6 +631,22 @@
 			return false;
 		}
 
+		// 적용상품 그리드에 기본상품 1개이상 있는지 체크
+		if(!fnGoodsGbCheck()) {
+			return false;
+		}
+
+		// 업체분담율 토탈 100% 넘는지 체크
+		if(!fnBurdenValueCheck()) {
+			return false;
+		}
+
+	};
+
+	// 저장
+	$('#btnMorebetterSave').on('click', function() {
+		fnCheckData();
+
 		// 각 ag-grid list 수량
 		let allSupplyCompData = gagaAgGrid.getAllRowData(gridOptionsFGCompanyList);
 		let allBrandData = gagaAgGrid.getAllRowData(gridOptionsFGBrandList);
@@ -644,16 +660,6 @@
 			return false;
 		}
 
-		// 적용상품 그리드에 기본상품 1개이상 있는지 체크
-		if(!fnGoodsGbCheck()) {
-			return false;
-		}
-
-		// 업체분담율 토탈 100% 넘는지 체크
-		if(!fnBurdenValueCheck()) {
-			return false;
-		}
-		
 		// 공급업체+브랜드 상품조회
 		var multiSupplyCompCd = [];
 		$.each(allSupplyCompData, function(idx, item) {
@@ -1190,8 +1196,72 @@
 	});
 
 	// 진행 버튼 클릭
-	$("#moreBetterForm #btnChangeStatIng").on("click", function() {
+	$("#btnChangeStatIng").on("click", function() {
 		console.log('1111111111111');
+
+		fnCheckData();
+
+		// 각 ag-grid list 수량
+		let allSupplyCompData = gagaAgGrid.getAllRowData(gridOptionsFGCompanyList);
+		let allBrandData = gagaAgGrid.getAllRowData(gridOptionsFGBrandList);
+		let allApplyGoodsData = gagaAgGrid.getAllRowData(gridOptionsFGApplyGoodsList);
+		let allExceptGoodsData = gagaAgGrid.getAllRowData(gridOptionsFGExceptGoodsList);
+		let allApplyBurdenData = gagaAgGrid.getAllRowData(gridOptionsApplyBurdenList);
+		let allSectionGbData = gagaAgGrid.getAllRowData(gridOptionsSectionGbList);
+
+		if(allSectionGbData.length < 1){
+			mcxDialog.alert("할인구간을 설정해주세요.");
+			return false;
+		}
+
+		// 공급업체+브랜드 상품조회
+		var multiSupplyCompCd = [];
+		$.each(allSupplyCompData, function(idx, item) {
+			multiSupplyCompCd.push(item.supplyCompCd);
+		});
+
+		var multiBrand = [];
+		$.each(allBrandData, function(idx, item) {
+			multiBrand.push(item.brandCd);
+		});
+
+		var multiApplyGoods = [];
+		$.each(allApplyGoodsData, function(idx, item) {
+			multiApplyGoods.push(item.goodsCd);
+		});
+
+		var multiExceptGoods = [];
+		$.each(allExceptGoodsData, function(idx, item) {
+			multiExceptGoods.push(item.goodsCd);
+		});
+
+		var data = {
+			mode : $('#moreBetterForm input[name=mode]').val()
+			, tmtbSq : $('#moreBetterForm input[name=disTmtbSq]').val()
+			, tmtbNm : $('#moreBetterForm input[name=tmtbNm]').val()
+			, tmtbStat : "G232_11"				// 진행
+			, tmtbStdt : $('#moreBetterForm input[name=tmtbStdt]').val()
+			, tmtbEddt : $('#moreBetterForm input[name=tmtbEddt]').val()
+			, sectionGb : $('input:radio[name="sectionGb"]:checked').val()
+			, applyGb : $('input:radio[name="sectionGb"]:checked').val()
+			, dcWay : $('input:radio[name="dcWay"]:checked').val()
+			, supplyCompList : allSupplyCompData
+			, brandList : allBrandData
+			, applyGoodsList : allApplyGoodsData
+			, exceptGoodsList : allExceptGoodsData
+			, burdenList : allApplyBurdenData
+			, sectionGbList : allSectionGbData
+			, multiSupplyCompCd : multiSupplyCompCd
+			, multiBrand : multiBrand
+			, multiApplyGoods : multiApplyGoods
+			, multiExceptGoods : multiExceptGoods
+		};
+
+		var jsonData = JSON.stringify(data);
+
+		gagajf.ajaxJsonSubmit('/marketing/morebetter/changeStat', jsonData, fnMorebetterChangeStatCollback);
+
+
 		/*mcxDialog.confirmC("프로모션을 진행하시겠습니까?<br/>진행 후에는 수정이 제한될 수 있습니다.", {
 			btn: confirmBtnText,
 			btnClick: function(index) {
@@ -1206,8 +1276,12 @@
 		});*/
 	});
 
-	// 진행 버튼 클릭
-	$("#moreBetterForm #btnMorebetterStop").on("click", function() {
+	var fnMorebetterChangeStatCollback = function(result){
+		console.log('<fnMorebetterChangeStatCollback result>');
+	};
+
+	// 중지 버튼 클릭
+	$("#btnMorebetterStop").on("click", function() {
 		mcxDialog.confirmC("프로모션을 중지하시겠습니까?<br/>중지 후에는 진행으로 복원하실 수 없습니다.", {
 			btn: confirmBtnText,
 			btnClick: function(index) {
@@ -1238,5 +1312,7 @@
 		});
 	});
 
+
+
 </script>
 </html>