push

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

@@ -16,6 +16,11 @@ import java.util.List;
 public class GenerateExpectedFortuneDto {
 public class GenerateExpectedFortuneDto {
 
 
     /**
     /**
+     * 来源 1-销售
+     */
+    private Integer source;
+
+    /**
      * 保单发佣批次ID
      * 保单发佣批次ID
      */
      */
     private String batchBizId;
     private String batchBizId;

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

@@ -734,11 +734,11 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
         if (!CollectionUtils.isEmpty(fortuneDto.getAlgorithmResDtoList())) {
         if (!CollectionUtils.isEmpty(fortuneDto.getAlgorithmResDtoList())) {
             //获得积分业务员绑定的基本法列表对应计算值结果集合
             //获得积分业务员绑定的基本法列表对应计算值结果集合
             for (AlgorithmResDto algorithmResDto : fortuneDto.getAlgorithmResDtoList()) {
             for (AlgorithmResDto algorithmResDto : fortuneDto.getAlgorithmResDtoList()) {
-//                if (Objects.isNull(algorithmResDto.getCalculatedValue())
-//                        || algorithmResDto.getCalculatedValue().compareTo(BigDecimal.ZERO) == 0) {
-//                    //判空判0
-//                    continue;
-//                }
+                if (Objects.isNull(algorithmResDto.getCalculatedValue())
+                        || algorithmResDto.getCalculatedValue().compareTo(BigDecimal.ZERO) == 0) {
+                    //判空判0
+                    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())