From 9c199e1f139b2e6eca02addd1eb6d55d11b41475 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 21 三月 2022 14:41:49 +0800
Subject: [PATCH] 修复bug

---
 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