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(