From d33a10970ca14424fa8b594027f8434adaffc5b6 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 25 十二月 2024 13:18:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 62 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 61004e9..fc2ccf3 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -6,6 +6,7 @@
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
+import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.entity.Parameter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +17,7 @@
import java.util.List;
/**
- * Created by vincent on 2020/7/7
+ * updated by IX in 2024/12/17
*/
@Slf4j
@Component
@@ -30,7 +31,7 @@
private ApiLogService apiLogService;
@Scheduled(cron = "0 0 1 * * ? ")
- public void clearApiLog(){
+ public void clearApiLog() {
try {
apiLogService.clearWeekBefore();
} catch (Exception e) {
@@ -38,19 +39,64 @@
}
}
-// @Scheduled(cron = "0/5 * * * * ? ")
+ @Scheduled(cron = "0/5 * * * * ? ")
@Async("orderThreadPool")
- public void completeAndReport(){
+ public void completeAndReportOrderIssued() {
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()) {
+ List<Order> orderList = orderService.selectComplete1();
+// List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 1L).eq("status", 1).orderBy("create_time", true));
+ for (Order order : orderList) {
+ try {
+ ReturnT<String> result = orderSyncHandler.startOrderIssued(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ }
+ } catch (Exception e){
+ log.error(e.getMessage());
log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
}
}
}
}
+ @Scheduled(cron = "0/5 * * * * ? ")
+ @Async("orderThreadPool")
+ public void completeAndReportOrderInAndOutUtil() {
+ String erpReport = Parameter.get().getErpReport();
+ if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+ List<Order> orders = OrderInAndOutUtil.selectComplete(null);
+ for (Order order : orders) {
+ try {
+ ReturnT<String> result = orderSyncHandler.startOrderInAndOutUtil(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
+ }
+ } catch (Exception e){
+ log.error(e.getMessage());
+ log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
+ }
+ }
+ }
+ }
+
+ @Scheduled(cron = "0/5 * * * * ? ")
+ @Async("orderThreadPool")
+ public void completeAndReportOrderReport() {
+ String erpReport = Parameter.get().getErpReport();
+ if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+ List<Order> orders = orderService.selectComplete();
+ for (Order order : orders) {
+ try {
+ ReturnT<String> result = orderSyncHandler.startOrderReport(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ }
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ }
+ }
+ }
+ }
}
--
Gitblit v1.9.1