diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java index e0e91cf..61d9405 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java @@ -1712,7 +1712,7 @@ public class CartService { .eq(TbCashierCart::getShopId, choseEatModelDTO.getShopId()) .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime()) .isNull(TbCashierCart::getOrderId) - .eq(TbCashierCart::getTableId, choseEatModelDTO.getTableId()) + .and(r -> r.eq(TbCashierCart::getTableId, choseEatModelDTO.getTableId()).or().isNull(TbCashierCart::getTableId).or().eq(TbCashierCart::getTableId, "")) .and(q -> q.eq(TbCashierCart::getUseType, shopEatTypeInfoDTO.getUseType()).or().isNull(TbCashierCart::getUseType).or().eq(TbCashierCart::getUseType, "")) .eq(TbCashierCart::getStatus, "create"); }