diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/enums/TableStateEnum.java b/eladmin-system/src/main/java/cn/ysk/cashier/enums/TableStateEnum.java index 6fb3613b..de33d46a 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/enums/TableStateEnum.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/enums/TableStateEnum.java @@ -2,6 +2,7 @@ package cn.ysk.cashier.enums; public enum TableStateEnum { IDLE("idle"), + SUBSCRIBE("subscribe"), CLOSED("closed"), PAYING("paying"), PENDING("pending"), USING("using"), CLEANING("cleaning"); private String state = "closed"; 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 033bb382..942ea90b 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 @@ -306,6 +306,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { data.setStatus("idle"); mpShopTableMapper.update(null, new LambdaUpdateWrapper() .eq(TbShopTable::getQrcode, data.getQrcode()) + .ne(TbShopTable::getStatus, TableStateEnum.SUBSCRIBE.getState()) .set(TbShopTable::getStatus, TableStateEnum.IDLE.getState())); } Map itemMap = BeanUtil.beanToMap(data, false, false);