czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

下单校验餐位费

Browse Source
This commit is contained in:
SongZhang
2024-10-11 11:45:41 +08:00
parent 3b182796ab
commit c49088def2
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/ShopEatTypeInfoDTO.java
View File

@@ -11,6 +11,7 @@ public class ShopEatTypeInfoDTO {
private boolean isMunchies; private boolean isMunchies;
private boolean isDineInAfter; private boolean isDineInAfter;
private boolean isDineInBefore; private boolean isDineInBefore;
private boolean needSeatFee;
private TbShopInfo shopInfo; private TbShopInfo shopInfo;
private String useType; private String useType;
private Object shopId; private Object shopId;

8
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
View File

@@ -172,7 +172,9 @@ public class TbShopTableServiceImpl implements TbShopTableService {
boolean isDineInAfter = !isMunchies && !isTakeout; boolean isDineInAfter = !isMunchies && !isTakeout;
boolean isDineInBefore = 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(), isMunchies ? OrderUseTypeEnum.DINE_IN_BEFORE.getValue() : OrderUseTypeEnum.DINE_IN_AFTER.getValue(),
shopId, tableId, isTakeout ? OrderSendTypeEnums.TAKE_SELF.getValue() : OrderSendTypeEnums.TABLE.getValue()); shopId, tableId, isTakeout ? OrderSendTypeEnums.TAKE_SELF.getValue() : OrderSendTypeEnums.TABLE.getValue());
} }
@@ -1066,8 +1068,8 @@ public class TbShopTableServiceImpl implements TbShopTableService {
List<TbCashierCart> cashierCarts = cashierCartMapper List<TbCashierCart> cashierCarts = cashierCartMapper
.selectList(queryWrapper); .selectList(queryWrapper);
if (cashierCarts.isEmpty()) { if (cashierCarts.isEmpty() || (shopEatTypeInfoDTO.isNeedSeatFee() && cashierCarts.size() < 2)) {
throw new BadRequestException("购物车为空，请先添加商品"); throw new BadRequestException("购物车为空或未选择餐位费，请先添加商品或选择餐位费");
} }
ArrayList<Integer> cartIdList = new ArrayList<>(); ArrayList<Integer> cartIdList = new ArrayList<>();