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;
} }

16
ruoyi-service/src/main/java/com/ruoyi/dashboard/service/DashboardService.java
View File

@ -176,7 +176,7 @@ public class DashboardService {
OrderRefundQuery refundQuery = query.toOrderRefundQuery(); OrderRefundQuery refundQuery = query.toOrderRefundQuery();
refundQuery.setRefundType(RefundType.AUTO.getCode()); refundQuery.setRefundType(RefundType.AUTO.getCode());
vo.setOrderAutoRefundAmount(orderDashboard.selectRefundAmount(refundQuery)); vo.setOrderAutoRefundAmount(orderDashboard.selectRefundAmount(refundQuery));
refundQuery.setRefundType(RefundType.ADMIN.getCode()); refundQuery.setRefundType(RefundType.ADMIN.getCode());
vo.setOrderAdminRefundAmount(orderDashboard.selectRefundAmount(refundQuery)); vo.setOrderAdminRefundAmount(orderDashboard.selectRefundAmount(refundQuery));
@ -208,7 +208,7 @@ public class DashboardService {
vo.setBonusCount(bonusDashboard.selectCount(query.toBonusQuery())); vo.setBonusCount(bonusDashboard.selectCount(query.toBonusQuery()));
} }
// 平台分成金额 // 平台分成金额
if (keys.contains(StatKeys.PLATFORM_BONUS_AMOUNT) || keys.contains(StatKeys.PLATFORM_BONUS_ACTUAL_AMOUNT)) { if (keys.contains(StatKeys.PLATFORM_BONUS_AMOUNT) || keys.contains(StatKeys.PLATFORM_BONUS_ACTUAL_AMOUNT)) {
vo.setPlatformBonusAmount(bonusDashboard.selectSumOfAmount(query.toPlatformBonusQuery())); vo.setPlatformBonusAmount(bonusDashboard.selectSumOfAmount(query.toPlatformBonusQuery()));
} }
@ -234,7 +234,7 @@ public class DashboardService {
if (keys.contains(StatKeys.AREA_JOIN_OPERATION_COUNT)) { if (keys.contains(StatKeys.AREA_JOIN_OPERATION_COUNT)) {
vo.setAreaOperationCount(areaJoinDashboard.selectOperationCount(query.toAreaJoinQuery())); vo.setAreaOperationCount(areaJoinDashboard.selectOperationCount(query.toAreaJoinQuery()));
} }
// 设备数量 // 设备数量
if (keys.contains(StatKeys.DEVICE_COUNT)) { if (keys.contains(StatKeys.DEVICE_COUNT)) {
vo.setDeviceCount(deviceDashboard.selectCount(query.toDeviceQuery())); vo.setDeviceCount(deviceDashboard.selectCount(query.toDeviceQuery()));
@ -296,19 +296,19 @@ public class DashboardService {
// 查询分成金额 // 查询分成金额
List<BonusDailyStatVO> bonusList = bonusDashboard.selectDailyStat( List<BonusDailyStatVO> bonusList = bonusDashboard.selectDailyStat(
query.toBonusQuery(), query.toBonusQuery(),
Arrays.asList(BonusDailyKeys.CREATE_DATE, BonusDailyKeys.BONUS_AMOUNT) Arrays.asList(BonusDailyKeys.CREATE_DATE, BonusDailyKeys.BONUS_AMOUNT)
); );
// 查询分成退款金额 // 查询分成退款金额
List<BonusRefundDailyStatVO> bonusRefundList = bonusRefundDashboard.selectDailyStat( List<BonusRefundDailyStatVO> bonusRefundList = bonusRefundDashboard.selectDailyStat(
query.toBonusRefundQuery(), query.toBonusRefundQuery(),
Arrays.asList(BonusRefundDailyKeys.CREATE_DATE, BonusRefundDailyKeys.BONUS_REFUND_AMOUNT) Arrays.asList(BonusRefundDailyKeys.CREATE_DATE, BonusRefundDailyKeys.BONUS_REFUND_AMOUNT)
); );
// 查询每日提现金额 // 查询每日提现金额
List<WithdrawDailyStatVO> withdrawList = withdrawDashboard.selectDailyStat( List<WithdrawDailyStatVO> withdrawList = withdrawDashboard.selectDailyStat(
query.toWithdrawQuery(), query.toWithdrawQuery(),
Arrays.asList(WithdrawDailyKeys.CREATE_DATE, WithdrawDailyKeys.WITHDRAW_SERVICE_CHARGE) Arrays.asList(WithdrawDailyKeys.CREATE_DATE, WithdrawDailyKeys.WITHDRAW_SERVICE_CHARGE)
); );
@ -322,13 +322,13 @@ public class DashboardService {
.filter(item -> item.getDate() != null && item.getDate().isEqual(date)) .filter(item -> item.getDate() != null && item.getDate().isEqual(date))
.findFirst().orElse(new BonusDailyStatVO()); .findFirst().orElse(new BonusDailyStatVO());
vo.setBonusAmount(MathUtils.dv(bonus.getAmount())); vo.setBonusAmount(MathUtils.dv(bonus.getAmount()));
// 分成退款金额 // 分成退款金额
BonusRefundDailyStatVO bonusRefund = bonusRefundList.stream() BonusRefundDailyStatVO bonusRefund = bonusRefundList.stream()
.filter(item -> item.getDate() != null && item.getDate().isEqual(date)) .filter(item -> item.getDate() != null && item.getDate().isEqual(date))
.findFirst().orElse(new BonusRefundDailyStatVO()); .findFirst().orElse(new BonusRefundDailyStatVO());
vo.setBonusRefundAmount(MathUtils.dv(bonusRefund.getAmount())); vo.setBonusRefundAmount(MathUtils.dv(bonusRefund.getAmount()));
// 提现手续费 // 提现手续费
WithdrawDailyStatVO withdraw = withdrawList.stream() WithdrawDailyStatVO withdraw = withdrawList.stream()
.filter(item -> item.getDate() != null && item.getDate().isEqual(date)) .filter(item -> item.getDate() != null && item.getDate().isEqual(date))