push

yd-csf-api/src/main/java/com/yd/csf/api/dto/ExecuteBillingDto.java

@@ -11,6 +11,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
+
 @Data
 @Builder
 @NoArgsConstructor
@@ -43,6 +45,11 @@ public class ExecuteBillingDto {
     private Integer paymentTerm;
 
     /**
+     * 介绍费占比
+     */
+    private String brokerRatio;
+
+    /**
      * 保单和转介人信息
      */
     private QueryPolicyAndBrokerDto policyAndBrokerDto;

yd-csf-api/src/main/java/com/yd/csf/api/dto/GenerateExpectedFortuneDto.java

@@ -116,6 +116,11 @@ public class GenerateExpectedFortuneDto {
     private BigDecimal paymentPremium;
 
     /**
+     * 介绍费占比
+     */
+    private String brokerRatio;
+
+    /**
      * 获得积分业务员绑定的基本法列表对应计算值
      */
     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
                                 .policyAndBrokerDto(brokerDto)
                                 .issueNumber(i)
                                 .paymentTerm(paymentTerm)
+                                .brokerRatio(brokerDto.getBrokerRatio())
                                 .build());
 
                         if (!CollectionUtils.isEmpty(commissionRuleBindingList)) {
@@ -549,6 +550,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
                                         .policyAndBrokerDto(brokerDto)
                                         .issueNumber(i)
                                         .paymentTerm(paymentTerm)
+                                        .brokerRatio(brokerDto.getBrokerRatio())
                                         .build());
                             }
                         }
@@ -702,6 +704,8 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
                 //保险公司业务id
                 .insuranceCompanyBizId(brokerDto.getInsuranceCompanyBizId())
                 .source(2)
+                //转介人的介绍费占比
+                .brokerRatio(dto.getBrokerRatio())
                 .build());
 
         return Result.success();
@@ -778,6 +782,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
                 //保险公司业务id
                 .insuranceCompanyBizId(brokerDto.getInsuranceCompanyBizId())
                 .source(1)
+                .brokerRatio(dto.getBrokerRatio())
                 .build());
 
         return Result.success();
@@ -802,10 +807,10 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
                     continue;
                 }
                 log.info("生成保单预计发佣表记录——>入参algorithmResDto：{}", JSON.toJSONString(algorithmResDto));
-                PolicyBroker policyBroker = policyBrokerService.queryOne(QueryPolicyBrokerDto.builder()
-                        .policyNo(fortuneDto.getPolicyNo())
-                        .brokerBizId(fortuneDto.getBrokerBizId())
-                        .build());
+//                PolicyBroker policyBroker = policyBrokerService.queryOne(QueryPolicyBrokerDto.builder()
+//                        .policyNo(fortuneDto.getPolicyNo())
+//                        .brokerBizId(fortuneDto.getBrokerBizId())
+//                        .build());
                 ExpectedFortune fortune = new ExpectedFortune();
                 //发佣金额 -> 计算值 - sqlAlgorithmResultDtoList集合里面的计算值和值
 //                fortune.setAmount(algorithmResDto.getCalculatedValue());
@@ -848,7 +853,8 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
                 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);
 
                 try {

yd-csf-service/src/main/java/com/yd/csf/service/dto/QueryPolicyAndBrokerDto.java

@@ -86,5 +86,10 @@ public class QueryPolicyAndBrokerDto {
      * 所属团队业务id
      */
     private String teamBizId;
+
+    /**
+     * 介绍费占比
+     */
+    private String brokerRatio;
     //======保单转介人信息end=======
 }