From b85546df27b9940476360ff1b200e529d54cd98e Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Mon, 15 Dec 2025 19:31:42 +0800 Subject: [PATCH] =?UTF-8?q?admin=20=E7=BB=93=E7=AE=97=E4=BF=AE=E6=94=B9i?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AdminSalarySettlementServiceImpl.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 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 3b01bbcb..7d41db9f 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 @@ -229,11 +229,17 @@ public class AdminSalarySettlementServiceImpl implements AdminSalarySettlementSe return; } - BigDecimal teamSalary = teamSummary.getBdLeaderTeams().getTotalIncome(); - if (teamSalary == null) { - teamSalary = BigDecimal.ZERO; + BigDecimal bdLeaderTeamSalary = teamSummary.getBdLeaderTeams().getTotalIncome(); + if (bdLeaderTeamSalary == null) { + bdLeaderTeamSalary = BigDecimal.ZERO; } - record.setBdLeaderTeamSalary(teamSalary.setScale(2, RoundingMode.DOWN)); + BigDecimal bdTeamSalary = teamSummary.getBdTeams().getTotalIncome(); + if (bdTeamSalary == null) { + bdTeamSalary = BigDecimal.ZERO; + } + + BigDecimal teamSalary = bdLeaderTeamSalary.add(bdTeamSalary).setScale(2, RoundingMode.DOWN); + record.setBdLeaderTeamSalary(teamSalary); // 查询 BD_LEADER 政策 List policies = adminSalaryPolicyService.listEnabledByType(