From 1f412710e7aa197d7632c6b2f8ee5eb1c76c2ac3 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Thu, 31 Oct 2024 14:23:07 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=8F=96=E6=B6=88=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/shopimpl/TbShopTableServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 c31fa9a1..cab93224 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 @@ -97,6 +97,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { private final MpShopUnitMapper mpShopUnitMapper; private final MpProductStockDetailMapper mpProductStockDetailMapper; private final TbMemberPointsService memberPointsService; + private final TbShopCouponService shopCouponService; /** @@ -1112,10 +1113,11 @@ public class TbShopTableServiceImpl implements TbShopTableService { tbShopTable = mpShopTableMapper.selectOne(new LambdaQueryWrapper() .eq(TbShopTable::getQrcode, createOrderDTO.getTableId()) .in(TbShopTable::getStatus, "idle", "using")); + if (tbShopTable == null) { + throw new BadRequestException("台桌未开台或不存在"); + } } - if (tbShopTable == null) { - throw new BadRequestException("台桌未开台或不存在"); - } + // 就餐模式信息 ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(createOrderDTO.getShopId(), createOrderDTO.getTableId(), createOrderDTO.getUseType()); @@ -1782,7 +1784,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { return orderInfoMapper.update(null, new LambdaUpdateWrapper() .eq(TbOrderInfo::getId, orderId) .set(TbOrderInfo::getUserId, null) - .set(TbOrderInfo::getUserId, null)); + .set(TbOrderInfo::getMemberId, null)); } } return true;