From dd474da547a6d7a5b61d2e7db84c9fc1f22c3b6e Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Thu, 4 Sep 2025 11:48:17 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E7=BB=93=E7=AE=97):=20=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E6=9C=89=E5=B7=A5=E8=B5=84=E6=97=B6=20+1=E4=BB=BD=E4=B8=BB?= =?UTF-8?q?=E6=92=AD=E7=9A=84=E5=B7=A5=E8=B5=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/listener/team/TeamBillSettleListener.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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) {