From e23fbf6e4df822d6e6ef0a4a3e8d25801fec96e4 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 12 五月 2022 22:21:02 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 29 +++++++++++------------------ 1 files changed, 11 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java index 05d7cba..8ad60c4 100644 --- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java +++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java @@ -3,10 +3,11 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.zy.asrs.entity.Order; import com.zy.asrs.service.OrderService; +import com.zy.asrs.task.core.ReturnT; +import com.zy.asrs.task.handler.OrderSyncHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; import java.util.List; @@ -14,9 +15,11 @@ * Created by vincent on 2020/7/7 */ @Slf4j -@Component +//@Component public class OrderSyncScheduler { + @Autowired + private OrderSyncHandler orderSyncHandler; @Autowired private OrderService orderService; @@ -30,24 +33,14 @@ // } } - @Scheduled(cron = "0/3 * * * * ? ") + @Scheduled(cron = "0/5 * * * * ? ") private void completeAndReport(){ - // 鎵�鏈夎鍗� - List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L)); + List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L).eq("status", 1)); for (Order order : orders) { -// OpenOrderCompeteResult result = new OpenOrderCompeteResult(); -// results.add(result); -// result.setOrderNo(order.getOrderNo()); -// result.setOrderTime(order.getOrderTime()); -// result.setOrderType(order.getDocType$()); -// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId()); -// for (OrderDetl orderDetl : orderDetls) { -// result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getQty())); -// } -// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶� -// if (!orderService.updateSettle(order.getId(), 6L, null)) { -// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳"); -// } + ReturnT<String> result = orderSyncHandler.start(order); + if (!result.isSuccess()) { + log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo()); + } } } -- Gitblit v1.9.1