From 94e3cc94d83f5ec1bb64e48360a15d057f3643d9 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 12 十二月 2025 15:32:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jsxswms' into jsxswms
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 6887117..75e2e92 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -2,6 +2,7 @@
import com.core.common.Cools;
import com.zy.asrs.entity.Order;
+import com.zy.asrs.enums.OrderTypeEnum;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.core.ReturnT;
@@ -10,6 +11,7 @@
import com.zy.common.entity.Parameter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -29,6 +31,9 @@
private OrderService orderService;
@Autowired
private ApiLogService apiLogService;
+
+ @Value("${erp.switch.ErpReportOld}")
+ private boolean ErpReportOld;
@Scheduled(cron = "0 0 1 * * ? ")
public void clearApiLog() {
@@ -97,9 +102,12 @@
// }
}
- @Scheduled(cron = "0/5 * * * * ? ")
+ @Scheduled(cron = "0/30 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReportOrderReport() {
+ if (!ErpReportOld){
+ return;
+ }
String erpReport = Parameter.get().getErpReport();
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
List<Order> orders = orderService.selectComplete();
--
Gitblit v1.9.1