diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/TeamBillCycleUtils.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/TeamBillCycleUtils.java index 727b45e1..13a49f03 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/TeamBillCycleUtils.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/TeamBillCycleUtils.java @@ -24,10 +24,7 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.time.YearMonth; import java.time.format.DateTimeFormatter; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -221,26 +218,9 @@ public final class TeamBillCycleUtils { continue; } - // AR 区域特殊处理:不需要时间和天数要求 - boolean isARRegion = "AR".equals(policy.getSysOrigin()); - - if (isARRegion) { - // AR 区域只要礼物流水达标就给全额工资 - resultTarget.setMemberSalary(teamPolicy.getMemberSalary()); - resultTarget.setOwnSalary(teamPolicy.getOwnSalary()); - resultTarget.setTotalSalary(teamPolicy.getTotalSalary()); - } else { - // 其他区域:完全满足条件(在线时长、礼物流水、有效天数都达标) - Integer policyEffectiveDay = NumUtils.isNullDefaultZero(teamPolicy.getEffectiveDay()); - if (targetTimeHours >= policyOnlineTimeHours && effectiveDay >= policyEffectiveDay) { - resultTarget.setMemberSalary(teamPolicy.getMemberSalary()); - resultTarget.setOwnSalary(teamPolicy.getOwnSalary()); - resultTarget.setTotalSalary(teamPolicy.getTotalSalary()); - } else { - resultTarget.setMemberSalary(teamPolicy.getMemberSalary().multiply(new BigDecimal("0.9")).setScale(2, RoundingMode.DOWN)); - resultTarget.setTotalSalary(teamPolicy.getMemberSalary().multiply(new BigDecimal("0.9")).setScale(2, RoundingMode.DOWN)); - } - } + resultTarget.setMemberSalary(teamPolicy.getMemberSalary()); + resultTarget.setOwnSalary(teamPolicy.getOwnSalary()); + resultTarget.setTotalSalary(teamPolicy.getTotalSalary()); resultTarget.setLevel(teamPolicy.getLevel()); resultTarget.setSatisfyLevel(Boolean.TRUE);