Commit 6ce5a8bf by zhangxingmin

push

parent 1025f34b
...@@ -768,6 +768,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -768,6 +768,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
.productLaunchBizId(brokerDto.getPlanBizId()) .productLaunchBizId(brokerDto.getPlanBizId())
//保险公司业务id //保险公司业务id
.insuranceCompanyBizId(brokerDto.getInsuranceCompanyBizId()) .insuranceCompanyBizId(brokerDto.getInsuranceCompanyBizId())
.brokerRatio(dto.getBrokerRatio())
.source(2) .source(2)
.build()); .build());
...@@ -844,6 +845,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -844,6 +845,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
.productLaunchBizId(brokerDto.getPlanBizId()) .productLaunchBizId(brokerDto.getPlanBizId())
//保险公司业务id //保险公司业务id
.insuranceCompanyBizId(brokerDto.getInsuranceCompanyBizId()) .insuranceCompanyBizId(brokerDto.getInsuranceCompanyBizId())
.brokerRatio(dto.getBrokerRatio())
.source(1) .source(1)
.build()); .build());
...@@ -869,10 +871,10 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -869,10 +871,10 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
continue; continue;
} }
log.info("生成保单预计发佣表记录——>入参algorithmResDto:{}", JSON.toJSONString(algorithmResDto)); log.info("生成保单预计发佣表记录——>入参algorithmResDto:{}", JSON.toJSONString(algorithmResDto));
PolicyBroker policyBroker = policyBrokerService.queryOne(QueryPolicyBrokerDto.builder() // PolicyBroker policyBroker = policyBrokerService.queryOne(QueryPolicyBrokerDto.builder()
.policyNo(fortuneDto.getPolicyNo()) // .policyNo(fortuneDto.getPolicyNo())
.brokerBizId(fortuneDto.getBrokerBizId()) // .brokerBizId(fortuneDto.getBrokerBizId())
.build()); // .build());
ExpectedFortune fortune = new ExpectedFortune(); ExpectedFortune fortune = new ExpectedFortune();
//发佣金额 -> 计算值 - sqlAlgorithmResultDtoList集合里面的计算值和值 //发佣金额 -> 计算值 - sqlAlgorithmResultDtoList集合里面的计算值和值
// fortune.setAmount(algorithmResDto.getCalculatedValue()); // fortune.setAmount(algorithmResDto.getCalculatedValue());
...@@ -916,7 +918,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -916,7 +918,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
fortune.setStandardAmount(standardAmount); fortune.setStandardAmount(standardAmount);
// 转介人介绍费占比 // 转介人介绍费占比
String brokerRatioStr = !Objects.isNull(policyBroker) ? policyBroker.getBrokerRatio() : "100"; String brokerRatioStr = !Objects.isNull(fortuneDto.getBrokerRatio()) ? fortuneDto.getBrokerRatio() : "100";
fortune.setBrokerRatio(brokerRatioStr); fortune.setBrokerRatio(brokerRatioStr);
try { try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment