From c49088def2a3e0294918de31c31ac6bd6226d1d4 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Fri, 11 Oct 2024 11:45:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E5=8D=95=E6=A0=A1=E9=AA=8C=E9=A4=90?= =?UTF-8?q?=E4=BD=8D=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/ysk/cashier/dto/shoptable/ShopEatTypeInfoDTO.java | 1 + .../service/impl/shopimpl/TbShopTableServiceImpl.java | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ShopEatTypeInfoDTO.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ShopEatTypeInfoDTO.java index 4cb0e85c..13db70d2 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ShopEatTypeInfoDTO.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ShopEatTypeInfoDTO.java @@ -11,6 +11,7 @@ public class ShopEatTypeInfoDTO { private boolean isMunchies; private boolean isDineInAfter; private boolean isDineInBefore; + private boolean needSeatFee; private TbShopInfo shopInfo; private String useType; private Object shopId; 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 d1ebac8d..3f6412f4 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 @@ -172,7 +172,9 @@ public class TbShopTableServiceImpl implements TbShopTableService { boolean isDineInAfter = !isMunchies && !isTakeout; boolean isDineInBefore = isMunchies && !isTakeout; - return new ShopEatTypeInfoDTO(isTakeout, isMunchies, isDineInAfter, isDineInBefore, shopInfo, isTakeout ? OrderUseTypeEnum.TAKEOUT.getValue() : + boolean needSeatFee = shopInfo.getIsTableFee() == null || shopInfo.getIsTableFee() == 0; + + return new ShopEatTypeInfoDTO(isTakeout, isMunchies, isDineInAfter, isDineInBefore, needSeatFee, shopInfo, isTakeout ? OrderUseTypeEnum.TAKEOUT.getValue() : isMunchies ? OrderUseTypeEnum.DINE_IN_BEFORE.getValue() : OrderUseTypeEnum.DINE_IN_AFTER.getValue(), shopId, tableId, isTakeout ? OrderSendTypeEnums.TAKE_SELF.getValue() : OrderSendTypeEnums.TABLE.getValue()); } @@ -1066,8 +1068,8 @@ public class TbShopTableServiceImpl implements TbShopTableService { List cashierCarts = cashierCartMapper .selectList(queryWrapper); - if (cashierCarts.isEmpty()) { - throw new BadRequestException("购物车为空，请先添加商品"); + if (cashierCarts.isEmpty() || (shopEatTypeInfoDTO.isNeedSeatFee() && cashierCarts.size() < 2)) { + throw new BadRequestException("购物车为空或未选择餐位费，请先添加商品或选择餐位费"); } ArrayList cartIdList = new ArrayList<>();