From 2fbf3adb37334f90c29b1f119f0652f37a2608dc Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 19 十一月 2024 10:03:17 +0800
Subject: [PATCH] #优化

---
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 6ac7993..55b88d9 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -56,7 +56,7 @@
         if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
             List<Order> orders = orderService.selectComplete();
             for (Order order : orders) {
-                //濡傛灉鏄姞宸ュ崟鍒欒繘琛屽垽鏂�
+                //濡傛灉鏄皟鎷ㄥ崟鍒欒繘琛屽垽鏂�
                 if (order.getDocType() == 33) {
                     //鏌ヨ搴撳瓨涓槸鍚﹀瓨鍦ㄨ璁㈠崟鐨勭墿鏂欎俊鎭紝瀛樺湪鍒欎笉澶勭悊璇ヨ鍗�
                     List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
@@ -74,23 +74,17 @@
                 }
                 ReturnT<String> result = orderSyncHandler.start(order);
                 if (!result.isSuccess()) {
-                    log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+                    //log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
                 }
             }
         }
     }
 
-    @Scheduled(cron = "0/5 * * * * ? ")
-    //@Async("orderThreadPool")
-    public void reportOrder() {
-        List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 2));
-        orderList.forEach(order -> {
-            if (order.getSettle() < 4L) {
-                return;
-            }
-            orderSyncHandler.timelyStart(order);
-        });
-        orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4));
+    //@Scheduled(cron = "* 0/5 * * * ? ")
+    @Scheduled(cron = "0/30 * * * * ? ")
+    @Async("orderThreadPool")
+    public synchronized void  reportOrder() {
+        List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().in("settle", 2, 4));
         orderList.forEach(order -> {
             orderSyncHandler.timelyStart(order);
         });

--
Gitblit v1.9.1