From f03ac8c143d16f5489e51c32f0bbb7541f4fe1f3 Mon Sep 17 00:00:00 2001
From: tianfeng <769204422@qq.com>
Date: Fri, 16 Jan 2026 11:50:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=B7=A5=E8=B5=84?=
 =?UTF-8?q?=E5=8F=91=E6=94=BEbdleader=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AdminSalarySettlementServiceImpl.java     | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/AdminSalarySettlementServiceImpl.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/AdminSalarySettlementServiceImpl.java
index 37bda394..e261cbf9 100644
--- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/AdminSalarySettlementServiceImpl.java
+++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/AdminSalarySettlementServiceImpl.java
@@ -11,9 +11,11 @@ import com.red.circle.other.app.dto.h5.RechargeSummaryVO;
 import com.red.circle.other.app.service.recharge.RechargeUserService;
 import com.red.circle.other.infra.database.mongo.entity.bd.AdminSalaryPolicy;
 import com.red.circle.other.infra.database.mongo.entity.bd.AdminSalarySettlementRecord;
+import com.red.circle.other.infra.database.mongo.entity.bd.BdLeaderSalarySettlementRecord;
 import com.red.circle.other.infra.database.mongo.entity.bd.BdSalarySettlementRecord;
 import com.red.circle.other.infra.database.mongo.service.bd.AdminSalaryPolicyService;
 import com.red.circle.other.infra.database.mongo.service.bd.AdminSalarySettlementRecordService;
+import com.red.circle.other.infra.database.mongo.service.bd.BdLeaderSalarySettlementRecordService;
 import com.red.circle.other.infra.database.mongo.service.bd.BdSalarySettlementRecordService;
 import com.red.circle.other.infra.database.rds.entity.sys.Administrator;
 import com.red.circle.other.infra.database.rds.service.sys.AdministratorService;
@@ -50,7 +52,7 @@ public class AdminSalarySettlementServiceImpl implements AdminSalarySettlementSe
     private final AdminSalaryPolicyService adminSalaryPolicyService;
     private final AdminSalarySettlementRecordService adminSalarySettlementRecordService;
     private final BdSalarySettlementRecordService bdSalarySettlementRecordService;
-    private final BdTeamSummaryQryExe bdTeamSummaryQryExe;
+    private final BdLeaderSalarySettlementRecordService bdLeaderSalarySettlementRecordService;
     private final RechargeUserService rechargeUserService;
     private final UserSalaryAccountClient userSalaryAccountClient;
     private final AdministratorService administratorService;
@@ -220,24 +222,15 @@ public class AdminSalarySettlementServiceImpl implements AdminSalarySettlementSe
      */
     private void calculateBdLeaderPolicy(Long adminUserId, Integer billBelong, AdminSalarySettlementRecord record) {
         // 查询 BD Leader 团队数据
-        BdTeamSummaryCO teamSummary = bdTeamSummaryQryExe.execute(adminUserId);
+        BdLeaderSalarySettlementRecord bdLeaderSalarySettlementRecord = bdLeaderSalarySettlementRecordService.getByUserIdAndBillBelong(adminUserId, billBelong);
 
-        if (teamSummary == null || teamSummary.getBdLeaderTeams() == null) {
+        if (bdLeaderSalarySettlementRecord == null) {
             record.setBdLeaderTeamSalary(BigDecimal.ZERO);
             record.setBdLeaderSalary(BigDecimal.ZERO);
             return;
         }
 
-        BigDecimal bdLeaderTeamSalary = teamSummary.getBdLeaderTeams().getTotalIncome();
-        if (bdLeaderTeamSalary == null) {
-            bdLeaderTeamSalary = BigDecimal.ZERO;
-        }
-        BigDecimal bdTeamSalary = teamSummary.getBdTeams().getTotalIncome();
-        if (bdTeamSalary == null) {
-            bdTeamSalary = BigDecimal.ZERO;
-        }
-
-        BigDecimal teamSalary = bdLeaderTeamSalary.add(bdTeamSalary).setScale(2, RoundingMode.DOWN);
+        BigDecimal teamSalary = bdLeaderSalarySettlementRecord.getTeamSalaryAmount();
         record.setBdLeaderTeamSalary(teamSalary);
 
         // 查询 BD_LEADER 政策