From 79a7e3043aeaaa751c19a44a0e3eeeb9788e27f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Fri, 20 Dec 2024 09:28:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BD=AC=E6=A1=8C=E8=B6=85=E8=BF=87?=
 =?UTF-8?q?=E9=A4=90=E4=BD=8D=E6=AC=A1=E6=95=B0=E6=94=B9=E4=B8=BA=E5=8F=B0?=
 =?UTF-8?q?=E6=A1=8C=E6=9C=80=E5=A4=A7=E6=89=BF=E8=BD=BD=E4=BA=BA=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/shopimpl/TbShopTableServiceImpl.java        | 5 +++--
 1 file changed, 3 insertions(+), 2 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 c828bf3c..fcfe737c 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
@@ -3465,8 +3465,9 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         }
 
         if (currentSeatFee != null && targetSeatFee != null) {
-            targetSeatFee.setNumber(currentSeatFee.getNumber().add(targetSeatFee.getNumber()));
-            targetSeatFee.setTotalNumber(currentSeatFee.getTotalNumber().add(targetSeatFee.getTotalNumber()));
+            BigDecimal newNum = currentSeatFee.getNumber().add(targetSeatFee.getNumber()).compareTo(BigDecimal.valueOf(shopTable.getMaxCapacity())) > 0 ? BigDecimal.valueOf(shopTable.getMaxCapacity()) : currentSeatFee.getNumber().add(targetSeatFee.getNumber());
+            targetSeatFee.setNumber(newNum);
+            targetSeatFee.setTotalNumber(newNum);
             targetSeatFee.setTotalAmount(targetSeatFee.getSalePrice().multiply(targetSeatFee.getTotalNumber()));
             mpCashierCartService.updateById(targetSeatFee);
             mpCashierCartService.removeById(currentSeatFee.getId());