Merge remote-tracking branch 'TSIT/ST24PRJ-431' into develop

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

@@ -63,7 +63,8 @@ public class Plan extends TscBaseDomain {
 	private String goodsLimitYn;	//상품등록제한여부(Y:상품등록제한)
 	private String goodsLimitQty;	//상품등록제한수(상품등록제한여부가 "Y"일 떄)
 	private String delYn;			//삭제여부(Y:삭제)
-	private String openYn;			//오픈여부(Y:오픈)
+	private String openYn;			//노출여부(Y:오픈)
+	private String useYn;			//사용여부(Y:오픈)
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private long[] dispOrdArr;		//표시순서 배열
 	private long dispOrd;			//표시순서

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

@@ -114,7 +114,8 @@
 		        AND    P.SITE_CD = #{siteCd}
 		        AND    P.FRONT_GB LIKE CONCAT('%',#{frontGb},'%')
 		        AND    NOW() BETWEEN P.DISP_STDT AND P.DISP_EDDT
-		        AND    P.DEL_YN = 'N' /*삭제안된 기획전*/
+		        AND    P.DEL_YN  = 'N' /*삭제안된 기획전*/
+				AND    p.USE_YN  = 'Y' /*사용하는 기획전*/
 		        AND    P.OPEN_YN = 'Y' /*오픈된 기획전*/
 		        <if test="cateNo != null and cateNo != ''">
 		        AND    P.PLAN_SQ IN (SELECT PLAN_SQ
@@ -362,7 +363,7 @@
 		                         WHERE  PLAN_SQ = #{planSq}
 		                         <if test='adminPreview != "Y"'>
 		                          AND    NOW() BETWEEN DISP_STDT AND DISP_EDDT
-		                          AND    OPEN_YN = 'Y'
+		                          AND    USE_YN = 'Y'
 		                          AND    DEL_YN = 'N'
 		                         </if>
 		                        ),0) > 0 THEN 'Y'
@@ -588,7 +589,8 @@
 		        AND    P.FRONT_GB LIKE CONCAT('%',#{frontGb},'%')
 		        </if> -->
 		        AND    NOW() BETWEEN P.DISP_STDT AND P.DISP_EDDT
-		        AND    P.DEL_YN = 'N' /*삭제안된 기획전*/
+		        AND    P.DEL_YN  = 'N' /*삭제안된 기획전*/
+		   		AND    P.USE_YN  = 'Y' /*사용하는 기획전*/
 		        AND    P.OPEN_YN = 'Y' /*오픈된 기획전*/
 		        <if test="exceptPlanSq != null and exceptPlanSq != ''"> <!-- 제외할이벤트 -->
 		        AND    P.PLAN_SQ != #{exceptPlanSq}