From bd57d989b918b469d07987159b007347e4eb339c Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期三, 05 八月 2026 15:33:19 +0800
Subject: [PATCH] Merge branch 'fix/franchisee-income-align' into 2.2
---
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 616a935..11bfda3 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
@@ -3621,10 +3621,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