From 4f7488aa49ab6420d25a6f7883ffebccbec9b73a Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期四, 16 六月 2022 15:04:03 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
---
src/main/resources/mapper/OrderMapper.xml | 4 ++
src/main/java/com/zy/asrs/service/OrderService.java | 1
src/main/java/com/zy/asrs/service/OrderDetlService.java | 1
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 5 ++
src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java | 58 +++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/mapper/OrderMapper.java | 1
src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java | 22 +++++++++++
7 files changed, 92 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/OrderMapper.java b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
index 05ee681..3e1084b 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
@@ -16,4 +16,5 @@
List<Order> selectComplete();
+ int addToLogTable(Order order);
}
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index 6178f0b..858c728 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -24,4 +24,5 @@
boolean modifyStatus(Long orderId, Integer status);
+ void addToLogTable(OrderDetl orderDetl);
}
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index d29343c..00224f1 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -24,4 +24,5 @@
List<Order> selectComplete();
+ void addToLogTable(Order order);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 2f34254..4b978d1 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -161,4 +161,9 @@
return this.baseMapper.selectComplete();
}
+ @Override
+ public void addToLogTable(Order order) {
+ this.baseMapper.addToLogTable(order);
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java b/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java
new file mode 100644
index 0000000..0a8203e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java
@@ -0,0 +1,22 @@
+package com.zy.asrs.task;
+
+import com.zy.asrs.task.handler.OrderMoveHistoryHandler;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+
+@Component
+public class OrderMoveHistoryScheduler {
+ @Autowired
+ private OrderMoveHistoryHandler handler;
+
+
+ /**
+ * 灏嗗凡瀹屾垚order鍜宱rderDetl绉诲姩鍒發og琛�
+ */
+ @Scheduled(cron = "0/30 * * * * ?")
+ public void execute(){
+ handler.move();
+ }
+}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
new file mode 100644
index 0000000..15a3bc3
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
@@ -0,0 +1,58 @@
+package com.zy.asrs.task.handler;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.service.OrderService;
+import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.task.core.ReturnT;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+@Slf4j
+public class OrderMoveHistoryHandler extends AbstractHandler<String> {
+ @Autowired
+ private OrderService orderService;
+
+ @Autowired
+ private OrderDetlService orderDetlService;
+
+ public ReturnT<String> move(){
+ 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);
+ }
+ return SUCCESS;
+ }
+ private void moveBoth(Order order, List<OrderDetl> orderDetls){
+ Date now = new Date();
+ if (!Cools.isEmpty(orderDetls)) {
+ for (OrderDetl orderDetl : orderDetls) {
+ orderDetl.setUpdateBy(0L);
+ orderDetl.setUpdateTime(now);
+ orderDetlService.addToLogTable(orderDetl);
+ orderDetlService.delete(new EntityWrapper<OrderDetl>()
+ .eq("id",orderDetl.getId()));
+ }
+ }
+ if (!Cools.isEmpty(order)){
+ order.setUpdateBy(0L);
+ order.setUpdateTime(now);
+ orderService.addToLogTable(order);
+ orderService.delete(new EntityWrapper<Order>()
+ .eq("id",order.getId()));
+ }
+ }
+
+}
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 9e112d4..db8816d 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -62,4 +62,8 @@
order by create_time asc
</select>
+ <insert id="addToLogTable">
+ INSERT INTO man_order_log SELECT * FROM man_order WHERE id = #{id}
+ </insert>
+
</mapper>
--
Gitblit v1.9.1