From 82de5a307466894bbb0258f8a63a26a7bb96d80d Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期四, 16 十月 2025 09:55:35 +0800 Subject: [PATCH] 13 --- src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java index 76ec280..49b93dc 100644 --- a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java @@ -4,6 +4,10 @@ import com.core.common.Cools; import com.zy.asrs.entity.Order; import com.zy.asrs.entity.OrderDetl; +import com.zy.asrs.entity.OrderDetlReport; +import com.zy.asrs.entity.OrderDetlReportLog; +import com.zy.asrs.service.OrderDetlReportLogService; +import com.zy.asrs.service.OrderDetlReportService; import com.zy.asrs.service.OrderDetlService; import com.zy.asrs.service.OrderService; import com.zy.asrs.task.AbstractHandler; @@ -22,20 +26,31 @@ private OrderService orderService; @Autowired private OrderDetlService orderDetlService; + @Autowired + private OrderDetlReportLogService orderDetlReportLogService; + @Autowired + private OrderDetlReportService orderDetlReportService; - public ReturnT<String> start(){ + public ReturnT<String> start() { List<Order> settleEqual6 = orderService.selectList(new EntityWrapper<Order>() .eq("settle", 6)); for (Order order : settleEqual6) { List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>() .eq("order_no", order.getOrderNo())); - moveBoth(order,orderDetls); - log.info("宸插畬鎴愬崟鎹Щ鍔ㄨ嚦鍘嗗彶琛ㄦ垚鍔� =====>" +order); + moveBoth(order, orderDetls); + List<OrderDetlReport> orderNo = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>().eq("order_no", order.getOrderNo())); + for (OrderDetlReport orderDetlReport : orderNo) { + OrderDetlReportLog log = new OrderDetlReportLog(); + log.sync(orderDetlReport); + orderDetlReportLogService.insert(log); + orderDetlReportService.deleteById(orderDetlReport); + } + log.info("宸插畬鎴愬崟鎹Щ鍔ㄨ嚦鍘嗗彶琛ㄦ垚鍔� =====>" + order); } return SUCCESS; } - private void moveBoth(Order order, List<OrderDetl> orderDetls){ + private void moveBoth(Order order, List<OrderDetl> orderDetls) { Date now = new Date(); if (!Cools.isEmpty(orderDetls)) { for (OrderDetl orderDetl : orderDetls) { @@ -43,15 +58,15 @@ orderDetl.setUpdateTime(now); orderDetlService.addToLogTable(orderDetl); orderDetlService.delete(new EntityWrapper<OrderDetl>() - .eq("id",orderDetl.getId())); + .eq("id", orderDetl.getId())); } } - if (!Cools.isEmpty(order)){ + if (!Cools.isEmpty(order)) { order.setUpdateBy(0L); order.setUpdateTime(now); orderService.addToLogTable(order); orderService.delete(new EntityWrapper<Order>() - .eq("id",order.getId())); + .eq("id", order.getId())); } } -- Gitblit v1.9.1