From 3d321d82df16121e1c21fb2113757e5a16de54a2 Mon Sep 17 00:00:00 2001 From: zhangchao <zc857179121@qq.com> Date: 星期六, 02 十一月 2024 11:18:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs-erp' into phyzasrs-erp --- 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..70646f1 100644 --- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java +++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java @@ -72,25 +72,19 @@ continue; } } - ReturnT<String> result = orderSyncHandler.start(order); - if (!result.isSuccess()) { - log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo()); - } +// ReturnT<String> result = orderSyncHandler.start(order); +// if (!result.isSuccess()) { +// log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo()); +// } } } } + //@Scheduled(cron = "* 0/5 * * * ? ") @Scheduled(cron = "0/5 * * * * ? ") - //@Async("orderThreadPool") + @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)); + List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().in("settle", 2, 4)); orderList.forEach(order -> { orderSyncHandler.timelyStart(order); }); -- Gitblit v1.9.1