From eac80fa4c1bd3af514d91fddee2bd2ac4f609acd Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期三, 05 八月 2026 15:29:18 +0800
Subject: [PATCH] fix: 平台总收入分析-数据分类与电站收入分析同口径（近6月+当月）
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index bf9d7c5..929263a 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -3583,10 +3583,10 @@
}
@Override
- public Map<String, Object> countAll(List<Integer> siteIds, Boolean partnerView) {
- Map<String, Object> result = this.baseMapper.countAll(siteIds, partnerView);
+ public Map<String, Object> countAll(List<Integer> siteIds, Boolean partnerView, LocalDate sixBefore) {
+ Map<String, Object> result = this.baseMapper.countAll(siteIds, partnerView, sixBefore);
if (!Boolean.TRUE.equals(partnerView) && result != null) {
- result.put("commission_amount", this.baseMapper.sumSuccessfulShareAmount(siteIds));
+ result.put("commission_amount", this.baseMapper.sumSuccessfulShareAmount(siteIds, sixBefore));
}
return result;
}
--
Gitblit v1.7.1