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

BD收益显示问题更改

Browse Source
This commit is contained in:
tianfeng 2025-11-25 10:53:46 +08:00
parent 76591646a1
commit d7e8dc09a2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/bd/query/TeamBdMemberBillListQryExe.java
View File

@ -441,10 +441,16 @@ public class TeamBdMemberBillListQryExe {
BigDecimal salarySalary = BdSalarySettlementServiceImpl.matchAndCalculate( BigDecimal salarySalary = BdSalarySettlementServiceImpl.matchAndCalculate(
salaryPolicies, agencyNumber, teamSalaryAmount, BdPolicyType.TEAM_SALARY, tempRecord); salaryPolicies, agencyNumber, teamSalaryAmount, BdPolicyType.TEAM_SALARY, tempRecord);
currentBill.setBdIncomeSalary(salarySalary);
currentBill.setBdRatioSalary(tempRecord.getCommissionRate());
// 匹配政策2：Team Recharge Policy // 匹配政策2：Team Recharge Policy
BigDecimal rechargeSalary = BdSalarySettlementServiceImpl.matchAndCalculate( BigDecimal rechargeSalary = BdSalarySettlementServiceImpl.matchAndCalculate(
rechargePolicies, agencyNumber, teamRechargeAmount, BdPolicyType.TEAM_RECHARGE, tempRecord); rechargePolicies, agencyNumber, teamRechargeAmount, BdPolicyType.TEAM_RECHARGE, tempRecord);
currentBill.setBdIncomeRecharge(rechargeSalary);
currentBill.setBdRatioRecharge(tempRecord.getCommissionRate());
// 选择最高工资并设置相关字段 // 选择最高工资并设置相关字段
if (salarySalary.compareTo(rechargeSalary) >= 0) { if (salarySalary.compareTo(rechargeSalary) >= 0) {
currentBill.setHitPolicyType(BdPolicyType.TEAM_SALARY.name()); currentBill.setHitPolicyType(BdPolicyType.TEAM_SALARY.name());