From 65060c7bc81507fc234977e03a31bccc723b43cb Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期三, 05 八月 2026 19:29:46 +0800
Subject: [PATCH] Merge branch 'fix/franchisee-income-align' into 2.2
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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 0454d38..c06f0a7 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
@@ -27,7 +27,6 @@
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.chargingPile.api.model.TParkingRecord;
-import com.ruoyi.chargingPile.api.model.TPartnerAppUser;
import com.ruoyi.chargingPile.api.vo.GetChargingGunByChargingPileIdsVo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.dto.ChargingOrderGroup;
@@ -300,15 +299,19 @@
}
chargingUsersByDay.computeIfAbsent(agg.getStatDay(), key -> new HashSet<>()).add(agg.getAppUserId());
}
- List<TPartnerAppUser> relations = Collections.emptyList();
- if (partner != null && partner.getId() != null) {
- R<List<TPartnerAppUser>> relationResult = partnerClient.getBoundAppUserRelations(partner.getId());
- if (relationResult != null && relationResult.getData() != null) {
- relations = relationResult.getData();
+ Map<LocalDate, Long> newUsersByDay = new LinkedHashMap<>();
+ if (range != null && range[0] != null && range[1] != null) {
+ List<FranchiseeNewUserStat> newUserStats = chargingOrderMapper.franchiseeNewUserStats(range[0], range[1]);
+ if (newUserStats != null) {
+ for (FranchiseeNewUserStat stat : newUserStats) {
+ if (stat != null && stat.getStatDay() != null && stat.getUserCount() != null) {
+ newUsersByDay.put(stat.getStatDay(), stat.getUserCount());
+ }
+ }
}
}
FranchiseeUserStatistics.Result userStatistics = FranchiseeUserStatistics.calculateByUserDays(
- chargingUsersByDay, relations, range[0], range[1]);
+ chargingUsersByDay, newUsersByDay, range[0], range[1]);
Set<Long> users = aggs.stream().map(FranchiseeUserAgg::getAppUserId).filter(Objects::nonNull).collect(Collectors.toSet());
List<TAppUser> appUsers = Collections.emptyList();
--
Gitblit v1.7.1