From dd7419c236ba76ead528513872dbd4eda7bf572d Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 31 五月 2024 15:21:16 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 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..84bfaa1 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -44,7 +44,7 @@
     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));
+            List<Order> orders = orderService.selectComplete();
             for (Order order : orders) {
                 ReturnT<String> result = orderSyncHandler.start(order);
                 if (!result.isSuccess()) {
@@ -54,4 +54,15 @@
         }
     }
 
+    /*
+    瀹氭椂鏌ヨ鐘舵�佷负2.浣滀笟涓殑鍗曟嵁锛屾鏌ユ槸鍚﹀畬鎴�
+     */
+    @Scheduled(cron = "0 */1 * * * ? ")
+    public void completeOrder(){
+        List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 2));
+        orderList.forEach(order -> {
+            orderService.checkComplete(order.getOrderNo());
+        });
+    }
+
 }

--
Gitblit v1.9.1