Merge branch 'style' into ST24PRJ-133

src/main/java/com/style24/batch/biz/job/goods/TsbGoodsReinboundJob.java

@@ -5,16 +5,17 @@ import java.util.Collection;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import com.gagaframework.web.parameter.GagaMap;
+import com.gagaframework.web.util.GagaDateUtil;
 import com.style24.batch.biz.job.TsbAbstractJob;
 import com.style24.batch.biz.service.TsbGoodsService;
 import com.style24.batch.support.env.TsbConstants;
+import com.style24.core.biz.service.TscCommonService;
 import com.style24.core.biz.service.TscKakaotalkService;
 import com.style24.persistence.domain.ReinboundInform;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.web.parameter.GagaMap;
-
 /**
  * 재입고 알림
  * 
@@ -30,6 +31,9 @@ public class TsbGoodsReinboundJob extends TsbAbstractJob<ReinboundInform, Reinbo
 	
 	@Autowired
 	private TscKakaotalkService coreKakaotalkService;
+	
+	@Autowired
+	private TscCommonService coreCommonService;
 
 	private int succCnt = 0;
 	private int failCnt = 0;
@@ -48,10 +52,15 @@ public class TsbGoodsReinboundJob extends TsbAbstractJob<ReinboundInform, Reinbo
 
 	@Override
 	public ReinboundInform write(ReinboundInform reinboundInform) throws Exception {
+		// 2021.12.14 card007 영업일 체크 추가
+		String bizdayYn = coreCommonService.getBizdayYn(GagaDateUtil.getToday("yyyyMMdd"));
+		if (!"Y".equals(bizdayYn)) {
+			return reinboundInform;
+		}
 
 		Collection<ReinboundInform> reinboundInformList = goodsService.getReinboundInformList();
 		if (reinboundInformList == null || reinboundInformList.isEmpty()) {
-			return reinboundInform;	
+			return reinboundInform;
 		}
 		
 		for (ReinboundInform reinbound : reinboundInformList) {
@@ -69,7 +78,7 @@ public class TsbGoodsReinboundJob extends TsbAbstractJob<ReinboundInform, Reinbo
 			int result = coreKakaotalkService.goodsRestock(goods, TsbConstants.REG_NO);
 			if (result > 0) {
 				reinbound.setUpdNo(TsbConstants.REG_NO);
-				goodsService.updateReinboundInform(reinbound);	
+				goodsService.updateReinboundInform(reinbound);
 			}
 		}
 		

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

@@ -25,8 +25,8 @@ import com.style24.batch.biz.job.goods.TsbGoodsWmsBrandproviderJob;
 import com.style24.batch.biz.job.goods.TsbGoodsWmsGoodsJob;
 import com.style24.batch.biz.job.goods.TsbGoodsWmsGoodsStockJob;
 import com.style24.batch.biz.job.goods.TsbGoodsWmsIncomelotJob;
-import com.style24.batch.biz.job.goods.TsbGoodsWmsProductskuJob;
 import com.style24.batch.biz.job.goods.TsbGoodsWmsMeasurementJob;
+import com.style24.batch.biz.job.goods.TsbGoodsWmsProductskuJob;
 import com.style24.batch.biz.job.goods.TsbNaverAllEp;
 import com.style24.batch.biz.job.goods.TsbNaverSellEp;
 import com.style24.batch.biz.job.goods.TsbNaverSummaryEp;
@@ -397,6 +397,7 @@ public class TsbGoodsTask {
 	 * @throws Exception
 	 */
 	@Scheduled(cron = "${cron.goods.reinbound.notify}")
+	// @Scheduled(fixedDelay = 3500000)
 	@Async
 	public void reinboundJob() throws Exception {
 		goodsReinboundJob.runById("cron.goods.reinbound.notify");

src/main/resources/config/application-brdg.yml

@@ -101,6 +101,7 @@ cron:
         #category.filter.create: 2 22 2 29 2 ?  #카테고리별 검색필터 생성. 사용안함
         recently.reg.goods.create: 2 22 2 29 2 ?  #최근등록된 상품 100개 생성
         main.contents.goods.create: 2 22 2 29 2 ?  #몰 메인 컨텐츠 상품생성 (1시간 1회)
+        brand.group.display.update: 2 22 2 29 2 ?  #브랜드 그룹 전시상태갱신 (1일 1회)
 
     # 주문
     order:

src/main/resources/config/application-locd.yml

@@ -109,6 +109,7 @@ cron:
         #category.filter.create: 0 45 * * * *   #카테고리별 검색필터 생성 (1시간 1회)
         recently.reg.goods.create: 2 22 2 29 2 ?  #최근등록된 상품 100개 생성
         main.contents.goods.create: 2 22 2 29 2 ?  #몰 메인 컨텐츠 상품생성 (1시간 1회)
+        brand.group.display.update: 2 22 2 29 2 ?  #브랜드 그룹 전시상태갱신 (1일 1회)
 
     # 주문
     order:

src/main/resources/config/application-locp.yml

@@ -109,6 +109,7 @@ cron:
         #category.filter.create: 0 45 * * * *   #카테고리별 검색필터 생성 (1시간 1회)
         recently.reg.goods.create: 2 22 2 29 2 ?  #최근등록된 상품 100개 생성
         main.contents.goods.create: 2 22 2 29 2 ?  #몰 메인 컨텐츠 상품생성 (1시간 1회)
+        brand.group.display.update: 2 22 2 29 2 ?  #브랜드 그룹 전시상태갱신 (1일 1회)
 
     # 주문
     order:

src/main/resources/config/application-style.yml

@@ -72,7 +72,7 @@ cron:
         search:
             all.create: 0 0 2 * * *               #검색전체색인 생성 (1일 1회)
             section.create: 0 10 0-1,3-23 * * *   #검색부분색인 생성 (매시 10분)
-        reinbound.notify:  2 22 2 29 2 ?          #재입고알림톡 발송
+        reinbound.notify:  31 5 9-19 * * MON-FRI  #재입고알림톡 발송 (1시간 1회)
         vwstock.create: 2 22 2 29 2 ?             #VW_STOCK 생성 (1시간 1회). 사용안함
 
     # 회원(고객)