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

代码优化

Browse Source
This commit is contained in:
tianfeng 2025-11-14 15:23:46 +08:00
parent af0990021e
commit 8b2b7e9d47
2 changed files with 47 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,24 +149,8 @@ public class TeamBillSettleListener implements MessageListener {
return; return;
} }
Integer billBelong = teamBillCycle.getBillBelong(); List<TeamMemberTarget> teamMemberTargets = getTeamMemberTargets(teamBillCycle);
Integer batchNumber = TeamBillCycleUtils.extractBatch(billBelong); log.warn("团队账单结算teamMemberTargets."+teamMemberTargets);
List<TeamMemberTarget> teamMemberTargets;
if (batchNumber != null && batchNumber == 2) {
teamMemberTargets = teamMemberTargetService.listByMonthlyBillBelong(
teamBillCycle.getTeamId(),
TeamBillCycleUtils.extractMonth(billBelong)
);
} else {
// 上半月结算：直接查询当前批次数据
teamMemberTargets = teamMemberTargetService.listByBillBelong(
teamBillCycle.getTeamId(),
billBelong
);
}
log.warn("团队账单结算teamMemberTargets."+teamMemberTargets);
// 获得区域配置细信息 // 获得区域配置细信息
SysRegionConfig regionConfig = sysRegionConfigService.getById(teamProfile.getRegion()); SysRegionConfig regionConfig = sysRegionConfigService.getById(teamProfile.getRegion());
@ -228,7 +212,27 @@ public class TeamBillSettleListener implements MessageListener {
} }
} }
private List<TeamBillMemberTarget> calculatorTarget(List<TeamMemberTarget> teamMemberTargets, private List<TeamMemberTarget> getTeamMemberTargets(TeamBillCycle teamBillCycle) {
Integer billBelong = teamBillCycle.getBillBelong();
Integer batchNumber = TeamBillCycleUtils.extractBatch(billBelong);
List<TeamMemberTarget> teamMemberTargets;
if (batchNumber != null && batchNumber == 2) {
teamMemberTargets = teamMemberTargetService.listByMonthlyBillBelong(
teamBillCycle.getTeamId(),
TeamBillCycleUtils.extractMonth(billBelong)
);
} else {
// 上半月结算：直接查询当前批次数据
teamMemberTargets = teamMemberTargetService.listByBillBelong(
teamBillCycle.getTeamId(),
billBelong
);
}
return teamMemberTargets;
}
private List<TeamBillMemberTarget> calculatorTarget(List<TeamMemberTarget> teamMemberTargets,
TeamPolicyManager regionPolicyManager) { TeamPolicyManager regionPolicyManager) {
//2fun新增钻石政策 //2fun新增钻石政策
if (Objects.isNull(regionPolicyManager.getPolicyType()) || Objects.equals("MONEY", regionPolicyManager.getPolicyType())) { if (Objects.isNull(regionPolicyManager.getPolicyType()) || Objects.equals("MONEY", regionPolicyManager.getPolicyType())) {

27
rc-service/rc-service-other/other-start/src/test/java/TeamMonthBillTest.java
View File

@ -103,9 +103,7 @@ public class TeamMonthBillTest {
teamBillCycle.getSysOrigin(), teamBillCycle.getSysOrigin(),
teamBillCycle.getRegion() teamBillCycle.getRegion()
); );
List<TeamMemberTarget> teamMemberTargets = teamMemberTargetService.listByBillBelong( List<TeamMemberTarget> teamMemberTargets = getTeamMemberTargets(teamBillCycle);
teamBillCycle.getTeamId(),
teamBillCycle.getBillBelong());
List<TeamBillMemberTarget> teamBillMemberTargets = List<TeamBillMemberTarget> teamBillMemberTargets =
TeamBillCycleUtils.calculatorPolicyTarget(teamMemberTargets, regionPolicyManager); TeamBillCycleUtils.calculatorPolicyTarget(teamMemberTargets, regionPolicyManager);
@ -127,8 +125,31 @@ public class TeamMonthBillTest {
System.out.printf("拥有者工资: %s%n", settleResult.getOwnSalary()); System.out.printf("拥有者工资: %s%n", settleResult.getOwnSalary());
System.out.printf("工资合计: %s%n", settleResult.getTotalSalary()); System.out.printf("工资合计: %s%n", settleResult.getTotalSalary());
System.out.println("======================================="); System.out.println("=======================================");
} }
private List<TeamMemberTarget> getTeamMemberTargets(TeamBillCycle teamBillCycle) {
Integer billBelong = teamBillCycle.getBillBelong();
Integer batchNumber = TeamBillCycleUtils.extractBatch(billBelong);
List<TeamMemberTarget> teamMemberTargets;
if (batchNumber != null && batchNumber == 2) {
teamMemberTargets = teamMemberTargetService.listByMonthlyBillBelong(
teamBillCycle.getTeamId(),
TeamBillCycleUtils.extractMonth(billBelong)
);
} else {
// 上半月结算：直接查询当前批次数据
teamMemberTargets = teamMemberTargetService.listByBillBelong(
teamBillCycle.getTeamId(),
billBelong
);
}
return teamMemberTargets;
}
private int countWorkMembers(List<TeamMemberTarget> teamMemberTargets) { private int countWorkMembers(List<TeamMemberTarget> teamMemberTargets) {
return CollectionUtils.isNotEmpty(teamMemberTargets) ? teamMemberTargets.size() : 0; return CollectionUtils.isNotEmpty(teamMemberTargets) ? teamMemberTargets.size() : 0;
} }