chuangte/smart-switch-java
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

首页报表优化

Browse Source
This commit is contained in:
墨大叔 2024-09-07 17:40:12 +08:00
parent eebccd5453
commit 6f1b8047cd
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
smart-switch-service/src/main/java/com/ruoyi/dashboard/DashboardService.java
View File

@ -106,7 +106,7 @@ public class DashboardService {
TransactionBillQuery billQuery = new TransactionBillQuery(); TransactionBillQuery billQuery = new TransactionBillQuery();
billQuery.setStartDate(query.getStartDate()); billQuery.setStartDate(query.getStartDate());
billQuery.setEndDate(query.getEndDate()); billQuery.setEndDate(query.getEndDate());
billQuery.setStatusList(TransactionBillStatus.payedOrder()); billQuery.setStatusList(TransactionBillStatus.serviceIncome());
List<TransactionAmountVO<Date>> amountList = transactionBillService.selectCommonSumOfMoney(billQuery, TransactionBillGroupBy.create_date.name()); List<TransactionAmountVO<Date>> amountList = transactionBillService.selectCommonSumOfMoney(billQuery, TransactionBillGroupBy.create_date.name());
// 查询月费收入 // 查询月费收入

7
smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/domain/enums/TransactionBillStatus.java
View File

@ -78,4 +78,11 @@ public enum TransactionBillStatus {
public static List<String> payedOrder() { public static List<String> payedOrder() {
return asList(SUCCESS, REFUNDED, REFUNDING); return asList(SUCCESS, REFUNDED, REFUNDING);
} }
/**
* 已收取服务费的状态
*/
public static List<String> serviceIncome() {
return asList(SUCCESS, REFUNDED, REFUNDING, WITHDRAW_SUCCESS);
}
} }

2
smart-switch-web/src/main/java/com/ruoyi/web/controller/ss/SmDashboardController.java
View File

@ -70,7 +70,7 @@ public class SmDashboardController extends BaseController {
@GetMapping("/hourBillCount") @GetMapping("/hourBillCount")
public AjaxResult hourBillCount(@Validated(ValidGroup.Query.class) TransactionBillQuery dto) { public AjaxResult hourBillCount(@Validated(ValidGroup.Query.class) TransactionBillQuery dto) {
dto.setGroupBy(TransactionBillGroupBy.create_hour.name()); dto.setGroupBy(TransactionBillGroupBy.create_hour.name());
dto.setStatus(TransactionBillStatus.SUCCESS.getStatus()); dto.setStatusList(TransactionBillStatus.serviceIncome());
return AjaxResult.success(transactionBillService.selectCount(dto)); return AjaxResult.success(transactionBillService.selectCount(dto));
} }