chuangte/electripper-v2
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新统计数据

Browse Source
This commit is contained in:
磷叶 2025-05-08 18:16:40 +08:00
parent 957d8494a6
commit 1f5ff9e1f9
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-service/src/main/java/com/ruoyi/dashboard/domain/revenueStat/RevenueStatQuery.java
View File

@ -48,7 +48,6 @@ public class RevenueStatQuery {
private OrderQuery baseOrderQuery() { private OrderQuery baseOrderQuery() {
OrderQuery query = new OrderQuery(); OrderQuery query = new OrderQuery();
query.setStatusList(OrderStatus.valid()); query.setStatusList(OrderStatus.valid());
query.setUserId(userId);
query.setAreaId(areaId); query.setAreaId(areaId);
query.setScope(scope); query.setScope(scope);
query.addAreaPermission(AreaJoinPermission.ORDER_VIEW.getCode()); query.addAreaPermission(AreaJoinPermission.ORDER_VIEW.getCode());
@ -91,6 +90,7 @@ public class RevenueStatQuery {
BonusQuery query = baseBonusQuery(); BonusQuery query = baseBonusQuery();
query.setArrivalId(userId); query.setArrivalId(userId);
query.setAreaId(areaId); query.setAreaId(areaId);
query.setArrivalTypes(BonusArrivalType.userList());
query.setCreateDateRange(dateRange); query.setCreateDateRange(dateRange);
return query; return query;
} }
@ -109,6 +109,7 @@ public class RevenueStatQuery {
BonusRefundQuery query = baseBonusRefundQuery(); BonusRefundQuery query = baseBonusRefundQuery();
query.setBonusArrivalId(userId); query.setBonusArrivalId(userId);
query.setBonusAreaId(areaId); query.setBonusAreaId(areaId);
query.setBonusArrivalTypes(BonusArrivalType.userList());
query.setCreateDateRange(dateRange); query.setCreateDateRange(dateRange);
return query; return query;
} }