From a22d60f23a736943211c780ba8e1422fca8106a0 Mon Sep 17 00:00:00 2001 From: cb <275647614@qq.com> Date: Fri, 9 May 2025 09:03:24 +0800 Subject: [PATCH] no message --- .../java/com/ghy/web/controller/order/OrderController.java | 2 +- .../com/ghy/web/controller/order/OrderDetailController.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index b82713c0..26a34088 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -435,7 +435,7 @@ public class OrderController extends BaseController { orderGoods.setGoodsName(goodsStandard.getGoodsStandardName()); orderGoods.setOrderDetailId(od.getId()); orderGoods.setServerGoodsNum(0); - orderGoods.setOrderId(om.getId()); + // orderGoods.setOrderId(om.getId()); orderGoodsService.insertOrderGoods(orderGoods); }); diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index 45b1ab6c..b1c2a6e1 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java @@ -1190,8 +1190,9 @@ public class OrderDetailController extends BaseController { orderMaster2Update.setId(od.getOrderMasterId()); orderMaster2Update.setOrderStatus(OrderStatus.PLAIN.code()); // 查询是否还有派单记录，没有的话需要重置主单是否自己承接的字段为NULL - List existOrderGoods = orderGoodsService.selectByOrderMasterId(od.getOrderMasterId()); - if (CollectionUtils.isNotEmpty(existOrderGoods)&&existOrderGoods.size()==1) { +// List existOrderGoods = orderGoodsService.selectByOrderMasterId(od.getOrderMasterId()); + List orderDetailList=orderDetailService.selectByOrderMasterId(od.getOrderMasterId()); + if (CollectionUtils.isEmpty(orderDetailList)) { orderMaster2Update.setResetAllSelfAssigned(true); } // 更新主单是否全部派完