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("购物车为空"); }