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

代客下单就餐模式判断

This commit is contained in:
SongZhang 2024-09-19 16:53:18 +08:00
parent d7eaca4af2
commit 4e76bb2736
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
eladmin-system/src/main/java/cn/ysk/cashier/enums/ShopInfoTypeEnums.java Normal file
View File

@ -0,0 +1,14 @@
package cn.ysk.cashier.enums;
import lombok.Getter;
@Getter
public enum ShopInfoTypeEnums {
MUNCHIES("munchies"),
RESTAURANT("restaurant");
private final String value;
ShopInfoTypeEnums(String value) {
this.value = value;
}
}

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

@ -11,6 +11,7 @@ import cn.ysk.cashier.cons.RedisConstant;
import cn.ysk.cashier.cons.rabbit.RabbitConstants;
import cn.ysk.cashier.dto.shoptable.*;
import cn.ysk.cashier.enums.OrderUseTypeEnum;
import cn.ysk.cashier.enums.ShopInfoTypeEnums;
import cn.ysk.cashier.enums.ShopWxMsgTypeEnum;
import cn.ysk.cashier.enums.TableStateEnum;
import cn.ysk.cashier.exception.BadRequestException;
@ -1004,7 +1005,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
Integer mealNum = null;
boolean unAdd = cashierCarts.stream().noneMatch(item -> item.getPlaceNum() == null);
if (addMaterId && unAdd && !OrderUseTypeEnum.TAKEOUT.getValue().equals(createOrderDTO.getUseType())) {
if (ShopInfoTypeEnums.RESTAURANT.getValue().equals(shopInfo.getRegisterType()) && addMaterId && unAdd) {
throw new BadRequestException("此次未添加新商品，清先添加商品");
}
for (TbCashierCart cashierCart : cashierCarts) {