diff --git a/smart-switch-service/src/main/java/com/ruoyi/dashboard/DashboardService.java b/smart-switch-service/src/main/java/com/ruoyi/dashboard/DashboardService.java index ea116581..614687d1 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/dashboard/DashboardService.java +++ b/smart-switch-service/src/main/java/com/ruoyi/dashboard/DashboardService.java @@ -106,7 +106,7 @@ public class DashboardService { TransactionBillQuery billQuery = new TransactionBillQuery(); billQuery.setStartDate(query.getStartDate()); billQuery.setEndDate(query.getEndDate()); - billQuery.setStatusList(TransactionBillStatus.payedOrder()); + billQuery.setStatusList(TransactionBillStatus.serviceIncome()); List> amountList = transactionBillService.selectCommonSumOfMoney(billQuery, TransactionBillGroupBy.create_date.name()); // 查询月费收入 diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillStatus.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillStatus.java index d7e34c12..843d4cd0 100644 --- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillStatus.java +++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillStatus.java @@ -78,4 +78,11 @@ public enum TransactionBillStatus { public static List payedOrder() { return asList(SUCCESS, REFUNDED, REFUNDING); } + + /** + * 已收取服务费的状态 + */ + public static List serviceIncome() { + return asList(SUCCESS, REFUNDED, REFUNDING, WITHDRAW_SUCCESS); + } } diff --git a/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SmDashboardController.java b/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SmDashboardController.java index 0003018b..d1b55651 100644 --- a/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SmDashboardController.java +++ b/smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SmDashboardController.java @@ -70,7 +70,7 @@ public class SmDashboardController extends BaseController { @GetMapping("/hourBillCount") public AjaxResult hourBillCount(@Validated(ValidGroup.Query.class) TransactionBillQuery dto) { dto.setGroupBy(TransactionBillGroupBy.create_hour.name()); - dto.setStatus(TransactionBillStatus.SUCCESS.getStatus()); + dto.setStatusList(TransactionBillStatus.serviceIncome()); return AjaxResult.success(transactionBillService.selectCount(dto)); }