From ef12f3ca4b1c96332418d942162fabb86fa00407 Mon Sep 17 00:00:00 2001
From: tianfeng <769204422@qq.com>
Date: Mon, 1 Dec 2025 15:52:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E6=98=AF=E6=A0=A1=E9=AA=8Cte?=
 =?UTF-8?q?amMember?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../listener/team/TeamBillSettleListener.java | 10 ++++----
 .../src/test/java/TeamSalaryExportTest.java   | 24 +++++++++----------
 2 files changed, 16 insertions(+), 18 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 22fd2440..bdd5f97a 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
@@ -46,10 +46,7 @@ import com.red.circle.wallet.inner.model.dto.UserSalaryDiamondRunningWaterDTO;
 import com.red.circle.wallet.inner.model.enums.UserBankWaterEvent;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -225,7 +222,10 @@ public class TeamBillSettleListener implements MessageListener {
               billBelong
           );
         }
-        return teamMemberTargets;
+
+        List<TeamMember> teamMembers = teamMemberService.listByTeamId(teamBillCycle.getTeamId());
+        Set<Long> members = teamMembers.stream().map(TeamMember::getMemberId).collect(Collectors.toSet());
+        return teamMemberTargets.stream().filter(e -> members.contains(e.getUserId())).collect(Collectors.toList());
     }
 
   private Map<String, String> getMetadata(SysRegionConfig regionConfig) {
diff --git a/rc-service/rc-service-other/other-start/src/test/java/TeamSalaryExportTest.java b/rc-service/rc-service-other/other-start/src/test/java/TeamSalaryExportTest.java
index 97b675c5..bbfe0a9c 100644
--- a/rc-service/rc-service-other/other-start/src/test/java/TeamSalaryExportTest.java
+++ b/rc-service/rc-service-other/other-start/src/test/java/TeamSalaryExportTest.java
@@ -2,16 +2,10 @@ import com.red.circle.OtherServiceApplication;
 import com.red.circle.other.app.listener.team.TeamBillSettleListener;
 import com.red.circle.other.infra.database.mongo.dto.team.TeamBillMemberTarget;
 import com.red.circle.other.infra.database.mongo.dto.team.TeamBillSettleResult;
-import com.red.circle.other.infra.database.mongo.entity.team.team.TeamBillCycle;
-import com.red.circle.other.infra.database.mongo.entity.team.team.TeamMemberTarget;
-import com.red.circle.other.infra.database.mongo.entity.team.team.TeamPolicyManager;
-import com.red.circle.other.infra.database.mongo.entity.team.team.TeamProfile;
+import com.red.circle.other.infra.database.mongo.entity.team.team.*;
 import com.red.circle.other.infra.database.mongo.entity.user.region.SysRegionConfig;
 import com.red.circle.other.infra.database.mongo.service.team.TeamBillCycleUtils;
-import com.red.circle.other.infra.database.mongo.service.team.team.TeamBillCycleService;
-import com.red.circle.other.infra.database.mongo.service.team.team.TeamMemberTargetService;
-import com.red.circle.other.infra.database.mongo.service.team.team.TeamPolicyManagerService;
-import com.red.circle.other.infra.database.mongo.service.team.team.TeamProfileService;
+import com.red.circle.other.infra.database.mongo.service.team.team.*;
 import com.red.circle.other.infra.database.mongo.service.user.region.SysRegionConfigService;
 import com.red.circle.other.inner.enums.team.TeamBillCycleStatus;
 import com.red.circle.other.inner.model.dto.agency.agency.TeamCountry;
@@ -33,10 +27,8 @@ import java.io.FileOutputStream;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Slf4j
 @SpringBootTest(classes = OtherServiceApplication.class)
@@ -60,6 +52,9 @@ public class TeamSalaryExportTest {
     
     @Autowired
     private TeamMemberTargetService teamMemberTargetService;
+
+    @Autowired
+    private TeamMemberService teamMemberService;
     
     @Autowired
     private TeamPolicyManagerService teamPolicyManagerService;
@@ -214,7 +209,10 @@ public class TeamSalaryExportTest {
                 billBelong
             );
         }
-        return teamMemberTargets;
+
+        List<TeamMember> teamMembers = teamMemberService.listByTeamId(teamBillCycle.getTeamId());
+        Set<Long> members = teamMembers.stream().map(TeamMember::getMemberId).collect(Collectors.toSet());
+        return teamMemberTargets.stream().filter(e -> members.contains(e.getUserId())).collect(Collectors.toList());
     }
     
     /**