diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/OrderVo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/OrderVo.java index b4b390e..de982e9 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/OrderVo.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/OrderVo.java @@ -2,6 +2,7 @@ package com.chaozhanggui.system.cashierservice.entity; import lombok.Data; +import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import java.util.List; @@ -19,6 +20,7 @@ public class OrderVo { private String sendType; - @NotBlank private String eatModel; + @Min(1) + private Integer seatNum; } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java index 2eca1f0..aa08dbf 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java @@ -676,6 +676,7 @@ public class OrderService { throw new MsgException("店铺信息不存在"); } + orderVo.setEatModel(StrUtil.isBlank(orderVo.getTableId()) ? ShopInfoEatModelEnum.TAKE_OUT.getValue() : ShopInfoEatModelEnum.DINE_IN.getValue()); ShopEatTypeInfoDTO eatTypeInfoDTO = checkEatModel(orderVo.getShopId(), orderVo.getEatModel()); @@ -683,6 +684,17 @@ public class OrderService { throw new MsgException("店内就餐必须选择桌码"); } + + // 餐位费设置 + if (!eatTypeInfoDTO.isTakeout() && shopInfo.getIsTableFee() != null && shopInfo.getIsTableFee() == 0) { + ChoseCountDTO choseCountDTO = new ChoseCountDTO(); + choseCountDTO.setNum(orderVo.getSeatNum()); + choseCountDTO.setTableId(orderVo.getTableId()); + choseCountDTO.setShopId(orderVo.getShopId()); + choseCountDTO.setMasterId(orderVo.getMasterId()); + choseCount(choseCountDTO); + } + String day = DateUtils.getDay(); TbShopTable shopTable = null; int currentPlaceNum = getCurrentPlaceNum(orderVo.getTableId(), orderVo.getShopId().toString(), eatTypeInfoDTO);