diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreAssemblerImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreAssemblerImpl.java index ed5f3675..5b266178 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreAssemblerImpl.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/store/service/impl/StoreAssemblerImpl.java @@ -99,7 +99,7 @@ public class StoreAssemblerImpl implements StoreAssembler { LocalDate now = LocalDate.now(); query.setGroupBy(TransactionBillGroupBy.store_id.name()); query.setStoreIds(list.stream().map(StoreVo::getStoreId).filter(Objects::nonNull).distinct().collect(Collectors.toList())); - query.setStatus(TransactionBillStatus.SUCCESS.getStatus()); + query.setStatusList(TransactionBillStatus.payedOrder()); query.setType(TransactionBillType.RECHARGE.getType()); query.setMonth(now.getMonthValue()); query.setYear(now.getYear()); @@ -129,7 +129,7 @@ public class StoreAssemblerImpl implements StoreAssembler { TransactionBillQuery query = new TransactionBillQuery(); query.setGroupBy(TransactionBillGroupBy.store_id.name()); query.setStoreIds(list.stream().map(StoreVo::getStoreId).filter(Objects::nonNull).distinct().collect(Collectors.toList())); - query.setStatus(TransactionBillStatus.SUCCESS.getStatus()); + query.setStatusList(TransactionBillStatus.payedOrder()); query.setType(TransactionBillType.RECHARGE.getType()); query.setCreateDate(DateUtils.getNowDate()); Map map = transactionBillService.selectCountMap(query, BillCountVo::getStoreId); @@ -158,7 +158,7 @@ public class StoreAssemblerImpl implements StoreAssembler { LocalDate lastMonth = LocalDate.now().plusMonths(-1); query.setGroupBy(TransactionBillGroupBy.store_id.name()); query.setStoreIds(list.stream().map(StoreVo::getStoreId).filter(Objects::nonNull).distinct().collect(Collectors.toList())); - query.setStatus(TransactionBillStatus.SUCCESS.getStatus()); + query.setStatusList(TransactionBillStatus.payedOrder()); query.setType(TransactionBillType.RECHARGE.getType()); query.setMonth(lastMonth.getMonthValue()); query.setYear(lastMonth.getYear());