From b51eadaa66a5c0ee6da0e418a3ba193dfc878fca Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 13:21:56 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 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 7dd3566..693f11b 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,15 +1,22 @@
package com.zy.asrs.task;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetlReport;
+import com.zy.asrs.entity.OrderDetlReportLog;
import com.zy.asrs.service.ApiLogService;
+import com.zy.asrs.service.OrderDetlReportLogService;
+import com.zy.asrs.service.OrderDetlReportService;
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.stereotype.Component;
import java.util.List;
@@ -17,7 +24,7 @@
* Created by vincent on 2020/7/7
*/
@Slf4j
-//@Component
+@Component
public class OrderSyncScheduler {
@Autowired
@@ -26,9 +33,13 @@
private OrderService orderService;
@Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private OrderDetlReportService orderDetlReportService;
+ @Autowired
+ private OrderDetlReportLogService orderDetlReportLogService;
@Scheduled(cron = "0 0 1 * * ? ")
- public void clearApiLog(){
+ public void clearApiLog() {
try {
apiLogService.clearWeekBefore();
} catch (Exception e) {
@@ -36,14 +47,36 @@
}
}
+ @Scheduled(cron = "0/30 * * * * ? ")
+ public void clearReportLog() {
+ try {
+ List<OrderDetlReport> orderDetls = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>());
+ for (OrderDetlReport orderDetl : orderDetls) {
+ Order order = orderService.selectByNo(orderDetl.getOrderNo());
+ if (order == null) {
+ OrderDetlReportLog orderDetlReportLog = new OrderDetlReportLog();
+ orderDetlReportLog.sync(orderDetl);
+ orderDetlReportLog.setId(null);
+ orderDetlReportLogService.insert(orderDetlReportLog);
+ orderDetlReportService.deleteById(orderDetl.getId());
+ }
+ }
+ } catch (Exception e) {
+ log.error("涓婃姤鏃ュ織鍒犻櫎", e);
+ }
+ }
+
@Scheduled(cron = "0/5 * * * * ? ")
@Async("orderThreadPool")
- public void completeAndReport(){
- List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L).eq("status", 1));
- for (Order order : orders) {
- ReturnT<String> result = orderSyncHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ 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());
+ }
}
}
}
--
Gitblit v1.9.1