新单跟进63

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

@@ -35,12 +35,6 @@ public class PolicyFollowAggregateDto implements Serializable {
     @Schema(description = "问卷业务ID 新单跟进问卷中，objectBizId为policyBizId")
     private String questionnaireBizId;
 
-     /**
-     * 预计发佣列表
-     */
-    @Schema(description = "预计发佣列表")
-    private List<ExpectedFortune> expectedFortuneList;
-
     /**
      * 保单产品计划（保单）
      */
@@ -83,15 +77,13 @@ public class PolicyFollowAggregateDto implements Serializable {
                                                         PolicyInsurant policyInsurant,
                                                         List<PolicyBeneficiary> beneficiaryList,
                                                         PolicySecondHolder policySecondHolder,
-                                                        String customerBizId,
-                                                        List<ExpectedFortune> expectedFortuneList) {
+                                                        String customerBizId) {
         PolicyFollowAggregateDto dto = new PolicyFollowAggregateDto();
         if (ObjectUtils.isEmpty(policy)) {
             return dto;
         }
         dto.setPolicyBizId(policy.getPolicyBizId());
         dto.setCustomerBizId(customerBizId);
-        dto.setExpectedFortuneList(expectedFortuneList);
 
         // 设置保单产品计划（保单）
         if (ObjectUtils.isNotEmpty(policy)) {

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FnaFormServiceImpl.java

@@ -198,9 +198,9 @@ public class FnaFormServiceImpl extends ServiceImpl<FnaFormMapper, FnaForm> impl
             if (StringUtils.isBlank(personalData.getCustomerName())) {
                 throw new BusinessException(ResultCode.PARAM_CHECK_ERROR.getCode(), "客户姓名不能为空");
             }
-            if (StringUtils.isBlank(personalData.getTaxCountry())) {
-                throw new BusinessException(ResultCode.PARAM_CHECK_ERROR.getCode(), "税务国家不能为空");
-            }
+//            if (StringUtils.isBlank(personalData.getTaxCountry())) {
+//                throw new BusinessException(ResultCode.PARAM_CHECK_ERROR.getCode(), "税务国家不能为空");
+//            }
             if (StringUtils.isBlank(personalData.getEmployment())) {
                 throw new BusinessException(ResultCode.PARAM_CHECK_ERROR.getCode(), "就业情况不能为空");
             }

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/PolicyFollowServiceImpl.java

@@ -446,11 +446,6 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
                     },
                     "查询客户业务ID"
             );
-            // 1.7 异步查询预计发佣
-            CompletableFuture<List<ExpectedFortune>> expectedFortuneFuture = asyncQueryUtil.asyncQuery(
-                    () -> expectedFortuneService.listByPolicyBizId(policyBizId),
-                    "查询预计发佣"
-            );
 
             // 2. 等待所有异步任务完成（设置超时时间）
             CompletableFuture.allOf(
@@ -460,8 +455,7 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
                             insurantListFuture,
                             beneficiaryListFuture,
                             policySecondHolderFuture,
-                            customerBizIdFuture,
-                            expectedFortuneFuture)
+                            customerBizIdFuture)
                     .get(5, TimeUnit.SECONDS); // 5秒超时
 
             // 3. 构建聚合结果
@@ -472,8 +466,7 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
                     insurantListFuture.get(),
                     beneficiaryListFuture.get(),
                     policySecondHolderFuture.get(),
-                    customerBizIdFuture.get(),
-                    expectedFortuneFuture.get()
+                    customerBizIdFuture.get()
             );
 
             long costTime = System.currentTimeMillis() - startTime;