新单跟进同步预约信息7

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

@@ -150,7 +150,7 @@ public class PolicyFollowDto implements Serializable {
     private String insuranceCompanyBizId;
     private String insuranceCompanyBizId;
 
 
     @Schema(description = "对账公司")
     @Schema(description = "对账公司")
-    private String reconciliationCompany;
+    private String reconciliationCompanyName;
 
 
     @Schema(description = "对账公司编码")
     @Schema(description = "对账公司编码")
     private String reconciliationCode;
     private String reconciliationCode;

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

@@ -204,6 +204,9 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
         if (StringUtils.isNotBlank(policyFollowDto.getReconciliationCode())) {
         if (StringUtils.isNotBlank(policyFollowDto.getReconciliationCode())) {
             policyFollow.setReconciliationCompanyCode(policyFollowDto.getReconciliationCode());
             policyFollow.setReconciliationCompanyCode(policyFollowDto.getReconciliationCode());
         }
         }
+        if (StringUtils.isNotBlank(policyFollowDto.getReconciliationCompanyName())) {
+            policyFollow.setReconciliationCompany(policyFollowDto.getReconciliationCompanyName());
+        }
 
 
         // 检查保单号是否从空变为有值
         // 检查保单号是否从空变为有值
         String oldPolicyNo = policyFollow.getPolicyNo();
         String oldPolicyNo = policyFollow.getPolicyNo();
@@ -500,24 +503,33 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
             policy.setEffectiveDate(changePolicyFollowStatusRequest.getEffectiveDate());
             policy.setEffectiveDate(changePolicyFollowStatusRequest.getEffectiveDate());
             policy.setPolicyHolderAge(calculatePolicyHolderAge(policyFollow.getCustomerBizId()));
             policy.setPolicyHolderAge(calculatePolicyHolderAge(policyFollow.getCustomerBizId()));
 
 
-            if (ObjectUtils.isEmpty(policy.getInsuranceCompany()) || ObjectUtils.isEmpty(policy.getReconciliationCompanyBizId())) {
+            if (ObjectUtils.isEmpty(policy.getInsuranceCompany()) || ObjectUtils.isEmpty(policy.getInsuranceCompany())) {
                 // 获取保单产品信息，填充对账公司相关字段
                 // 获取保单产品信息，填充对账公司相关字段
                 PolicyProductInfo productInfo = getPolicyProductInfo(policyFollow.getProductLaunchBizId());
                 PolicyProductInfo productInfo = getPolicyProductInfo(policyFollow.getProductLaunchBizId());
                 if (productInfo != null) {
                 if (productInfo != null) {
                     policy.setInsuranceCompany(productInfo.getInsuranceCompany());
                     policy.setInsuranceCompany(productInfo.getInsuranceCompany());
                     policy.setInsuranceCompanyBizId(productInfo.getInsuranceCompanyBizId());
                     policy.setInsuranceCompanyBizId(productInfo.getInsuranceCompanyBizId());
-                    policy.setReconciliationCompany(productInfo.getReconciliationCompany());
-                    policy.setReconciliationCompanyBizId(productInfo.getReconciliationCompanyBizId());
+                    if (ObjectUtils.isEmpty(policy.getReconciliationCompany())) {
+                        policy.setReconciliationCompany(productInfo.getReconciliationCompany());
+                    }
+                    if (ObjectUtils.isEmpty(policy.getReconciliationCompanyBizId())) {
+                        policy.setReconciliationCompanyBizId(productInfo.getReconciliationCompanyBizId());
+                    }
+                }
+            }
+            if (ObjectUtils.isEmpty(policy.getReconciliationCompanyCode())) {
+                if (ObjectUtils.isEmpty(policy.getReconciliationCompanyBizId())) {
+                    throw new BusinessException("对账公司业务ID不能为空");
+                }
 
 
-                    // 调用对账公司 feignclient，查询对账公司编码
-                    String reconciliationCompanyCode = queryReconciliationCompanyByFeign(policy.getReconciliationCompanyBizId());
+                // 调用对账公司 feignclient，查询对账公司编码
+                String reconciliationCompanyCode = queryReconciliationCompanyByFeign(policy.getReconciliationCompanyBizId());
 
 
-                    // 如果仍然没有获取到编码，抛异常
-                    if (StringUtils.isBlank(reconciliationCompanyCode)) {
-                        throw new BusinessException("未能从对账公司服务获取编码，请补充，当前对账公司：" + productInfo.getReconciliationCompany());
-                    }
-                    policy.setReconciliationCompanyCode(reconciliationCompanyCode);
+                // 如果仍然没有获取到编码，抛异常
+                if (StringUtils.isBlank(reconciliationCompanyCode)) {
+                    throw new BusinessException("未能从对账公司服务获取编码，请补充，当前对账公司：" + policy.getReconciliationCompany());
                 }
                 }
+                policy.setReconciliationCompanyCode(reconciliationCompanyCode);
             }
             }
             // 保存保单
             // 保存保单
             try {
             try {