diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/team/TeamBillSettleListener.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/team/TeamBillSettleListener.java index 4936d65b..bc69144f 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/team/TeamBillSettleListener.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/team/TeamBillSettleListener.java @@ -746,9 +746,14 @@ public class TeamBillSettleListener implements MessageListener { } private BigDecimal ownSalary(List teamBillMemberTargets) { - return teamBillMemberTargets.stream().map(TeamBillMemberTarget::getOwnSalary) - .reduce(BigDecimal.ZERO, BigDecimal::add) - .setScale(2, RoundingMode.DOWN); + BigDecimal ownSalaryTotal = teamBillMemberTargets.stream().map(TeamBillMemberTarget::getOwnSalary) + .reduce(BigDecimal.ZERO, BigDecimal::add) + .setScale(2, RoundingMode.DOWN); + // 代理有工资时 +1份主播的工资(主播代理也是主播) + if (ownSalaryTotal.compareTo(BigDecimal.ZERO) > 0 && CollectionUtils.isNotEmpty(teamBillMemberTargets)) { + return ownSalaryTotal.add(teamBillMemberTargets.get(0).getMemberSalary()); + } + return ownSalaryTotal; } private BigDecimal ownTotalSalary(List teamBillMemberTargets) {