From 0c780a71262676dacde56cb4011f3c68f37a5cf8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 22 二月 2022 09:12:01 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/OrderController.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 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 51f26e5..c4c030d 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/OrderController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/OrderController.java
@@ -11,6 +11,7 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
+import com.sun.org.apache.xpath.internal.operations.Or;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -19,6 +20,8 @@
import zy.cloud.wms.common.utils.QrCode;
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.Order;
+import zy.cloud.wms.manager.entity.OrderDetl;
+import zy.cloud.wms.manager.service.OrderDetlService;
import zy.cloud.wms.manager.service.OrderService;
import javax.imageio.ImageIO;
@@ -35,6 +38,8 @@
@Autowired
private OrderService orderService;
+ @Autowired
+ private OrderDetlService orderDetlService;
@RequestMapping(value = "/order/{id}/auth")
@ManagerAuth
@@ -90,19 +95,6 @@
return R.ok();
}
- @RequestMapping(value = "/order/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam String param){
- List<Order> list = JSONArray.parseArray(param, Order.class);
- if (Cools.isEmpty(list)){
- return R.error();
- }
- for (Order entity : list){
- orderService.delete(new EntityWrapper<>(entity));
- }
- return R.ok();
- }
-
@RequestMapping(value = "/orders/delete/auth")
@ManagerAuth
@Transactional
@@ -111,6 +103,11 @@
return R.error();
}
for (Long id : ids){
+ Order order = orderService.selectById(id);
+ if (order == null) {
+ continue;
+ }
+ orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));
if (!orderService.deleteById(id)) {
throw new CoolException("鏈嶅姟鍣ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
--
Gitblit v1.9.1