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

管理员工资发放bdleader查询逻辑修改

Browse Source
This commit is contained in:
tianfeng 2026-01-16 11:50:06 +08:00
parent ec3f8b21db
commit f03ac8c143
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/AdminSalarySettlementServiceImpl.java
View File

@ -11,9 +11,11 @@ import com.red.circle.other.app.dto.h5.RechargeSummaryVO;
import com.red.circle.other.app.service.recharge.RechargeUserService; import com.red.circle.other.app.service.recharge.RechargeUserService;
import com.red.circle.other.infra.database.mongo.entity.bd.AdminSalaryPolicy; import com.red.circle.other.infra.database.mongo.entity.bd.AdminSalaryPolicy;
import com.red.circle.other.infra.database.mongo.entity.bd.AdminSalarySettlementRecord; import com.red.circle.other.infra.database.mongo.entity.bd.AdminSalarySettlementRecord;
import com.red.circle.other.infra.database.mongo.entity.bd.BdLeaderSalarySettlementRecord;
import com.red.circle.other.infra.database.mongo.entity.bd.BdSalarySettlementRecord; import com.red.circle.other.infra.database.mongo.entity.bd.BdSalarySettlementRecord;
import com.red.circle.other.infra.database.mongo.service.bd.AdminSalaryPolicyService; import com.red.circle.other.infra.database.mongo.service.bd.AdminSalaryPolicyService;
import com.red.circle.other.infra.database.mongo.service.bd.AdminSalarySettlementRecordService; import com.red.circle.other.infra.database.mongo.service.bd.AdminSalarySettlementRecordService;
import com.red.circle.other.infra.database.mongo.service.bd.BdLeaderSalarySettlementRecordService;
import com.red.circle.other.infra.database.mongo.service.bd.BdSalarySettlementRecordService; import com.red.circle.other.infra.database.mongo.service.bd.BdSalarySettlementRecordService;
import com.red.circle.other.infra.database.rds.entity.sys.Administrator; import com.red.circle.other.infra.database.rds.entity.sys.Administrator;
import com.red.circle.other.infra.database.rds.service.sys.AdministratorService; import com.red.circle.other.infra.database.rds.service.sys.AdministratorService;
@ -50,7 +52,7 @@ public class AdminSalarySettlementServiceImpl implements AdminSalarySettlementSe
private final AdminSalaryPolicyService adminSalaryPolicyService; private final AdminSalaryPolicyService adminSalaryPolicyService;
private final AdminSalarySettlementRecordService adminSalarySettlementRecordService; private final AdminSalarySettlementRecordService adminSalarySettlementRecordService;
private final BdSalarySettlementRecordService bdSalarySettlementRecordService; private final BdSalarySettlementRecordService bdSalarySettlementRecordService;
private final BdTeamSummaryQryExe bdTeamSummaryQryExe; private final BdLeaderSalarySettlementRecordService bdLeaderSalarySettlementRecordService;
private final RechargeUserService rechargeUserService; private final RechargeUserService rechargeUserService;
private final UserSalaryAccountClient userSalaryAccountClient; private final UserSalaryAccountClient userSalaryAccountClient;
private final AdministratorService administratorService; private final AdministratorService administratorService;
@ -220,24 +222,15 @@ public class AdminSalarySettlementServiceImpl implements AdminSalarySettlementSe
*/ */
private void calculateBdLeaderPolicy(Long adminUserId, Integer billBelong, AdminSalarySettlementRecord record) { private void calculateBdLeaderPolicy(Long adminUserId, Integer billBelong, AdminSalarySettlementRecord record) {
// 查询 BD Leader 团队数据 // 查询 BD Leader 团队数据
BdTeamSummaryCO teamSummary = bdTeamSummaryQryExe.execute(adminUserId); BdLeaderSalarySettlementRecord bdLeaderSalarySettlementRecord = bdLeaderSalarySettlementRecordService.getByUserIdAndBillBelong(adminUserId, billBelong);
if (teamSummary == null || teamSummary.getBdLeaderTeams() == null) { if (bdLeaderSalarySettlementRecord == null) {
record.setBdLeaderTeamSalary(BigDecimal.ZERO); record.setBdLeaderTeamSalary(BigDecimal.ZERO);
record.setBdLeaderSalary(BigDecimal.ZERO); record.setBdLeaderSalary(BigDecimal.ZERO);
return; return;
} }
BigDecimal bdLeaderTeamSalary = teamSummary.getBdLeaderTeams().getTotalIncome(); BigDecimal teamSalary = bdLeaderSalarySettlementRecord.getTeamSalaryAmount();
if (bdLeaderTeamSalary == null) {
bdLeaderTeamSalary = BigDecimal.ZERO;
}
BigDecimal bdTeamSalary = teamSummary.getBdTeams().getTotalIncome();
if (bdTeamSalary == null) {
bdTeamSalary = BigDecimal.ZERO;
}
BigDecimal teamSalary = bdLeaderTeamSalary.add(bdTeamSalary).setScale(2, RoundingMode.DOWN);
record.setBdLeaderTeamSalary(teamSalary); record.setBdLeaderTeamSalary(teamSalary);
// 查询 BD_LEADER 政策 // 查询 BD_LEADER 政策