Skip to content

Y
yd-csf
Commit 7d75cbf2 by zhangxingmin
Options

push

parent 1b8c206a
Showing with 28 additions and 5 deletions
yd-csf-api/src/main/java/com/yd/csf/api/dto/ExecuteBillingDto.java
...@@ -11,6 +11,8 @@ import lombok.Builder; ...@@ -11,6 +11,8 @@ import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import java.math.BigDecimal;
@Data @Data
@Builder @Builder
@NoArgsConstructor @NoArgsConstructor
...@@ -43,6 +45,11 @@ public class ExecuteBillingDto { ...@@ -43,6 +45,11 @@ public class ExecuteBillingDto {
private Integer paymentTerm; private Integer paymentTerm;
/** /**
* 介绍费占比
*/
private String brokerRatio;
/**
* 保单和转介人信息 * 保单和转介人信息
*/ */
private QueryPolicyAndBrokerDto policyAndBrokerDto; private QueryPolicyAndBrokerDto policyAndBrokerDto;
......
yd-csf-api/src/main/java/com/yd/csf/api/dto/GenerateExpectedFortuneDto.java
...@@ -116,6 +116,11 @@ public class GenerateExpectedFortuneDto { ...@@ -116,6 +116,11 @@ public class GenerateExpectedFortuneDto {
private BigDecimal paymentPremium; private BigDecimal paymentPremium;
/** /**
* 介绍费占比
*/
private String brokerRatio;
/**
* 获得积分业务员绑定的基本法列表对应计算值 * 获得积分业务员绑定的基本法列表对应计算值
*/ */
private List<AlgorithmResDto> algorithmResDtoList; private List<AlgorithmResDto> algorithmResDtoList;
......
yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiExpectedFortuneServiceImpl.java
...@@ -539,6 +539,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -539,6 +539,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
.policyAndBrokerDto(brokerDto) .policyAndBrokerDto(brokerDto)
.issueNumber(i) .issueNumber(i)
.paymentTerm(paymentTerm) .paymentTerm(paymentTerm)
.brokerRatio(brokerDto.getBrokerRatio())
.build()); .build());
if (!CollectionUtils.isEmpty(commissionRuleBindingList)) { if (!CollectionUtils.isEmpty(commissionRuleBindingList)) {
...@@ -549,6 +550,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -549,6 +550,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
.policyAndBrokerDto(brokerDto) .policyAndBrokerDto(brokerDto)
.issueNumber(i) .issueNumber(i)
.paymentTerm(paymentTerm) .paymentTerm(paymentTerm)
.brokerRatio(brokerDto.getBrokerRatio())
.build()); .build());
} }
} }
...@@ -702,6 +704,8 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -702,6 +704,8 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
//保险公司业务id //保险公司业务id
.insuranceCompanyBizId(brokerDto.getInsuranceCompanyBizId()) .insuranceCompanyBizId(brokerDto.getInsuranceCompanyBizId())
.source(2) .source(2)
//转介人的介绍费占比
.brokerRatio(dto.getBrokerRatio())
.build()); .build());
return Result.success(); return Result.success();
...@@ -778,6 +782,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -778,6 +782,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
//保险公司业务id //保险公司业务id
.insuranceCompanyBizId(brokerDto.getInsuranceCompanyBizId()) .insuranceCompanyBizId(brokerDto.getInsuranceCompanyBizId())
.source(1) .source(1)
.brokerRatio(dto.getBrokerRatio())
.build()); .build());
return Result.success(); return Result.success();
...@@ -802,10 +807,10 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -802,10 +807,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());
...@@ -848,7 +853,8 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService ...@@ -848,7 +853,8 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
fortune.setStandardAmount(standardAmount); fortune.setStandardAmount(standardAmount);
// 转介人介绍费占比 // 转介人介绍费占比
String brokerRatioStr = !Objects.isNull(policyBroker) ? policyBroker.getBrokerRatio() : "100"; // String brokerRatioStr = !Objects.isNull(policyBroker) ? policyBroker.getBrokerRatio() : "100";
String brokerRatioStr = fortuneDto.getBrokerRatio();
fortune.setBrokerRatio(brokerRatioStr); fortune.setBrokerRatio(brokerRatioStr);
try { try {
......
yd-csf-service/src/main/java/com/yd/csf/service/dto/QueryPolicyAndBrokerDto.java
...@@ -86,5 +86,10 @@ public class QueryPolicyAndBrokerDto { ...@@ -86,5 +86,10 @@ public class QueryPolicyAndBrokerDto {
* 所属团队业务id * 所属团队业务id
*/ */
private String teamBizId; private String teamBizId;
/**
* 介绍费占比
*/
private String brokerRatio;
//======保单转介人信息end======= //======保单转介人信息end=======
} }
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