다다익선 - 저장로직 수정

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

@@ -267,5 +267,7 @@ public interface TsaMorebetterDao {
      * @since 2021. 2. 1
      */
     List<MoreBetterGoods> getMorebetterRealApplyGoodsList(MoreBetter moreBetter);
+
+    List<MoreBetterGoods> getMorebetterCompBrandGoodsList(MoreBetterGoods moreBetterGoods);
     /* // CSB 진행 */
 }

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

@@ -342,6 +342,21 @@ public class TsaMorebetterService {
         moreBetterGoods.setRegNo(TsaSession.getInfo().getUserNo());
 
         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);
+                    applyGoodsList.add(compBrandGoodsList.get(i));
+                }
+            }
+        }
+
         for(int i=0; i<moreBetterGoods.getMultiApplyGoods().length; i++){
             moreBetterGoods.setGoodsCd(moreBetterGoods.getMultiApplyGoods()[i]);
             morebetterDao.createTmtbApplyGoodsTemp(moreBetterGoods);

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

@@ -720,6 +720,7 @@ public class TsaMarketingController extends TsaBaseController {
 			moreBetterGoods.setMultiExceptGoods(moreBetter.getMultiExceptGoods());
 
 			// TMTB_GOODS_TEMP TABLE TRUNCATE -> 다른 다다에서 사용중인 상품 조회 -> INSERT
+			moreBetterGoods.setApplyGoodsList(moreBetter.getApplyGoodsList());
 			morebetterService.createMorebetterGoodsTemp(moreBetterGoods);
 
 			morebetterService.saveMoreBetterDetail(moreBetter);

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

@@ -80,8 +80,6 @@ public class MoreBetter extends TscBaseDomain {
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] multiDuplicateGoods;
 
-	private Collection<MoreBetterGoods> checkData;
-	List<MoreBetterGoods> dupList;
 	// 날짜+시간
 	private String eventStdt;				// 다다익선시작일시
 	private String eventStHH;				// 다다익선시작일시

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

@@ -59,6 +59,8 @@ public class MoreBetterGoods extends TscBaseDomain {
 
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] multiDuplicateGoods;
+
+	List<MoreBetterGoods> applyGoodsList;
 /*
 	List<MoreBetterGoods> multiSupplyCompCd;
 	List<MoreBetterGoods> multiBrand;

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

@@ -640,5 +640,26 @@
 							  AND	REG_NO = #{regNo}
 							)
 	</select>
+
+	<select id="getMorebetterCompBrandGoodsList" parameterType="MoreBetterGoods" resultType="MoreBetterGoods">
+		/* TsaMarketing.getMorebetterCompBrandGoodsList */
+		SELECT  G.GOODS_CD
+				,'G800_20' AS GOODS_GB
+				,'G260_10' AS TARGET_GB
+		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>
+	</select>
 	<!--// CSB 진행 -->
 </mapper>