From b9e0101841026c1a799a74ce31d1ff6a11382d8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Fri, 13 Dec 2024 16:45:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E6=A1=8C=E9=A2=84=E8=AE=A2=E6=94=B9?= =?UTF-8?q?=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/shopimpl/TbShopTableServiceImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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) {