From 3e45f1374713cbb74537b69c92b58f7f20eae62e Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Sat, 28 Sep 2024 15:10:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=A4=90=E6=A8=A1=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/service/CartService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java index 1cde8ed..bfab7a0 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java @@ -754,6 +754,9 @@ public class CartService { } // 获取当前下单次数和用餐类型 + if ("takeself".equals(sendType)) { + tableId = null; + } ShopEatTypeInfoDTO shopEatTypeInfoDTO = shopUtils.checkEatModel(tableId, shopId); Integer currentPlaceNum = getCurrentPlaceNum(tableId, shopId, shopEatTypeInfoDTO); @@ -770,8 +773,9 @@ public class CartService { queryWrapper.eq(TbCashierCart::getUserId, userId); // 台桌点单 } else { + String finalTableId = tableId; queryWrapper.and(q -> { - q.eq(TbCashierCart::getTableId, tableId).or().eq(TbCashierCart::getUserId, userId); + q.eq(TbCashierCart::getTableId, finalTableId).or().eq(TbCashierCart::getUserId, userId); }); shopTable = mpShopTableMapper.selectOne(new LambdaQueryWrapper()