From 8f41aa713c6aa979bd0c36d4288e476b629c0097 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Fri, 27 Sep 2024 16:08:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E6=A1=8C=E4=B8=8D=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E8=AE=A2=E5=8D=95id=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashier/service/impl/shopimpl/TbShopTableServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 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 8f695366..4e8fce14 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 @@ -195,7 +195,6 @@ public class TbShopTableServiceImpl implements TbShopTableService { List tbShopTableList = tbShopTableRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder)); ArrayList> infoList = new ArrayList<>(); for (TbShopTable date : tbShopTableList) { - String orderId = redisTemplate.opsForValue().get(RedisConstant.CURRENT_TABLE_ORDER + date.getShopId() + ":" + date.getQrcode()); if (StrUtil.isBlank(date.getQrcode())) { date.setStatus("closed"); } else if (tbCashierCartMapper.selectCount(new LambdaQueryWrapper() @@ -220,7 +219,7 @@ public class TbShopTableServiceImpl implements TbShopTableService { itemMap.put("tableId", date.getQrcode()); } - ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(criteria.getShopId(), criteria.getQrcode() != null ? String.valueOf(criteria.getQrcode()) : ""); + ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(criteria.getShopId(), date.getQrcode()); TbOrderInfo orderInfo = getCurrentOrder(shopEatTypeInfoDTO); itemMap.put("orderId", orderInfo == null ? null : orderInfo.getId()); itemMap.put("useType", orderInfo == null ? null : orderInfo.getUseType());