다다익선 진행중인 상품 중복 체크 수정

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

@@ -1028,7 +1028,8 @@ public class TsaMarketingController extends TsaBaseController {
 				if (duplicateGoodsList.size() > 0) {
 					map.set("duplicateYn", "Y");
 					map.set("duplicateGoodsList", duplicateGoodsList);
-					map.set("message", message.getMessage("FAIL_0001"));
+//					map.set("message", message.getMessage("FAIL_0001"));
+					map.set("message", "다다익선 진행중인 상품이 있어 상태 변경되지 않았습니다. 재확인 후 상태 변경해주세요.");
 				} else {
 					// 조회 건수 없으면 -> 저장으로 넘어감
 					map.set("duplicateYn", "N");

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

@@ -540,22 +540,25 @@
 		</if>
 	</delete>
 
+	<!-- 진행중인 다다익선 상품과 중복 체크 -->
 	<select id="getMorebetterDuplicateList" parameterType="MoreBetterGoods" resultType="MoreBetterGoods">
 		/* TsaMorebetter.getMorebetterDuplicateList */
-		SELECT 	REG_NO
-		      , GOODS_CD
-		      , GOODS_NM
-		 FROM	TB_TMTB_APPLY_GOODS_TEMP
-		WHERE	1=1
-		  AND	REG_NO = #{regNo}
-		  AND	GOODS_CD NOT IN (
-		                SELECT	B.GOODS_CD
-		                FROM	TB_TMTB A, TB_TMTB_APPLY_GOODS B
-		                WHERE	1=1
-		                AND		A.TMTB_SQ = B.TMTB_SQ
-		                AND		NOW() BETWEEN A.TMTB_ST_DT AND A.TMTB_ED_DT
-		                AND		B.TMTB_SQ = #{tmtbSq}
-		              )
+		SELECT  TG.GOODS_CD
+		      , (SELECT GOODS_NM FROM TB_GOODS WHERE GOODS_CD = TG.GOODS_CD) AS GOODS_NM
+		FROM    TB_TMTB T, TB_TMTB_APPLY_GOODS TG
+		WHERE   T.TMTB_SQ = TG.TMTB_SQ
+		  AND   T.TMTB_STAT = 'G232_11'
+		  AND   NOW() BETWEEN T.TMTB_ST_DT AND T.TMTB_ED_DT
+		  AND   T.TMTB_SQ NOT IN (#{tmtbSq})
+		  AND   EXISTS (
+		            SELECT  B.GOODS_CD
+		            FROM    TB_TMTB A, TB_TMTB_APPLY_GOODS B
+		            WHERE   1=1
+		              AND   A.TMTB_SQ = B.TMTB_SQ
+		              AND   NOW() BETWEEN A.TMTB_ST_DT AND A.TMTB_ED_DT
+		              AND   B.TMTB_SQ =  #{tmtbSq}
+		              AND   TG.GOODS_CD = B.GOODS_CD
+			)
 	</select>
 
 	<update id="updateMorebetterStat" parameterType="MoreBetter">