From 2a2d0aa9f6c42789faeb90ccda0bdf415614d533 Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期二, 05 八月 2025 10:46:58 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 48 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..b18c58f 100644 --- a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java @@ -4,8 +4,12 @@ import com.core.common.Cools; import com.zy.asrs.entity.Order; import com.zy.asrs.entity.OrderDetl; +import com.zy.asrs.entity.Review; +import com.zy.asrs.entity.ReviewDetl; import com.zy.asrs.service.OrderDetlService; import com.zy.asrs.service.OrderService; +import com.zy.asrs.service.ReviewDetlService; +import com.zy.asrs.service.ReviewService; import com.zy.asrs.task.AbstractHandler; import com.zy.asrs.task.core.ReturnT; import lombok.extern.slf4j.Slf4j; @@ -23,19 +27,36 @@ @Autowired private OrderDetlService orderDetlService; - public ReturnT<String> start(){ + @Autowired + private ReviewService reviewService; + @Autowired + private ReviewDetlService reviewDetlService; + + 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); + log.info("宸插畬鎴愬崟鎹Щ鍔ㄨ嚦鍘嗗彶琛ㄦ垚鍔� =====>" + order); } return SUCCESS; } - private void moveBoth(Order order, List<OrderDetl> orderDetls){ + public ReturnT<String> start2() { + List<Review> settleEqual6 = reviewService.selectList(new EntityWrapper<Review>() + .eq("settle", 6)); + for (Review order : settleEqual6) { + List<ReviewDetl> orderDetls = reviewDetlService.selectList(new EntityWrapper<ReviewDetl>() + .eq("order_no", order.getOrderNo())); + moveBoth2(order, orderDetls); + log.info("宸插畬鎴愬鍚堝崟鎹Щ鍔ㄨ嚦鍘嗗彶琛ㄦ垚鍔� =====>" + order); + } + return SUCCESS; + } + + private void moveBoth(Order order, List<OrderDetl> orderDetls) { Date now = new Date(); if (!Cools.isEmpty(orderDetls)) { for (OrderDetl orderDetl : orderDetls) { @@ -43,16 +64,36 @@ 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())); } } + + private void moveBoth2(Review order, List<ReviewDetl> orderDetls) { + Date now = new Date(); + if (!Cools.isEmpty(orderDetls)) { + for (ReviewDetl orderDetl : orderDetls) { + orderDetl.setUpdateBy(0L); + orderDetl.setUpdateTime(now); + reviewDetlService.addToLogTable(orderDetl); + reviewDetlService.delete(new EntityWrapper<ReviewDetl>() + .eq("id", orderDetl.getId())); + } + } + if (!Cools.isEmpty(order)) { + order.setUpdateBy(0L); + order.setUpdateTime(now); + reviewService.addToLogTable(order); + reviewService.delete(new EntityWrapper<Review>() + .eq("id", order.getId())); + } + } } -- Gitblit v1.9.1