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

processBill 调整

Browse Source
This commit is contained in:
tianfeng 2025-11-26 18:00:26 +08:00
parent d5d28bc6a1
commit 122b048e27
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,7 +114,7 @@ public class TeamBillSettleListener implements MessageListener {
return; return;
} }
teamBillCycles.forEach(teamBillCycle -> processBill(teamProfile, teamBillCycle)); teamBillCycles.forEach(teamBillCycle -> processBill(teamProfile, teamBillCycle, true));
} finally { } finally {
long endTime = LocalDateTimeUtils.nowEpochMilli() - startTime; long endTime = LocalDateTimeUtils.nowEpochMilli() - startTime;
@ -131,7 +131,7 @@ public class TeamBillSettleListener implements MessageListener {
this.process(new TeamBillSettleEvent().setTeamId(teamId)); this.process(new TeamBillSettleEvent().setTeamId(teamId));
} }
private void processBill(TeamProfile teamProfile, TeamBillCycle teamBillCycle) { public TeamBillSettleResult processBill(TeamProfile teamProfile, TeamBillCycle teamBillCycle, Boolean isPay) {
// 获取团队区域政策 // 获取团队区域政策
TeamPolicyManager regionPolicyManager = teamPolicyManagerService.getReleaseByRegionAndType( TeamPolicyManager regionPolicyManager = teamPolicyManagerService.getReleaseByRegionAndType(
teamBillCycle.getSysOrigin(), teamBillCycle.getSysOrigin(),
@ -146,7 +146,7 @@ public class TeamBillSettleListener implements MessageListener {
.setRemark("[挂起]该区域没有没有发布政策,系统无法处理") .setRemark("[挂起]该区域没有没有发布政策,系统无法处理")
.setCreateTime(TimestampUtils.now()) .setCreateTime(TimestampUtils.now())
); );
return; return null;
} }
List<TeamMemberTarget> teamMemberTargets = getTeamMemberTargets(teamBillCycle); List<TeamMemberTarget> teamMemberTargets = getTeamMemberTargets(teamBillCycle);
@ -156,7 +156,7 @@ public class TeamBillSettleListener implements MessageListener {
SysRegionConfig regionConfig = sysRegionConfigService.getById(teamProfile.getRegion()); SysRegionConfig regionConfig = sysRegionConfigService.getById(teamProfile.getRegion());
if (Objects.isNull(regionConfig)) { if (Objects.isNull(regionConfig)) {
log.warn("没有获得团队的区域数据,团队ID:{}", teamProfile.getId()); log.warn("没有获得团队的区域数据,团队ID:{}", teamProfile.getId());
return; return null;
} }
List<TeamBillMemberTarget> teamBillMemberTargets = List<TeamBillMemberTarget> teamBillMemberTargets =
@ -180,10 +180,15 @@ public class TeamBillSettleListener implements MessageListener {
); );
if (CollectionUtils.isEmpty(teamMemberTargets)) { if (CollectionUtils.isEmpty(teamMemberTargets)) {
return; return null;
} }
if (Objects.isNull(regionPolicyManager.getPolicyType()) || Objects.equals(TeamPolicyTypeEnum.MONEY.name(), regionPolicyManager.getPolicyType())) { if (!Boolean.TRUE.equals(isPay)) {
return settleResult;
}
if (Objects.isNull(regionPolicyManager.getPolicyType()) ||
Objects.equals(TeamPolicyTypeEnum.MONEY.name(), regionPolicyManager.getPolicyType())) {
log.warn("美金入账{}", teamProfile); log.warn("美金入账{}", teamProfile);
// 成员入账 // 成员入账
teamMemberCreditedBankBalance(teamProfile teamMemberCreditedBankBalance(teamProfile
@ -196,20 +201,8 @@ public class TeamBillSettleListener implements MessageListener {
Objects.toString(teamBillCycle.getId()), Objects.toString(teamBillCycle.getId()),
settleResult, settleResult,
regionConfig); regionConfig);
} else {
log.warn("钻石入账{}", teamProfile);
// 成员入账
teamMemberCreditedSalaryDiamondBalance(teamProfile
, teamMemberTargets,
teamBillMemberTargets,
regionConfig, teamBillCycle.getBillBelong());
// 团长入账
teamOwnCreditedSalaryDiamondBalance(teamProfile,
Objects.toString(teamBillCycle.getId()),
settleResult,
regionConfig, teamBillCycle.getBillBelong());
} }
return settleResult;
} }
private List<TeamMemberTarget> getTeamMemberTargets(TeamBillCycle teamBillCycle) { private List<TeamMemberTarget> getTeamMemberTargets(TeamBillCycle teamBillCycle) {