From 1a01ff5ccea709205a82162062242c3d1b0c74bb Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Mon, 23 Sep 2024 13:29:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=90=8C=E6=AD=A5=E4=BF=9D=E5=AD=98=E9=A4=90=E4=BD=8D?=
 =?UTF-8?q?=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/service/impl/shopimpl/TbShopTableServiceImpl.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 27b64875..551d5fa5 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
@@ -1004,7 +1004,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             List<TbOrderDetail> orderDetails = new ArrayList<>();
 
             BigDecimal mealAmount = null;
-
+            Integer mealNum = null;
             boolean unAdd = cashierCarts.stream().noneMatch(item -> item.getPlaceNum() == null);
             if (ShopInfoTypeEnums.RESTAURANT.getValue().equals(shopInfo.getRegisterType()) && addMaterId && unAdd) {
                 throw new BadRequestException("此次未添加新商品，清先添加商品");
@@ -1012,6 +1012,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             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());