mengxu/pusong-crm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提成比例问题

Browse Source
This commit is contained in:
mx 2024-11-27 17:43:26 +08:00
parent c2df4242ce
commit 06f8dda540
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pusong-modules/pusong-business/src/main/java/com/pusong/business/batch/CalSalaryBatch.java
View File

@ -262,11 +262,13 @@ public class CalSalaryBatch {
//服务类型金额 - 成本 //服务类型金额 - 成本
BigDecimal amount = item.getBusinessAmount().subtract(cost); BigDecimal amount = item.getBusinessAmount().subtract(cost);
// ×比例 // ×比例
rate = rate.multiply(new BigDecimal("0.01"));
salary = salary.add(amount.multiply(rate)); salary = salary.add(amount.multiply(rate));
}else{//（按照类型算） }else{//（按照类型算）
for (PsContractBusinessDetailVo detail : item.getDetailVoList()){ for (PsContractBusinessDetailVo detail : item.getDetailVoList()){
//比例 //比例
BigDecimal rateConfig = configMap.get(detail.getBusinessProject()) == null ? new BigDecimal("0.1") : configMap.get(detail.getBusinessProject()); BigDecimal rateConfig = configMap.get(detail.getBusinessProject()) == null ? new BigDecimal("0.1") : configMap.get(detail.getBusinessProject());
rateConfig = rateConfig.multiply(new BigDecimal("0.01"));
//成本 //成本
BigDecimal rateCost = costMap.get(detail.getBusinessProject()) == null ? new BigDecimal(cbStr):costMap.get(detail.getBusinessProject()); BigDecimal rateCost = costMap.get(detail.getBusinessProject()) == null ? new BigDecimal(cbStr):costMap.get(detail.getBusinessProject());

2
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsSalaryServiceImpl.java
View File

@ -66,7 +66,7 @@ public class PsSalaryServiceImpl implements IPsSalaryService {
LocalDateTime deadline = bo.getEndDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(); LocalDateTime deadline = bo.getEndDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
LocalDate thisMonth = LocalDate.now(); LocalDate thisMonth = LocalDate.now();
List<PsSalaryVo> adds = calSalaryBatch.calcData(deadline, thisMonth, false); List<PsSalaryVo> adds = calSalaryBatch.calcData(deadline, thisMonth, false);
List<PsSalaryVo> records= new ArrayList<>(); List<PsSalaryVo> records = new ArrayList<>();
records.addAll(result.getRecords()); records.addAll(result.getRecords());
// long diffNum = result.getSize() - result.getRecords().size(); // long diffNum = result.getSize() - result.getRecords().size();