From 9a10d2aa7fe03a9a009a57504ff38bcd857f04e9 Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 9 Aug 2021 09:14:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=AF=E8=83=BD=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E8=AE=A2=E5=8D=95=E6=89=B9=E9=87=8F=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=AF=8F=E6=AC=A1=E8=AF=BB=E5=8F=96=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/serviceimpl/OrderServiceImpl.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java index a0c9082b..1bcad6a8 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java @@ -596,6 +596,8 @@ public class OrderServiceImpl extends ServiceImpl implements * @param list 待发货订单列表 */ private void checkBatchDeliver(List list) { + + List logistics = logisticsService.list(); for (OrderBatchDeliverDTO orderBatchDeliverDTO : list) { //查看订单号是否存在-是否是当前店铺的订单 Order order = this.getOne(new LambdaQueryWrapper() @@ -603,15 +605,17 @@ public class OrderServiceImpl extends ServiceImpl implements .eq(Order::getSn, orderBatchDeliverDTO.getOrderSn())); if (order == null) { throw new ServiceException("订单编号：'" + orderBatchDeliverDTO.getOrderSn() + " '不存在"); - } else if (order.getOrderStatus().equals(OrderStatusEnum.DELIVERED.name())) { + } else if (!order.getOrderStatus().equals(OrderStatusEnum.UNDELIVERED.name())) { throw new ServiceException("订单编号：'" + orderBatchDeliverDTO.getOrderSn() + " '不能发货"); } - //查看物流公司 - Logistics logistics = logisticsService.getOne(new LambdaQueryWrapper().eq(Logistics::getName, orderBatchDeliverDTO.getLogisticsName())); - if (logistics == null) { + //获取物流公司 + logistics.forEach(item -> { + if (item.getName().equals(orderBatchDeliverDTO.getLogisticsName())) { + orderBatchDeliverDTO.setLogisticsId(item.getId()); + } + }); + if (StringUtils.isEmpty(orderBatchDeliverDTO.getLogisticsId())) { throw new ServiceException("物流公司：'" + orderBatchDeliverDTO.getLogisticsName() + " '不存在"); - } else { - orderBatchDeliverDTO.setLogisticsId(logistics.getId()); } }