From b3ee81c96c5744b05cf1e21cfb895ee489e763e6 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 11 八月 2023 11:25:34 +0800
Subject: [PATCH] #小数继续优化

---
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 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..c9027d1 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,6 +1,5 @@
 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.service.ApiLogService;
@@ -10,6 +9,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;
@@ -30,6 +30,10 @@
     @Autowired
     private ApiLogService apiLogService;
 
+
+    @Value("${erp.enable}")
+    private Boolean erpEnable;
+
     @Scheduled(cron = "0 0 1 * * ? ")
     public void clearApiLog(){
         try {
@@ -39,12 +43,13 @@
         }
     }
 
-    @Scheduled(cron = "0/5 * * * * ? ")
+//    @Scheduled(cron = "0/5 * * * * ? ")
     @Async("orderThreadPool")
     public void completeAndReport(){
+        if (!erpEnable) return;
         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));
+            List<Order> orders = orderService.selectComplete();
             for (Order order : orders) {
                 ReturnT<String> result = orderSyncHandler.start(order);
                 if (!result.isSuccess()) {

--
Gitblit v1.9.1