Merge branch 'develop' into bin2107

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

@@ -253,6 +253,7 @@ public class TsaMorebetterService {
         moreBetterGoods.setMultiBrand(moreBetter.getMultiBrand());
         moreBetterGoods.setMultiApplyGoods(moreBetter.getMultiApplyGoods());
         moreBetterGoods.setMultiExceptGoods(moreBetter.getMultiExceptGoods());
+        moreBetterGoods.setSectionGb(moreBetter.getSectionGb());
         morebetterDao.insertMorebetterApplyGoods(moreBetterGoods);
 
         log.info("newBurdenSq = {}, newTmtbSq = {}, newSupplyCd = {}, newBurdenRate = {} , newUseYn = {}");

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

@@ -665,10 +665,12 @@
 		) Z
 		WHERE	1=1
 		AND 	Z.GOODS_CD NOT IN (
-									SELECT	b.TARGET_VAL
+									SELECT	B.GOODS_CD
 									FROM 	TB_TMTB A
-									LEFT OUTER JOIN TB_TMTB_GOODS B
-									ON A.TMTB_SQ = B.TMTB_SQ
+									INNER   JOIN TB_TMTB_SECTION TS
+									ON      A.TMTB_SQ = TS.TMTB_SQ
+									INNER   JOIN TB_TMTB_APPLY_GOODS B
+									ON      A.TMTB_SQ = B.TMTB_SQ
 									WHERE	A.TMTB_ST_DT <![CDATA[<=]]> NOW()
 									AND 	A.TMTB_ED_DT <![CDATA[>=]]> NOW()
 									AND 	A.TMTB_STAT = 'G232_11'
@@ -676,6 +678,7 @@
 									AND     A.TMTB_SQ <![CDATA[<>]]> #{tmtbSq}
 									</if>
 									AND 	B.GOODS_GB <![CDATA[<>]]> 'G800_30'
+		                            AND     TS.SECTION_GB = #{sectionGb}
 								)
 	</insert>