From 67aaad55192a1a2376b70624dad31ed1b0cf27c0 Mon Sep 17 00:00:00 2001 From: HH Date: Thu, 20 Apr 2023 11:58:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E6=B4=BE=E5=8D=95=E7=9A=84=E9=80=BB=E8=BE=91=E6=94=B9?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/OrderMasterServiceImpl.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java index 91551444..604809b7 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java @@ -457,12 +457,11 @@ public class OrderMasterServiceImpl implements OrderMasterService { Assert.notNull(orderMaster, "OrderMaster is null!!!"); // 先判断主订单是否派完单 List masterGoods = orderGoodsService.selectByOrderMasterId(orderMasterId); - for (OrderGoods orderGoods : masterGoods) { - // 是否有未派完的子单 - if (!orderGoods.getGoodsNum().equals(orderGoods.getServerGoodsNum())) { - return false; - } - } - return true; + long masterCount = masterGoods.stream().mapToInt(OrderGoods::getGoodsNum).sum(); + long detailCount = orderDetailService.selectByOrderMasterId(orderMasterId).stream().mapToInt(x -> { + List detailGoods = orderGoodsService.selectByOrderDetailId(x.getId()); + return detailGoods.stream().mapToInt(OrderGoods::getGoodsNum).sum(); + }).sum(); + return masterCount == detailCount; } }