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 af224ce..2e59128 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java @@ -978,8 +978,10 @@ public class ProductService { .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); + .eq(TbCashierCart::getTableId, tableId) + .orderByDesc(TbCashierCart::getId); + List cashierCartList = mpCashierCartMapper.selectList(query); + return cashierCartList.isEmpty() ? null : cashierCartList.get(0); } public Object choseEatModel(ChoseEatModelDTO choseTableDTO) {