From f1398cd113ee6a4bf23607d8e385cd4a68026497 Mon Sep 17 00:00:00 2001
From: tianfeng <769204422@qq.com>
Date: Fri, 14 Nov 2025 18:23:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=B5=84=E7=9B=AE=E6=A0=87=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E6=97=B6=E9=95=BF=E8=A6=81=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/team/TeamBillCycleUtils.java      | 28 +++----------------
 1 file changed, 4 insertions(+), 24 deletions(-)

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);