hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

结算是校验teamMember

Browse Source
This commit is contained in:
tianfeng 2025-12-01 15:52:09 +08:00
parent e3aef26f0e
commit ef12f3ca4b
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/team/TeamBillSettleListener.java
View File

@ -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) {

24
rc-service/rc-service-other/other-start/src/test/java/TeamSalaryExportTest.java
View File

@ -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());
}
/**