diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java index 9df4c59..014452a 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java @@ -142,7 +142,9 @@ public class ProductService { TbOrderInfo order = getCurrentOrder(shopEatTypeInfoDTO, code, shopInfo.getId()); if (tbShopTable != null) { tbShopTable.setOrderId(order == null ? null : order.getId()); - tbShopTable.setChoseCount(order != null && (order.getSeatCount() != null)); + TbCashierCart seatCartInfo = getSeatCartInfo(shopId, tbShopTable.getQrcode(), Integer.valueOf(userId), shopEatTypeInfoDTO); + tbShopTable.setChoseCount(seatCartInfo != null && (seatCartInfo.getNumber() != null)); + } concurrentMap.put("shopTableInfo", tbShopTable == null ? "" : tbShopTable); @@ -894,16 +896,7 @@ public class ProductService { Integer userId = TokenUtil.getUserId(); - LambdaQueryWrapper query = new LambdaQueryWrapper() - .eq(TbCashierCart::getShopId, choseCountDTO.getShopId()) - .eq(TbCashierCart::getProductId, "-999") - .eq(TbCashierCart::getSkuId, "-999") - .eq(TbCashierCart::getStatus, "create") - .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime()) - .and(r -> r.eq(TbCashierCart::getUserId, userId).or().isNull(TbCashierCart::getUserId)) - .eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType()) - .eq(TbCashierCart::getTableId, choseCountDTO.getTableId()); - TbCashierCart tbCashierCart = mpCashierCartMapper.selectOne(query); + TbCashierCart tbCashierCart = getSeatCartInfo(choseCountDTO, userId, shopEatTypeInfoDTO); if (tbCashierCart == null) { tbCashierCart = new TbCashierCart(); @@ -939,6 +932,19 @@ public class ProductService { return tbCashierCart; } + private TbCashierCart getSeatCartInfo(Object shopId, String tableId, Integer userId, ShopEatTypeInfoDTO shopEatTypeInfoDTO) { + LambdaQueryWrapper query = new LambdaQueryWrapper() + .eq(TbCashierCart::getShopId, shopId) + .eq(TbCashierCart::getProductId, "-999") + .eq(TbCashierCart::getSkuId, "-999") + .eq(TbCashierCart::getStatus, "create") + .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime()) + .and(r -> r.eq(TbCashierCart::getUserId, userId).or().isNull(TbCashierCart::getUserId)) + .eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType()) + .eq(TbCashierCart::getTableId, tableId); + return mpCashierCartMapper.selectOne(query); + } + public Object choseEatModel(ChoseEatModelDTO choseTableDTO) { ShopEatTypeInfoDTO shopEatTypeInfoDTO = shopUtils.checkEatModel(choseTableDTO.getTableId(), choseTableDTO.getShopId()); if (!shopEatTypeInfoDTO.isTakeout()) {