From b6f1e646ac5005b4f4bad7c1eec706c96f2eaca7 Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期二, 05 八月 2025 14:39:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 62 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 19876f6..10d0ebb 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -3,17 +3,23 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.Review;
+import com.zy.asrs.entity.ReviewDetl;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OrderService;
+import com.zy.asrs.service.ReviewDetlService;
+import com.zy.asrs.service.ReviewService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
-import com.zy.common.entity.Parameter;
+import com.zy.system.entity.Config;
+import com.zy.system.mapper.ConfigMapper;
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 javax.annotation.Resource;
import java.util.List;
/**
@@ -28,10 +34,16 @@
@Autowired
private OrderService orderService;
@Autowired
+ private ReviewService reviewService;
+ @Autowired
+ private ReviewDetlService reviewDetlService;
+ @Autowired
private ApiLogService apiLogService;
+ @Resource
+ private ConfigMapper configMapper;
@Scheduled(cron = "0 0 1 * * ? ")
- public void clearApiLog(){
+ public void clearApiLog() {
try {
apiLogService.clearWeekBefore();
} catch (Exception e) {
@@ -39,19 +51,51 @@
}
}
- @Scheduled(cron = "0/5 * * * * ? ")
+ @Scheduled(cron = "0/9 * * * * ? ")
@Async("orderThreadPool")
- public void completeAndReport(){
- String erpReport = Parameter.get().getErpReport();
- if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L).eq("status", 1));
- for (Order order : orders) {
+ public void completeAndReport() {
+ Config config = configMapper.selectConfigByCode("erpReport");
+ if (config == null || config.getStatus() == 0) {
+ return;
+ }
+
+ List<Order> orders = orderService.selectComplete();
+ for (Order order : orders) {
+ try {
ReturnT<String> result = orderSyncHandler.start(order);
if (!result.isSuccess()) {
log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
}
+ } catch (Exception e) {
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ log.error("璁㈠崟" + order + "澶勭悊澶辫触锛屽紓甯镐俊鎭細" + e);
+ }
+ }
+
+ }
+
+
+ @Scheduled(cron = "0/30 * * * * ? ")
+ public void complete() {
+ List<Review> orders = reviewService.selectList(new EntityWrapper<Review>().eq("settle", 2));
+ for (Review order : orders) {
+ try {
+ boolean flag = true;
+ List<ReviewDetl> reviewDetls = reviewDetlService.selectList(new EntityWrapper<ReviewDetl>().eq("order_no", order.getOrderNo()));
+ for (ReviewDetl reviewDetl : reviewDetls) {
+ if (Cools.isEmpty(reviewDetl.getInspect()) || reviewDetl.getInspect() == 0) {
+ flag = false;
+ break;
+ }
+ }
+ if (flag) {
+ order.setSettle(4L);
+ reviewService.updateById(order);
+ }
+ log.info("鍗曟嵁[orderNo={}]澶勭悊瀹屾垚", order.getOrderNo());
+ } catch (Exception e) {
+ log.error("鍗曟嵁[orderNo={}]澶勭悊澶辫触锛屽紓甯镐俊鎭細" + e, order.getOrderNo());
}
}
}
-
}
--
Gitblit v1.9.1