From 6fd8a4f7d01a1dcdec1927add84d72420badfe8c 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:02:35 +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       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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 0c249ec..a9560f0 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -834,12 +834,14 @@ public class OrderService {
             }
         }
 
-        if (shopInfo.getIsTableFee() != null && shopInfo.getIsTableFee() == 0
-                && !eatTypeInfoDTO.isTakeout() && mealNum == null
-        ) {
+        if (eatTypeInfoDTO.isNeedSeatFee() && mealNum == null) {
             return Result.fail("请选择用餐人数");
         }
 
+        if (eatTypeInfoDTO.isNeedSeatFee() && list.size() < 2) {
+            return Result.fail("购物车为空");
+        }
+
         // 查询历史orderDetail
         Integer finalOrderId = orderId;
         List<TbOrderDetail> oldOrderDetailList = mPOrderDetailMapper.selectList(new LambdaQueryWrapper<TbOrderDetail>()