From 1b8829853631feed432d74af946ace1a2a1194bd Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Fri, 27 Sep 2024 09:12:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=B1=E9=A4=90=E6=A8=A1=E5=BC=8F=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E8=B0=83=E6=95=B4?= 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, 2 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 464f9b75..85f337bc 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 @@ -121,7 +121,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { List orderInfoList = orderInfoMapper.selectPage(new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(1, 1), new LambdaQueryWrapper() .eq(TbOrderInfo::getStatus, "unpaid") .eq(TbOrderInfo::getUseType, eatTypeInfoDTO.getUseType()) - .eq(TbOrderInfo::getShopId, eatTypeInfoDTO.getShopInfo().getId()) + .eq(TbOrderInfo::getShopId, eatTypeInfoDTO.getShopId()) .eq(TbOrderInfo::getTableId, eatTypeInfoDTO.getTableId()) .eq(TbOrderInfo::getTradeDay, DateUtils.getDay()) .orderByDesc(TbOrderInfo::getId)).getRecords(); @@ -156,7 +156,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { * @return 就餐类型信息 */ public ShopEatTypeInfoDTO checkEatModel(Object shopId, Object tableId) { - String eatModel = StrUtil.isBlank(tableId.toString()) ? ShopInfoEatModelEnum.TAKE_OUT.getValue() : ShopInfoEatModelEnum.DINE_IN.getValue(); + String eatModel = StrUtil.isBlank(tableId == null ? "" : tableId.toString()) ? ShopInfoEatModelEnum.TAKE_OUT.getValue() : ShopInfoEatModelEnum.DINE_IN.getValue(); return getShopEatTypeInfoDTO(shopId, eatModel, tableId); }