From db8aff00e6cdd12e6c5bf966e9449dbf99a04608 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 31 七月 2026 13:47:10 +0800
Subject: [PATCH] 修改管理后台报表统计 1、修改合作商账号查询平台总收入分析无数据
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 587ee8a..d1b2ecf 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -1624,7 +1624,7 @@
List<Integer> siteIds = resolvePlatformRevenueSiteIds(userId, sysUser, siteId, partnerId);
LocalDate sixBefore = PreviousSixMonths.get();
//通过siteIds进行sql查询统计
- List<SixChargingDto> chargingDtos = chargingOrderService.charge(sixBefore, siteIds, partnerView);
+ List<SixChargingDto> chargingDtos = chargingOrderService.charge(sixBefore, siteIds, false);
LocalDate statisticsEndMonth = resolveStatisticsEndMonth(LocalDate.now(), chargingDtos);
List<SixChargingDto> sixChargingDtos = generateLastSixMonths(statisticsEndMonth);
for (SixChargingDto sixChargingDto : sixChargingDtos) {
@@ -1688,7 +1688,7 @@
boolean partnerView = isPartnerView(sysUser);
List<Integer> siteIds = resolvePlatformRevenueSiteIds(userId, sysUser, siteId, partnerId);
LocalDate sixBefore = PreviousSixMonths.get();
- List<SixCircleDto> sixCircleDtos = chargingOrderService.circle(siteIds,sixBefore, partnerView);
+ List<SixCircleDto> sixCircleDtos = chargingOrderService.circle(siteIds,sixBefore, false);
for (SixCircleDto sixCircleDto : sixCircleDtos) {
Site site = siteClient.getSiteByIds(Arrays.asList(sixCircleDto.getSiteId())).getData().get(0);
sixCircleDto.setSiteName(site.getName());
@@ -1775,7 +1775,7 @@
SysUser sysUser = sysUserClient.getSysUser(userId).getData();
boolean partnerView = isPartnerView(sysUser);
List<Integer> siteIds = resolvePlatformRevenueSiteIds(userId, sysUser, siteId, partnerId);
- Map<String,Object> map = chargingOrderService.countAll(siteIds, partnerView);
+ Map<String,Object> map = chargingOrderService.countAll(siteIds, false);
if (map == null) {
map = new HashMap<String,Object>();
}
@@ -1808,7 +1808,7 @@
boolean partnerView = isPartnerView(sysUser);
List<Integer> siteIds = resolvePlatformRevenueSiteIds(userId, sysUser, siteId, partnerId);
LocalDate sixBefore = PreviousSixMonths.get();
- return R.ok(chargingOrderService.payTypeCircle(sixBefore, siteIds, partnerView));
+ return R.ok(chargingOrderService.payTypeCircle(sixBefore, siteIds, false));
}
private boolean isPartnerView(SysUser sysUser) {
--
Gitblit v1.7.1