Merge branch 'refs/heads/test' into prod

yd-csf-api/src/main/java/com/yd/csf/api/controller/ApiPolicyFollowController.java

@@ -504,6 +504,9 @@ public class ApiPolicyFollowController {
         if (policyFollow == null) {
         if (policyFollow == null) {
             return Result.fail(ResultCode.NULL_ERROR.getCode(), ResultCode.NULL_ERROR.getMessage());
             return Result.fail(ResultCode.NULL_ERROR.getCode(), ResultCode.NULL_ERROR.getMessage());
         }
         }
+        if (ObjectUtils.isEmpty(policyFollow.getReconciliationCompanyCode())) {
+            return Result.fail(ResultCode.NULL_ERROR.getCode(), "新单跟进记录中，reconciliationCompanyCode不能为空");
+        }
 
 
         PolicyFollowStatusEnum currentStatusEnum = PolicyFollowStatusEnum.getEnumByValue(changePolicyFollowStatusRequest.getStatus());
         PolicyFollowStatusEnum currentStatusEnum = PolicyFollowStatusEnum.getEnumByValue(changePolicyFollowStatusRequest.getStatus());
         // 修改为生效时需要校验、同步预计发佣
         // 修改为生效时需要校验、同步预计发佣

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

@@ -517,20 +517,7 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
                     }
                     }
                 }
                 }
             }
             }
-            if (ObjectUtils.isEmpty(policy.getReconciliationCompanyCode())) {
-                if (ObjectUtils.isEmpty(policy.getReconciliationCompanyBizId())) {
-                    throw new BusinessException("对账公司业务ID不能为空");
-                }
-
-                // 调用对账公司 feignclient，查询对账公司编码
-                String reconciliationCompanyCode = queryReconciliationCompanyByFeign(policy.getReconciliationCompanyBizId());
 
 
-                // 如果仍然没有获取到编码，抛异常
-                if (StringUtils.isBlank(reconciliationCompanyCode)) {
-                    throw new BusinessException("未能从对账公司服务获取编码，请补充，当前对账公司：" + policy.getReconciliationCompany());
-                }
-                policy.setReconciliationCompanyCode(reconciliationCompanyCode);
-            }
             // 保存保单
             // 保存保单
             try {
             try {
                 policyService.save(policy);
                 policyService.save(policy);