From 59370ed8bda4a6b6fd4a8037d7084cf704101f34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Tue, 24 Dec 2024 16:24:34 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E6=A1=8C=E5=B9=B6=E6=A1=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashier/service/impl/shopimpl/TbShopTableServiceImpl.java | 4 +++- 1 file changed, 3 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 759648c9..5705443e 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 @@ -3450,7 +3450,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { } allCarts = mpCashierCartService.getByShopEatType(shopEatTypeInfoDTO, switchTableDTO.getMasterId(), switchTableDTO.getOrderId(), - true, TableConstant.OrderInfo.Status.CREATE, TableConstant.OrderInfo.Status.RETURN); + true, TableConstant.OrderInfo.Status.CREATE); TbCashierCart seatCart = null; for (TbCashierCart allCart : allCarts) { @@ -3535,6 +3535,8 @@ public class TbShopTableServiceImpl implements TbShopTableService { // 删除原有台桌detail和order信息 if (orderId != null && (switchTableDTO.isFull() || cashierCarts.size() == allCarts.size())) { mpOrderInfoService.removeById(orderId); + mpCashierCartService.remove(new LambdaQueryWrapper().eq(TbCashierCart::getOrderId, orderId)); + mpOrderDetailService.remove(new LambdaQueryWrapper().eq(TbOrderDetail::getOrderId, orderId)); } if (!switchTableDTO.isFull() && cashierCarts.size() != allCarts.size()) {