다다익선 추가 수정중

src/main/java/com/style24/admin/biz/dao/TsaMorebetterDao.java

@@ -187,6 +187,33 @@ public interface TsaMorebetterDao {
      */
     void deleteTmtbBurdenList(MoreBetterBurden moreBetterBurden);
 
+    /**
+     * 다다익선 - 진행중인 다다익선 상품 조회
+     * @param moreBetterGoods
+     * @return
+     * @author bin2107
+     * @since 2021. 1. 22
+     */
+    Collection<MoreBetterGoods> getMorebetterUsingGoodsList(MoreBetterGoods moreBetterGoods);
+
+    /**
+     * 다다익선 - 진행중인 다다익선 상품 delete
+     * @param
+     * @return
+     * @author bin2107
+     * @since 2021. 1. 22
+     */
+    void deleteTmtbGoodsTemp();
+
+    /**
+     * 다다익선 - 진행중인 다다익선 상품 조회 insert
+     * @param
+     * @return
+     * @author bin2107
+     * @since 2021. 1. 22
+     */
+    void createTmtbGoodsTemp();
+
     /**
      * 다다익선 중복 상품 조회
      * @param moreBetter

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

@@ -137,13 +137,6 @@ public class TsaMorebetterService {
         moreBetter.setRegNo(TsaSession.getInfo().getUserNo());
         moreBetter.setUpdNo(TsaSession.getInfo().getUserNo());
 
-        Collection<MoreBetter> dupList = this.getMorebetterDuplicateList(moreBetter);
-
-        log.info("[dupList size]",dupList.size());
-
-        // 업체&브랜드
-
-/*
         // TMTB 마스터(TB_TMTB) 저장
         morebetterDao.saveMorebetterMst(moreBetter);
 
@@ -286,7 +279,7 @@ public class TsaMorebetterService {
 
             morebetterDao.saveMorebetterBurden(regBurden);
         }
-*/
+
         log.info("newBurdenSq = {}, newTmtbSq = {}, newSupplyCd = {}, newBurdenRate = {} , newUseYn = {}");
     }
 
@@ -398,5 +391,31 @@ public class TsaMorebetterService {
             morebetterDao.deleteTmtbBurdenList(moreBetterBurden);
         }
     }
+
+    /**
+     * 다다익선 - 진행중인 다다익선 상품 TMEP 테이블 생성
+     * @param
+     * @return
+     * @author bin2107
+     * @since 2021. 1. 22
+     */
+    @Transactional("shopTxnManager")
+    public void createMorebetterGoodsTemp() throws Exception {
+        log.info("[createMorebetterGoodsTemp]");
+        morebetterDao.deleteTmtbGoodsTemp();
+        morebetterDao.createTmtbGoodsTemp();
+    }
+
+    /**
+     * 다다익선 - 진행중인 다다익선 상품 조회
+     * @param moreBetterGoods
+     * @return
+     * @author bin2107
+     * @since 2021. 1. 22
+     */
+    public Collection<MoreBetterGoods> getMorebetterUsingGoodsList(MoreBetterGoods moreBetterGoods) {
+        return morebetterDao.getMorebetterUsingGoodsList(moreBetterGoods);
+    }
+
     /* // CSB 진행 */
 }

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

@@ -576,18 +576,28 @@ public class TsaMarketingController extends TsaBaseController {
 	 */
 	@PostMapping("/morebetter/save")
 	@ResponseBody
-	public GagaResponse saveMorebetterDetail(@RequestBody MoreBetter moreBetter) {
-		log.info("18 moreBetter::::::::{}",moreBetter);
-		String[] supplyCompList2 = moreBetter.getSupplyCompArr().split(",");
-		String[] brandList2 = moreBetter.getBrandArr().split(",");
-		//String[] supplyCompList2 = {"1","2"};
-		//String[] brandList2 = {"S001","S006"};
-
-
-		moreBetter.setMultiSupplyCompCd(supplyCompList2);
-		moreBetter.setMultiBrand(brandList2);
-		log.info("19 moreBetter::::::::{}",moreBetter);
-		morebetterService.saveMoreBetterDetail(moreBetter);
+	public GagaResponse saveMorebetterDetail(@RequestBody MoreBetter moreBetter) throws Exception {
+		String[] multiSupplyCompCd = moreBetter.getSupplyCompArr().split(",");
+		String[] multiBrand = moreBetter.getBrandArr().split(",");
+
+		MoreBetterGoods moreBetterGoods = new MoreBetterGoods();
+
+		moreBetterGoods.setMultiSupplyCompCd(multiSupplyCompCd);
+		moreBetterGoods.setMultiBrand(multiBrand);
+		log.info("[saveMorebetterDetail moreBetterGoods]{}",moreBetterGoods);
+
+		// TMTB_GOODS_TEMP TABLE TRUNCATE -> 다른 다다에서 사용중인 상품 조회 -> INSERT
+		morebetterService.createMorebetterGoodsTemp();
+		log.info("[saveMorebetterDetail createMorebetterGoodsTemp a]{}");
+		// 다른 다다에서 사용중인 상품 조회
+		//Collection<MoreBetterGoods> usingGoodsList = morebetterService.getMorebetterUsingGoodsList(moreBetterGoods);
+
+		// SELECT -> 지금 내가 선택한 업체&브랜드에 해당하는 상품 조회 MINUS TMTB_GOODS_TEMP 상품
+		// 조회 건수 있으면 -> 해당 상품코드 엑셀로 던져주기
+		// 조회 건수 없으면 -> 저장으로 넘어감
+
+
+		//morebetterService.saveMoreBetterDetail(moreBetter);
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
 

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

@@ -71,18 +71,6 @@ public class MoreBetter extends TscBaseDomain {
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] arrCompBrandGoods;
 
-	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
-	private String[] multiSupplyCompCd;
-
-	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
-	private String[] multiBrand;
-
-	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
-	private String[] supplyCompList2; // 고시항목
-	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
-	private String[] brandList2; // 고시항목
-
-
 	// Pagination
 	private TscPageRequest pageable;
 	private int pageNo = 1;

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

@@ -40,4 +40,11 @@ public class MoreBetterGoods extends TscBaseDomain {
 
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] arrExceptGoodsSq;
+
+	// 다다 중복 상품 조회시 사용
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	private String[] multiSupplyCompCd;
+
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	private String[] multiBrand;
 }

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

@@ -514,5 +514,31 @@
 			)
 		GROUP BY B.TMTB_SQ
 	</select>
+
+	<delete id="deleteTmtbGoodsTemp">
+		/* TsaMarketing.deleteTmtbGoodsTemp */
+		TRUNCATE TABLE TB_TMTB_GOODS_TEMP
+	</delete>
+
+	<insert id="createTmtbGoodsTemp">
+		/* TsaMarketing.createTmtbGoodsTemp */
+		INSERT INTO TB_TMTB_GOODS_TEMP
+			SELECT 	B.GOODS_CD
+			  FROM 	TB_TMTB A
+		INNER JOIN  TB_TMTB_APPLY_GOODS B
+				ON  A.TMTB_SQ = B.TMTB_SQ
+			WHERE 1=1
+			  AND NOW() BETWEEN DATE_FORMAT(A.TMTB_ST_DT, '%Y-%m-%d %H:%i:%S') AND DATE_FORMAT(A.TMTB_ED_DT, '%Y-%m-%d %H:%i:%S')
+			  AND A.TMTB_STAT = 'G232_11'
+			  AND B.GOODS_GB = 'G800_20'
+			  AND B.DEL_YN = 'N'
+			  AND B.GOODS_CD NOT IN (
+									SELECT	GOODS_CD
+									FROM	TB_TMTB_APPLY_GOODS C
+									WHERE	1=1
+									  AND		B.TMTB_SQ = C.TMTB_SQ
+									  AND		C.GOODS_GB = 'G800_30'
+								)
+	</insert>
 	<!--// CSB 진행 -->
 </mapper>

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

@@ -31,10 +31,6 @@
 			<input type="hidden" name="sectionGbList"/>				<!-- 다다익선 구간/혜택 리스트 -->
 			<input type="hidden" name="supplyCompArr"/>
 			<input type="hidden" name="brandArr"/>
-			<input type="hidden" name="supplyCompList2"/>
-			<input type="hidden" name="brandList2"/>
-			<!--<input type="hidden" name="multiSupplyCompCd"/>
-			<input type="hidden" name="multiBrand"/>-->
 
 			<div class="panelContent">
 				<table class="frmStyle">
@@ -529,7 +525,6 @@
 		var allSupplyCompData = gagaAgGrid.getAllRowData(gridOptionsFGCompanyList);
 		var allBrandData = gagaAgGrid.getAllRowData(gridOptionsFGBrandList);
 
-		var test1 = {};
 		// 공급업체+브랜드 상품조회
 		var multiSupplyCompCd = [];
 		$.each(allSupplyCompData, function(idx, item) {
@@ -541,29 +536,9 @@
 			multiBrand.push(item.brandCd);
 		});
 
-		/*var jsonMultiSupplyCompData = JSON.stringify(multiSupplyCompCd);
-		$('#moreBetterForm input[name=supplyCompArr]').val(jsonMultiSupplyCompData);
-
-		var jsonMultiBrandData = JSON.stringify(multiBrand);
-		$('#moreBetterForm input[name=brandArr]').val(jsonMultiBrandData);
-*/
-		//$('#moreBetterForm input[name=supplyCompArr]').val(JSON.stringify(multiSupplyCompCd));
-		//$('#moreBetterForm input[name=brandArr]').val(JSON.stringify(multiBrand));
-
 		$('#moreBetterForm input[name=supplyCompArr]').val(multiSupplyCompCd.join(','));
 		$('#moreBetterForm input[name=brandArr]').val(multiBrand.join(','));
 
-		console.log('1.>>'+multiBrand);
-		console.log('2.>>'+JSON.stringify(multiBrand));
-
-		//$('#moreBetterForm input[name=supplyCompList2]').val(multiSupplyCompCd);
-		//$('#moreBetterForm input[name=brandList2]').val(multiBrand);
-		/*var data = {multiSupplyCompCd : multiSupplyCompCd
-			,multiBrand : multiBrand
-		};
-
-		var jsonData = JSON.stringify(data);
-*/
 		var jsonData = JSON.stringify($('#moreBetterForm').serializeObject());
 		gagajf.ajaxJsonSubmit($('#moreBetterForm').prop('action'), jsonData, function() {
 			fnMorebetterFormClose();