From aadc8d3f0cab8eb2bdaff1cc44c7485624077f1f Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Mon, 15 Dec 2025 17:47:04 +0800 Subject: [PATCH] =?UTF-8?q?bd=20leader=20=E7=BB=93=E7=AE=97=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/service/BdLeaderSalarySettlementServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/BdLeaderSalarySettlementServiceImpl.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/BdLeaderSalarySettlementServiceImpl.java index 566727e6..57b77924 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/BdLeaderSalarySettlementServiceImpl.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/BdLeaderSalarySettlementServiceImpl.java @@ -120,14 +120,14 @@ public class BdLeaderSalarySettlementServiceImpl implements BdLeaderSalarySettle // 4. 统计所有 BD 的工资总和并收集成员明细 List memberDetails = new ArrayList<>(); BigDecimal totalBdSalary = BigDecimal.ZERO; - + for (Long bdUserId : bdUserIds) { BdSalarySettlementRecord bdRecord = bdSalarySettlementRecordService.getByUserIdAndBillBelong(bdUserId, billBelong); if (bdRecord != null) { // 统计工资 - if (bdRecord.getSettlementSalary() != null) { - totalBdSalary = totalBdSalary.add(bdRecord.getSettlementSalary()); + if (bdRecord.getTeamSalaryAmount() != null) { + totalBdSalary = totalBdSalary.add(bdRecord.getTeamSalaryAmount()); } // 收集成员明细