From cd7057f38613e7dd56f830a7519e5d0ae93c8628 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期五, 10 四月 2026 12:51:29 +0800
Subject: [PATCH] U8单据对接
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 1619b74..ab7b40e 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -4,16 +4,18 @@
import com.zy.asrs.entity.Order;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OrderService;
-import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
import com.zy.common.entity.Parameter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2020/7/7
@@ -38,17 +40,39 @@
}
}
- @Scheduled(cron = "0/5 * * * * ? ")
- @Async("orderThreadPool")
- public void completeAndReport(){
+ @Resource
+ private ThreadPoolTaskExecutor orderThreadPool;
+
+ @Scheduled(cron = "0 * * * * ? ")
+// @Scheduled(cron = "0 0/2 * * * ?")
+ // 10鍒嗛挓鎵ц涓�娆�
+// @Scheduled(cron = "0 0/10 * * * ?")
+ public void completeAndReport() {
String erpReport = Parameter.get().getErpReport();
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
List<Order> orders = orderService.selectComplete();
- for (Order order : orders) {
- ReturnT<String> result = orderSyncHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
- }
+ if (orders.isEmpty()) {
+ return;
+ }
+ // 鎸夊崟鎹被鍨嬪垎缁�
+ Map<String, List<Order>> groupedOrders = orders.stream()
+ .collect(Collectors.groupingBy(order -> {
+ String type = order.getDocType$();
+ switch (type) {
+ case "鎴愬搧鍑哄簱鍗�":
+ return "閿�鍞彂璐у崟";
+ case "鎴愬搧鍏ュ簱鍗�":
+ return "鐢熶骇璁㈠崟";
+ case "棰嗘枡鍗�":
+ return "棰嗘枡鐢宠鍗�";
+ default:
+ return type;
+ }
+ }));
+ for (Map.Entry<String, List<Order>> map : groupedOrders.entrySet()) {
+ orderThreadPool.submit(() -> {
+ orderSyncHandler.startNew(map);
+ });
}
}
}
--
Gitblit v1.9.1