From cc7581addde2c5b7379980238e1afaff727e61dc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 23 四月 2022 21:45:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 17 +++++++++--------
src/main/resources/mapper/LocDetlMapper.xml | 2 +-
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index d9f86e2..d79943c 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -271,14 +271,15 @@
@ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
@Transactional
public R delete(@RequestParam Long orderId){
- Order order = orderService.selectById(orderId);
- if (order != null) {
- order.setStatus(0);
- }
- if (!orderService.updateById(order)) {
- throw new CoolException("鍒犻櫎璁㈠崟澶辫触");
- }
- orderDetlService.modifyStatus(orderId, 0);
+ orderService.remove(orderId);
+// Order order = orderService.selectById(orderId);
+// if (order != null) {
+// order.setStatus(0);
+// }
+// if (!orderService.updateById(order)) {
+// throw new CoolException("鍒犻櫎璁㈠崟澶辫触");
+// }
+// orderDetlService.modifyStatus(orderId, 0);
return R.ok();
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 43ebc2f..f8a57f4 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -214,7 +214,7 @@
and a.orderNo = #{orderNo}
</if>
order by
- DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time)
+ DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
desc,
NEWID(),
case
--
Gitblit v1.9.1