From 990bd5b144e12b21b6a7483d6f532ce04a695b97 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 3 Dec 2025 09:27:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrderInfoCustomServiceImpl.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java index 4b713001b..3a91b5d45 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java @@ -296,7 +296,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService { item.setUrgent(true); item.setSubStatus(TableValueConstant.OrderDetail.SubStatus.READY_TO_SERVE.getCode()); }); - }else { + } else { switch (EnumUtil.fromString(TableValueConstant.OrderDetail.SubStatus.class, param.getSubStatus())) { case TableValueConstant.OrderDetail.SubStatus.READY_TO_SERVE: orderDetails.forEach(item -> item.setStartOrderTime(DateUtil.date().toLocalDateTime())); @@ -1445,7 +1445,11 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService { } else { orderInfo.setOrderAmount(BigDecimal.ZERO); } - orderInfo.setPackFee(orderInfo.getPackFee().add(param.getPackFee())); + if (orderInfo.getPackFee() == null) { + orderInfo.setPackFee(param.getPackFee()); + } else { + orderInfo.setPackFee(orderInfo.getPackFee().add(param.getPackFee())); + } orderInfo.setRoundAmount(BigDecimal.ZERO); orderInfo.setPointsNum(0); orderInfoService.saveOrUpdate(orderInfo); @@ -1762,11 +1766,11 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService { OrderDetail detail = orderDetailService.getOne(new QueryWrapper().eq(OrderDetail::getId, detailStatusDTO.getOrderDetailId()) .eq(OrderDetail::getShopId, shopId)); AssertUtil.isNull(detail, "订单详情不存在"); - orderDetailService.updateChain().set(OrderDetail::getSubStatus, TableValueConstant.OrderDetail.SubStatus.READY_TO_SERVE.getCode()) + orderDetailService.updateChain().set(OrderDetail::getSubStatus, TableValueConstant.OrderDetail.SubStatus.READY_TO_SERVE.getCode()) .set(OrderDetail::getStartOrderTime, DateUtil.date().toLocalDateTime()) .eq(OrderDetail::getId, detailStatusDTO.getOrderDetailId()).update(); // 上菜 - }else if(detailStatusDTO.getType() == 2) { + } else if (detailStatusDTO.getType() == 2) { boolean update = orderDetailService.updateChain() .eq(OrderDetail::getSubStatus, TableValueConstant.OrderDetail.SubStatus.READY_TO_SERVE.getCode()) .set(OrderDetail::getSubStatus, TableValueConstant.OrderDetail.SubStatus.SENT_OUT.getCode()) @@ -1774,7 +1778,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService { .eq(OrderDetail::getId, detailStatusDTO.getOrderDetailId()).update(); AssertUtil.isTrue(!update, "已出菜，请勿重复出菜"); - }else { + } else { if (detailStatusDTO.getOrderId() != null) { orderDetailService.updateChain() .set(OrderDetail::getFoodServeTime, DateUtil.date().toLocalDateTime())