push

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

@@ -16,7 +16,7 @@ import java.util.List;
 public class GenerateExpectedFortuneDto {
 public class GenerateExpectedFortuneDto {
 
 
     /**
     /**
-     * 来源 1-销售
+     * 来源 1-销售佣金 2-非销售佣金
      */
      */
     private Integer source;
     private Integer source;
 
 

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

@@ -643,6 +643,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
                 .productLaunchBizId(brokerDto.getPlanBizId())
                 .productLaunchBizId(brokerDto.getPlanBizId())
                 //保险公司业务id
                 //保险公司业务id
                 .insuranceCompanyBizId(brokerDto.getInsuranceCompanyBizId())
                 .insuranceCompanyBizId(brokerDto.getInsuranceCompanyBizId())
+                .source(2)
                 .build());
                 .build());
 
 
         return Result.success();
         return Result.success();
@@ -717,6 +718,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
                 .productLaunchBizId(brokerDto.getPlanBizId())
                 .productLaunchBizId(brokerDto.getPlanBizId())
                 //保险公司业务id
                 //保险公司业务id
                 .insuranceCompanyBizId(brokerDto.getInsuranceCompanyBizId())
                 .insuranceCompanyBizId(brokerDto.getInsuranceCompanyBizId())
+                .source(1)
                 .build());
                 .build());
 
 
         return Result.success();
         return Result.success();
@@ -734,8 +736,9 @@ 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) {
+                if (fortuneDto.getSource() == 2 && (Objects.isNull(algorithmResDto.getCalculatedValue())
+                        || algorithmResDto.getCalculatedValue().compareTo(BigDecimal.ZERO) == 0)) {
+                    //2-非销售佣金并且计算金额为0，走这里
                     //判空判0
                     //判空判0
                     continue;
                     continue;
                 }
                 }