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

工资结算恢复90%计算

Browse Source
This commit is contained in:
tianfeng 2025-11-26 16:31:42 +08:00
parent b0167925fb
commit c94d2e57fa
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/TeamBillCycleUtils.java
View File

@ -218,14 +218,21 @@ public final class TeamBillCycleUtils {
continue; continue;
} }
resultTarget.setMemberSalary(teamPolicy.getMemberSalary()); Integer policyEffectiveDay = NumUtils.isNullDefaultZero(teamPolicy.getEffectiveDay());
resultTarget.setOwnSalary(teamPolicy.getOwnSalary()); if (targetTimeHours >= policyOnlineTimeHours && effectiveDay >= policyEffectiveDay) {
resultTarget.setTotalSalary(teamPolicy.getTotalSalary()); resultTarget.setMemberSalary(teamPolicy.getMemberSalary());
resultTarget.setOwnSalary(teamPolicy.getOwnSalary());
resultTarget.setTotalSalary(teamPolicy.getTotalSalary());
return resultTarget;
} 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.setLevel(teamPolicy.getLevel()); resultTarget.setLevel(teamPolicy.getLevel());
resultTarget.setSatisfyLevel(Boolean.TRUE); resultTarget.setSatisfyLevel(Boolean.TRUE);
resultTarget.setPropsRewards(teamPolicy.getPropsRewards()); resultTarget.setPropsRewards(teamPolicy.getPropsRewards());
return resultTarget; return resultTarget;
} }
return resultTarget; return resultTarget;
}).filter(Objects::nonNull).collect(Collectors.toList()); }).filter(Objects::nonNull).collect(Collectors.toList());