Merge branch 'develop' into bin2107

src/main/java/com/style24/batch/biz/task/TsbCustomerTask.java

@@ -52,7 +52,7 @@ public class TsbCustomerTask {
 	 * @author jsshin
 	 * @since 2021. 03. 08
 	 */
-	@Scheduled(cron = "${cron.customer.dormant.schedule}")
+//	@Scheduled(cron = "${cron.customer.dormant.schedule}")
 //	@Scheduled(fixedDelay=360000)
 	@Async
 	public void dormantScheduleJob() throws Exception {
@@ -66,7 +66,7 @@ public class TsbCustomerTask {
 	 * @author jsshin
 	 * @since 2021. 03. 08
 	 */
-	@Scheduled(cron = "${cron.customer.dormant.transform}")
+//	@Scheduled(cron = "${cron.customer.dormant.transform}")
 //	@Scheduled(fixedDelay=360000)
 	@Async
 	public void dormantTransformJob() throws Exception {
@@ -80,7 +80,7 @@ public class TsbCustomerTask {
 	 * @author jsshin
 	 * @since 2021. 03. 08
 	 */
-	@Scheduled(cron = "${cron.customer.secede.process}")
+//	@Scheduled(cron = "${cron.customer.secede.process}")
 //	@Scheduled(fixedDelay=360000)
 	@Async
 	public void secedeProcessJob() throws Exception {
@@ -94,7 +94,7 @@ public class TsbCustomerTask {
 	 * @author jsshin
 	 * @since 2021. 05. 06
 	 */
-	@Scheduled(cron = "${cron.customer.privacy.policy.notice}")
+//	@Scheduled(cron = "${cron.customer.privacy.policy.notice}")
 //	@Scheduled(fixedDelay=360000)
 	@Async
 	public void privacyPolicyNoticeJob() throws Exception {
@@ -108,7 +108,7 @@ public class TsbCustomerTask {
 	 * @author jsshin
 	 * @since 2021. 05. 06
 	 */
-	@Scheduled(cron = "${cron.customer.marketing.agreement.notice}")
+//	@Scheduled(cron = "${cron.customer.marketing.agreement.notice}")
 //	@Scheduled(fixedDelay=360000)
 	@Async
 	public void marketingAgreementNoticeJob() throws Exception {
@@ -122,7 +122,7 @@ public class TsbCustomerTask {
 	 * @author jsshin
 	 * @since 2021. 05. 06
 	 */
-	@Scheduled(cron = "${cron.customer.grade.change}")
+//	@Scheduled(cron = "${cron.customer.grade.change}")
 //	@Scheduled(fixedDelay=360000)
 	@Async
 	public void gradeChangeJob() throws Exception {
@@ -135,7 +135,7 @@ public class TsbCustomerTask {
 	 * @author gagamel
 	 * @since 2021. 5. 10
 	 */
-	@Scheduled(cron = "${cron.customer.netpathy.sync}")
+//	@Scheduled(cron = "${cron.customer.netpathy.sync}")
 //	@Scheduled(fixedDelay = 360000)
 	@Async
 	public void syncronizeNetpathyMailCustomerInfo() throws Exception {

src/main/java/com/style24/batch/biz/task/TsbMarketingTask.java

@@ -72,7 +72,7 @@ public class TsbMarketingTask {
 	 * @since 2021. 04. 26
 	 */
 	//@Scheduled(cron = "${cron.marketing.expire.point}")
-	@Scheduled(fixedDelay=360000)
+//	@Scheduled(fixedDelay=360000)
 	@Async
 	public void expirePointJob() throws Exception {
 		expirePointJob.runById("cron.marketing.expire.point");

src/main/java/com/style24/batch/biz/task/TsbSocialTask.java

@@ -2,6 +2,7 @@ package com.style24.batch.biz.task;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import com.style24.batch.biz.job.social.TsbSocialGoodsJob;
@@ -55,7 +56,7 @@ public class TsbSocialTask {
 	 *
 	 * @throws Exception
 	 */
-	//@Scheduled(cron = "${cron.social.socialGoodsJob}") // * 0 15 10 * * ?" : 아무 요일, 매월, 매일 10:15:00 // 매시 5분 0 5 * * * *
+	@Scheduled(cron = "${cron.social.socialGoodsJob}") // * 0 15 10 * * ?" : 아무 요일, 매월, 매일 10:15:00 // 매시 5분 0 5 * * * *
 	//@Scheduled(fixedDelay=360000)
 	@Async
 	public void tsbSocialGoodsJob() throws Exception {

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

@@ -570,8 +570,6 @@
 		                AND    CP.CPN_TYPE = 'G230_10' /*즉시할인쿠폰*/
 		                AND    CP.DC_CD_GB = 'G233_00'                         -- 일반유형(할인쿠폰구분)
 		                AND   (
-		                        (CP.APPLY_SCOPE = 'A' ) 
-		                        OR  /* 적용대상:상품*/
 		                        (CP.APPLY_SCOPE = 'I' AND (SELECT COUNT(1) FROM TB_COUPON_REFVAL
 		                                                   WHERE CPN_ID = CP.CPN_ID
 		                                                   AND CPN_TARGET = 'G260_10'