From 4cdc0b5738e4db57ed23cfeb98c470bce4ea18c4 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Thu, 24 Oct 2024 09:31:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AE=A2=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=A4=90=E4=BD=8D=E8=B4=B9=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/shopimpl/TbShopTableServiceImpl.java | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
index 83721100..88315472 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
@@ -1151,14 +1151,9 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             List<TbOrderDetail> addOrderDetails = new ArrayList<>();
 
 
-            BigDecimal mealAmount = null;
-            Integer mealNum = null;
+
             boolean hasNewInfo = false;
             for (TbCashierCart cashierCart : cashierCarts) {
-                if ("-999".equals(cashierCart.getProductId())) {
-                    mealAmount = cashierCart.getTotalAmount();
-                    mealNum = cashierCart.getNumber();
-                }
                 if (!"return".equals(cashierCart.getStatus())) {
                     totalAmount = totalAmount.add(cashierCart.getTotalAmount());
                     packAMount = packAMount.add(cashierCart.getPackFee());
@@ -1203,11 +1198,6 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 orderDetails.add(orderDetail);
             }
 
-            if (shopInfo.getIsTableFee() != null && shopInfo.getIsTableFee() == 0
-                    && !shopEatTypeInfoDTO.isTakeout()
-                    && mealAmount == null) {
-                throw new BadRequestException("请选择用餐人数");
-            }
 
             // 查询订单
             TbOrderInfo orderInfo = null;
@@ -1232,8 +1222,10 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 orderInfo.setTradeDay(DateUtils.getDay());
                 orderInfo.setUseType(createOrderDTO.getUseType());
                 orderInfo.setCreatedAt(DateUtil.current());
-                orderInfo.setSeatAmount(mealAmount);
-                orderInfo.setSeatCount(mealNum);
+                if (seatCart != null) {
+                    orderInfo.setSeatAmount(seatCart.getTotalAmount());
+                    orderInfo.setSeatCount(seatCart.getNumber());
+                }
                 if (StrUtil.isNotBlank(createOrderDTO.getVipUserId())) {
                     orderInfo.setUserId(createOrderDTO.getVipUserId());
                 }
@@ -1272,8 +1264,10 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 if (StrUtil.isNotBlank(createOrderDTO.getVipUserId())) {
                     orderInfo.setUserId(createOrderDTO.getVipUserId());
                 }
-                orderInfo.setSeatAmount(mealAmount);
-                orderInfo.setSeatCount(mealNum);
+                if (seatCart != null) {
+                    orderInfo.setSeatAmount(seatCart.getTotalAmount());
+                    orderInfo.setSeatCount(seatCart.getNumber());
+                }
                 orderInfo.setSendType(shopEatTypeInfoDTO.getSendType());
                 TbMerchantAccount merchantAccount = merchantAccountMapper.selectOne(new LambdaQueryWrapper<TbMerchantAccount>()
                         .eq(TbMerchantAccount::getShopId, createOrderDTO.getShopId())
@@ -1371,7 +1365,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                             .set(TbShopTable::getProductNum, cashierCarts.size())
                             .set(TbShopTable::getTotalAmount, orderInfo.getOrderAmount())
                             .set(TbShopTable::getRealAmount, orderInfo.getOrderAmount())
-                            .set(TbShopTable::getUseNum, mealNum)
+                            .set(TbShopTable::getUseNum, seatCart != null ? seatCart.getNumber() : null)
                             .set(TbShopTable::getStatus, TableStateEnum.USING.getState());
                     if (isFirst) {
                         wrapper.set(TbShopTable::getUseTime, DateUtil.date());