From d814bde01eb91d1544b718463cd31317726bbf6b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 27 十二月 2023 21:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
index 994040d..9e16279 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
@@ -11,6 +11,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.util.Date;
import java.util.List;
/**
@@ -28,7 +29,7 @@
@Value("${erp.switch.ReviewOrderSwitch}")
private boolean ReviewOrderSwitch;
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReport(){
if(!ReviewOrderSwitch){
@@ -36,9 +37,15 @@
}
List<Order> orders = orderService.selectComplete();
for (Order order : orders) {
- ReturnT<String> result = reviewOrderSyncHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]鍚慹rp瀹℃牳澶辫触", order.getOrderNo());
+ try{
+ ReturnT<String> result = reviewOrderSyncHandler.start(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]鍚慹rp瀹℃牳澶辫触", order.getOrderNo());
+ }
+ }catch (Exception e){
+ Order order1 = orderService.selectById(order.getId());
+ order1.setUpdateTime(new Date());
+ orderService.updateById(order1);
}
}
}
--
Gitblit v1.9.1