다다익선수정

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

@@ -224,6 +224,7 @@ public class TsaMorebetterService {
         // 업체&브랜드 상품
         MoreBetterGoods moreBetterGoods = new MoreBetterGoods();
         StringBuilder sb = new StringBuilder();
+        StringBuilder sb3 = new StringBuilder();
         //int i = 1;
 
         if(moreBetter.getGridApplyGoodsList().size()>0){    //getApplyGoodsList
@@ -232,9 +233,15 @@ public class TsaMorebetterService {
                 if(i<moreBetter.getGridApplyGoodsList().size()-1){
                     sb.append("\n UNION ALL \n");
                 }
+
+                sb3.append("SELECT   '").append(moreBetter.getGridApplyGoodsList().get(i).getGoodsCd()).append("' AS GOODS_CD ").append(" , '").append(moreBetter.getGridApplyGoodsList().get(i).getGoodsGb()).append("' AS GOODS_GB ");
+                if(i<moreBetter.getGridApplyGoodsList().size()-1){
+                    sb3.append("\n UNION ALL \n");
+                }
             }
         }
         moreBetterGoods.setApplySql(sb.toString());
+        moreBetterGoods.setApplyGbSql(sb3.toString());
 
         StringBuilder sb2 = new StringBuilder();
         if(moreBetter.getExceptGoodsList().size()>0){

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

@@ -35,6 +35,7 @@ public class MoreBetterGoods extends TscBaseDomain {
 	private String sectionGb;		// 구간설정 구분값(G810_10:수량,G810_11:금액)
 	private String applySql;	// 적용 상품 쿼리문
 	private String exceptSql;	// 적용 상품 쿼리문
+	private String applyGbSql;	// 적용 상품&구분 쿼리문
 
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] arrCompanySq;

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

@@ -629,7 +629,7 @@
 			, UPD_DT
 		)
 		SELECT #{tmtbSq} AS TMTB_SQ
-				, 'G800_10' AS GOODS_GB
+				, Z.GOODS_GB AS GOODS_GB
 				, Z.GOODS_CD AS GOODS_CD
 				, 'N' AS DEL_YN
 				, #{regNo} AS REG_NO
@@ -638,9 +638,11 @@
 				, NOW() AS UPD_DT
 		FROM	(
 			SELECT T.GOODS_CD
+			     , T.GOODS_GB
 			FROM (
 				<if test="multiSupplyCompCd!= null and multiSupplyCompCd.length>0">
 					SELECT GOODS_CD
+					     , 'G800_10' AS GOODS_GB
 					FROM TB_GOODS
 					WHERE SUPPLY_COMP_CD IN
 					<foreach collection="multiSupplyCompCd" item="item" open="(" separator="," close=")">
@@ -653,6 +655,7 @@
 				</if>
 				<if test="multiBrand!= null and multiBrand.length>0">
 					SELECT	GOODS_CD
+					      , 'G800_10' AS GOODS_GB
 					FROM	TB_GOODS
 					WHERE 	BRAND_CD IN
 					<foreach collection="multiBrand" item="item" open="(" separator="," close=")">
@@ -663,7 +666,7 @@
 					</if>
 					UNION ALL
 				</if>
-				${applySql}
+				${applyGbSql}
 			) T
 			WHERE	1=1
 			<if test="multiExceptGoods!= null and multiExceptGoods.length>0">