From 31ee3ad1f501f72f8a7aacabd4e0d427fc6110e7 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 22 三月 2022 09:38:39 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/OrderController.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/OrderController.java b/src/main/java/zy/cloud/wms/manager/controller/OrderController.java
index b4cc123..a2e3574 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/OrderController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/OrderController.java
@@ -123,18 +123,14 @@
for (Long id : ids) {
Order target = orderService.selectOne(new EntityWrapper<Order>()
.eq("id", id));
- if (target.getSettle() != 0 || target.getSettle() != 1) {
+ if (target.getSettle() == 0 || target.getSettle() == 1) {
+ orderService.deleteById(id);
+ orderDetlService.delete(new EntityWrapper<OrderDetl>()
+ .eq("order_id",id));
+ }else {
throw new CoolException("浠呭厑璁稿垹闄�'鍒濆鍖�','寰呭鐞�'鐘舵�佺殑璁㈠崟");
}
- }
- if (Cools.isEmpty((Object) ids)){
- return R.error();
- }
- for (Long id : ids){
- if (!orderService.deleteById(id)) {
- throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
}
return R.ok();
}
--
Gitblit v1.9.1