tsit05 4 gadi atpakaļ
vecāks
revīzija
d6b1cfea10

+ 23 - 0
src/main/java/com/style24/batch/biz/job/delivery/TsbCjWithdrawInvoiceJob.java

@@ -71,6 +71,29 @@ public class TsbCjWithdrawInvoiceJob extends TsbAbstractJob<Collection<Delivery>
 			}
 		}
 		
+
+		/**
+		 * 1. cj  회수 상태 조회 
+		 * 2. mall tb_order_change 상태값 업뎃 , tb_order_change_detail 변경상태 업데이트
+		 * 3. cj  완료 업데이트
+		 * */
+
+		Collection<Delivery> statList = cjDeliveryService.getCjWdStatList();
+		
+		 for(Delivery data : statList) {
+			 
+			 // 2. mall tb_order_change 상태값 업뎃 , tb_order_change_detail 변경상태 업데이트 (배송완료일경우)
+			 deliveryService.updateTbOrderChangeStat(data);
+			 
+			 // 3. cj  완료 업데이트
+			 cjDeliveryService.updateCjWdStat(data);
+		 }
+		
+		succCnt = 1;
+		failCnt = 0;
+		
+		
+		
 		return invcRcpList;
 	}
 

+ 1 - 1
src/main/java/com/style24/batch/biz/task/TsbWithdrawTask.java

@@ -117,7 +117,7 @@ public class TsbWithdrawTask {
 	 * @throws Exception
 	 */
 	@Scheduled(cron = "${cron.withdraw.cj.invoice.receive}")
-	//@Scheduled(fixedDelay = 3500000)
+	@Scheduled(fixedDelay = 3500000)
 	@Async
 	public void withdrawCjInvoiceReceiveJob() throws Exception {
 		tsbCjWithdrawInvoiceJob.runById("cron.withdraw.cj.invoice.receive");

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

@@ -159,8 +159,8 @@ cron:
                 #result.receive: 0 6/10 * * * *           #WMS 회수입고결과 수신 (1시간 1회)
                 result.receive: 2 22 2 29 2 ?            #WMS 회수입고결과 수신 (1시간 1회)
         cj:
-            invoice.receive: 0 17 * * * *                #CJ 회수송장번호 수신 (1시간 1회)
-            status.receive: 0 37 * * * *                 #CJ 회수상태 수신 (1시간 1회)
+            invoice.receive: 0 30 * * * *                #CJ 회수송장번호 수신 (1시간 1회)
+            status.receive: 2 22 2 29 2 ?                 #CJ 회수상태 수신 (1시간 1회)
 
     #네이버페이
     naverPay.order.batch: 2 22 2 29 2 ?                  #네이버페이 배치 실행