From fe739bd754d999f18094527ed3bca7a23f8a2ddf Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期四, 16 六月 2022 15:11:08 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs
---
src/main/resources/mapper/OrderDetlMapper.xml | 4 ++++
src/main/java/com/zy/asrs/service/OrderService.java | 2 +-
src/main/java/com/zy/asrs/service/OrderDetlService.java | 2 +-
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 4 ++--
src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java | 1 +
src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 4 ++++
src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java | 5 ++---
8 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index 0c3a911..3dac639 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -29,4 +29,5 @@
int modifyStatus(@Param("orderId") Long orderId, @Param("status")Integer status);
+ int addToLogTable(OrderDetl orderDetl);
}
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index 858c728..8bef62f 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -24,5 +24,5 @@
boolean modifyStatus(Long orderId, Integer status);
- void addToLogTable(OrderDetl orderDetl);
+ boolean 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 00224f1..f45330d 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -24,5 +24,5 @@
List<Order> selectComplete();
- void addToLogTable(Order order);
+ boolean addToLogTable(Order order);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index 6b89902..eade655 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -68,4 +68,8 @@
return this.baseMapper.modifyStatus(orderId, status) > 0;
}
+ @Override
+ public boolean addToLogTable(OrderDetl orderDetl) {
+ return this.baseMapper.addToLogTable(orderDetl) > 0;
+ }
}
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 4b978d1..0262ca7 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -162,8 +162,8 @@
}
@Override
- public void addToLogTable(Order order) {
- this.baseMapper.addToLogTable(order);
+ public boolean addToLogTable(Order order) {
+ return this.baseMapper.addToLogTable(order) > 0;
}
}
diff --git a/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java b/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java
index 0a8203e..2f1081a 100644
--- a/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java
@@ -9,14 +9,13 @@
@Component
public class OrderMoveHistoryScheduler {
@Autowired
- private OrderMoveHistoryHandler handler;
-
+ private OrderMoveHistoryHandler orderMoveHistoryHandler;
/**
* 灏嗗凡瀹屾垚order鍜宱rderDetl绉诲姩鍒發og琛�
*/
@Scheduled(cron = "0/30 * * * * ?")
public void execute(){
- handler.move();
+ orderMoveHistoryHandler.start();
}
}
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 15a3bc3..76ec280 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
@@ -20,11 +20,10 @@
public class OrderMoveHistoryHandler extends AbstractHandler<String> {
@Autowired
private OrderService orderService;
-
@Autowired
private OrderDetlService orderDetlService;
- public ReturnT<String> move(){
+ public ReturnT<String> start(){
List<Order> settleEqual6 = orderService.selectList(new EntityWrapper<Order>()
.eq("settle", 6));
for (Order order : settleEqual6) {
@@ -35,6 +34,7 @@
}
return SUCCESS;
}
+
private void moveBoth(Order order, List<OrderDetl> orderDetls){
Date now = new Date();
if (!Cools.isEmpty(orderDetls)) {
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 5d5fa60..2b147a4 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -165,4 +165,8 @@
and order_id = #{orderId}
</update>
+ <insert id="addToLogTable">
+ INSERT INTO man_order_detl_log SELECT * FROM man_order_detl WHERE id = #{id}
+ </insert>
+
</mapper>
--
Gitblit v1.9.1