From d448e25fc815f0138d94c5964a6b4109095ce351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 7 Nov 2024 11:11:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=AA=E9=80=89=E6=8B=A9=E9=A4=90?= =?UTF-8?q?=E4=BD=8D=E8=B4=B9=E4=B8=8D=E5=85=81=E8=AE=B8=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/service/OrderService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java index 68f4adf..6ade707 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java @@ -824,6 +824,7 @@ public class OrderService { // 就餐人数 Integer mealNum = null; Integer orderId = null; + int cartCount = 0; for (TbCashierCart cart : list) { if (StrUtil.isNotBlank(cart.getOrderId())) { orderId = Integer.valueOf(cart.getOrderId()); @@ -832,6 +833,10 @@ public class OrderService { if ("-999".equals(cart.getProductId())) { mealNum = cart.getNumber(); } + + if (TableConstant.OrderInfo.Status.CREATE.equalsVals(cart.getStatus()) && !TableConstant.CashierCart.ID.equals(cart.getProductId())) { + cartCount++; + } } if (eatTypeInfoDTO.isNeedSeatFee() && mealNum == null) { @@ -839,7 +844,7 @@ public class OrderService { } list = list.stream().filter(item -> TableConstant.OrderInfo.Status.CREATE.equalsVals(item.getStatus())).collect(Collectors.toList()); - if (eatTypeInfoDTO.isNeedSeatFee() && list.size() < 2) { + if (cartCount == 0) { return Result.fail("购物车为空"); }