push

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

@@ -38,6 +38,11 @@ public class ExecuteBillingDto {
     private Integer issueNumber;
     private Integer issueNumber;
 
 
     /**
     /**
+     * 出账总期数（实际出账期数）
+     */
+    private Integer paymentTerm;
+
+    /**
      * 保单和转介人信息
      * 保单和转介人信息
      */
      */
     private QueryPolicyAndBrokerDto policyAndBrokerDto;
     private QueryPolicyAndBrokerDto policyAndBrokerDto;

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiExpectedFortuneServiceImpl.java

@@ -533,6 +533,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
                                 .name(brokerDto.getBrokerName())
                                 .name(brokerDto.getBrokerName())
                                 .policyAndBrokerDto(brokerDto)
                                 .policyAndBrokerDto(brokerDto)
                                 .issueNumber(i)
                                 .issueNumber(i)
+                                .paymentTerm(paymentTerm)
                                 .build());
                                 .build());
 
 
                         if (!CollectionUtils.isEmpty(commissionRuleBindingList)) {
                         if (!CollectionUtils.isEmpty(commissionRuleBindingList)) {
@@ -542,6 +543,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
                                         .name(binding.getTargetName())
                                         .name(binding.getTargetName())
                                         .policyAndBrokerDto(brokerDto)
                                         .policyAndBrokerDto(brokerDto)
                                         .issueNumber(i)
                                         .issueNumber(i)
+                                        .paymentTerm(paymentTerm)
                                         .build());
                                         .build());
                             }
                             }
                         }
                         }
@@ -674,7 +676,8 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
                 //发佣期数
                 //发佣期数
                 .fortunePeriod(dto.getIssueNumber())
                 .fortunePeriod(dto.getIssueNumber())
                 //发佣总期数
                 //发佣总期数
-                .fortuneTotalPeriod(brokerDto.getPaymentTerm())
+//                .fortuneTotalPeriod(brokerDto.getPaymentTerm())
+                .fortuneTotalPeriod(dto.getPaymentTerm())
                 //发佣类型 TODO
                 //发佣类型 TODO
 //                .fortuneType()
 //                .fortuneType()
                 //发佣日期 保单生效日期 + 3个月
                 //发佣日期 保单生效日期 + 3个月
@@ -749,7 +752,8 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
                 //发佣期数
                 //发佣期数
                 .fortunePeriod(dto.getIssueNumber())
                 .fortunePeriod(dto.getIssueNumber())
                 //发佣总期数
                 //发佣总期数
-                .fortuneTotalPeriod(brokerDto.getPaymentTerm())
+//                .fortuneTotalPeriod(brokerDto.getPaymentTerm())
+                .fortuneTotalPeriod(dto.getPaymentTerm())
                 //发佣类型 TODO
                 //发佣类型 TODO
 //                .fortuneType()
 //                .fortuneType()
                 //发佣日期
                 //发佣日期