Merge branch 'sowon' into develop

src/main/java/com/style24/batch/biz/job/marketing/TsbExpectGiftcardJob.java

@@ -37,8 +37,7 @@ public class TsbExpectGiftcardJob  extends TsbAbstractJob<Collection<GiftCard>,
 	public GagaMap process(Collection<GiftCard> readItem) throws Exception {
 		for (GiftCard giftcard : readItem) {
 			try {
-				log.info("giftcard ===> {}", giftcard);
-				kakaoService.sendGiftcardExpect(giftcard, giftcard.getCustNo());
+				kakaoService.sendGiftcardExpectNotify(giftcard, giftcard.getCustNo());
 				succCnt++;
 			} catch (Exception e) {
 				failCnt++;

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

@@ -218,10 +218,11 @@ public class TsbCustomerTask {
 	 * @author sowon
 	 * @since 2021. 05. 27
 	 */
-	@Scheduled(cron = "${cron.customer.giftcard.expect}")
-	@Async
+	//@Scheduled(cron = "${cron.customer.giftcard.expect.notify}")
+	//@Async
+	@Scheduled(fixedDelay=3500000)
 	public void giftcardExpectJob() throws Exception {
-		expectGiftcardJob.runById("cron.customer.giftcard.expect");
+		expectGiftcardJob.runById("cron.customer.giftcard.expect.notify");
 	}
 
 	/**

src/main/java/com/style24/batch/biz/web/TsbCustomerController.java

@@ -233,10 +233,10 @@ public class TsbCustomerController extends TscBaseController {
 	 * @author sowon
 	 * @since 2021. 05. 27
 	 */
-	@GetMapping("/giftcard/expect")
+	@GetMapping("/giftcard/expect/notify")
 	@ResponseBody
 	public String expectGiftcard() throws Exception {
-		expectGiftcardJob.runById("cron.customer.giftcard.expect");
+		expectGiftcardJob.runById("cron.customer.giftcard.expect.notify");
 		return "OK";
 	}
 

src/main/resources/config/application.yml

@@ -52,7 +52,7 @@ cron:
         point.expire: 2 22 2 29 2 ?            #포인트 소멸 처리
         giftcard.expire : 2 22 2 29 2 ?        #상품권 소멸 처리
         review.register.notify: 2 22 2 29 2 ?  #상품평등록안내 발송(일배치)
-        giftcard.expect : 2 22 2 29 2 ?        #상품권 소멸예정 알림톡
+        giftcard.expect.notify : 2 22 2 29 2 ? #상품권 소멸예정 알림톡
         
 
     # 전시