diff --git a/ruoyi-service/src/main/java/com/ruoyi/dashboard/domain/revenueStat/RevenueStatQuery.java b/ruoyi-service/src/main/java/com/ruoyi/dashboard/domain/revenueStat/RevenueStatQuery.java index 8346249..ea64479 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/dashboard/domain/revenueStat/RevenueStatQuery.java +++ b/ruoyi-service/src/main/java/com/ruoyi/dashboard/domain/revenueStat/RevenueStatQuery.java @@ -48,7 +48,6 @@ public class RevenueStatQuery { private OrderQuery baseOrderQuery() { OrderQuery query = new OrderQuery(); query.setStatusList(OrderStatus.valid()); - query.setUserId(userId); query.setAreaId(areaId); query.setScope(scope); query.addAreaPermission(AreaJoinPermission.ORDER_VIEW.getCode()); @@ -91,6 +90,7 @@ public class RevenueStatQuery { BonusQuery query = baseBonusQuery(); query.setArrivalId(userId); query.setAreaId(areaId); + query.setArrivalTypes(BonusArrivalType.userList()); query.setCreateDateRange(dateRange); return query; } @@ -109,6 +109,7 @@ public class RevenueStatQuery { BonusRefundQuery query = baseBonusRefundQuery(); query.setBonusArrivalId(userId); query.setBonusAreaId(areaId); + query.setBonusArrivalTypes(BonusArrivalType.userList()); query.setCreateDateRange(dateRange); return query; } diff --git a/ruoyi-service/src/main/java/com/ruoyi/dashboard/service/DashboardService.java b/ruoyi-service/src/main/java/com/ruoyi/dashboard/service/DashboardService.java index 880d508..da4e9ee 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/dashboard/service/DashboardService.java +++ b/ruoyi-service/src/main/java/com/ruoyi/dashboard/service/DashboardService.java @@ -176,7 +176,7 @@ public class DashboardService { OrderRefundQuery refundQuery = query.toOrderRefundQuery(); refundQuery.setRefundType(RefundType.AUTO.getCode()); vo.setOrderAutoRefundAmount(orderDashboard.selectRefundAmount(refundQuery)); - + refundQuery.setRefundType(RefundType.ADMIN.getCode()); vo.setOrderAdminRefundAmount(orderDashboard.selectRefundAmount(refundQuery)); @@ -208,7 +208,7 @@ public class DashboardService { vo.setBonusCount(bonusDashboard.selectCount(query.toBonusQuery())); } - // 平台分成金额 + // 平台分成金额 if (keys.contains(StatKeys.PLATFORM_BONUS_AMOUNT) || keys.contains(StatKeys.PLATFORM_BONUS_ACTUAL_AMOUNT)) { vo.setPlatformBonusAmount(bonusDashboard.selectSumOfAmount(query.toPlatformBonusQuery())); } @@ -234,7 +234,7 @@ public class DashboardService { if (keys.contains(StatKeys.AREA_JOIN_OPERATION_COUNT)) { vo.setAreaOperationCount(areaJoinDashboard.selectOperationCount(query.toAreaJoinQuery())); } - + // 设备数量 if (keys.contains(StatKeys.DEVICE_COUNT)) { vo.setDeviceCount(deviceDashboard.selectCount(query.toDeviceQuery())); @@ -296,19 +296,19 @@ public class DashboardService { // 查询分成金额 List bonusList = bonusDashboard.selectDailyStat( - query.toBonusQuery(), + query.toBonusQuery(), Arrays.asList(BonusDailyKeys.CREATE_DATE, BonusDailyKeys.BONUS_AMOUNT) ); // 查询分成退款金额 List bonusRefundList = bonusRefundDashboard.selectDailyStat( - query.toBonusRefundQuery(), + query.toBonusRefundQuery(), Arrays.asList(BonusRefundDailyKeys.CREATE_DATE, BonusRefundDailyKeys.BONUS_REFUND_AMOUNT) ); // 查询每日提现金额 List withdrawList = withdrawDashboard.selectDailyStat( - query.toWithdrawQuery(), + query.toWithdrawQuery(), 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)) .findFirst().orElse(new BonusDailyStatVO()); vo.setBonusAmount(MathUtils.dv(bonus.getAmount())); - + // 分成退款金额 BonusRefundDailyStatVO bonusRefund = bonusRefundList.stream() .filter(item -> item.getDate() != null && item.getDate().isEqual(date)) .findFirst().orElse(new BonusRefundDailyStatVO()); vo.setBonusRefundAmount(MathUtils.dv(bonusRefund.getAmount())); - + // 提现手续费 WithdrawDailyStatVO withdraw = withdrawList.stream() .filter(item -> item.getDate() != null && item.getDate().isEqual(date))