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 942ea90b..75aa030d 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 @@ -303,11 +303,13 @@ public class TbShopTableServiceImpl implements TbShopTableService { if (StrUtil.isBlank(data.getQrcode())) { data.setStatus("unbind"); } else if ((countMap.get(data.getQrcode()) == null || countMap.get(data.getQrcode()) < 1) && !TableStateEnum.CLEANING.getState().equals(data.getStatus())) { - 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())); + if (!TableStateEnum.SUBSCRIBE.getState().equals(data.getStatus())) { + 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); if ((data.getStatus().equals("using") || data.getStatus().equals("cleaning")) && data.getUseTime() != null) {