新单跟进v2

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

@@ -689,7 +689,7 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
                 && !response.getApiAppointmentInfoDto().getUserSignDtoList().isEmpty()) {
                 && !response.getApiAppointmentInfoDto().getUserSignDtoList().isEmpty()) {
             ApiAppointmentUserSignDto firstSigner = response.getApiAppointmentInfoDto().getUserSignDtoList().get(0);
             ApiAppointmentUserSignDto firstSigner = response.getApiAppointmentInfoDto().getUserSignDtoList().get(0);
             follow.setSigner(firstSigner.getName());
             follow.setSigner(firstSigner.getName());
-            follow.setSignerBizId(firstSigner.getUserBizId());
+            follow.setSignerBizId(firstSigner.getAppointmentUserSignBizId());
             follow.setSignerRegNo(firstSigner.getPracticeCode());
             follow.setSignerRegNo(firstSigner.getPracticeCode());
         }
         }
 
 
@@ -741,10 +741,11 @@ public class ApiAppointmentServiceImpl implements ApiAppointmentService {
 
 
         policyFollowService.saveOrUpdate(follow);
         policyFollowService.saveOrUpdate(follow);
 
 
+        // 同步保存保单产品计划附加险
+        savePolicyAdditional(apiProductPlanAdditionalInfoDtoList, policyBizId);
+
 //        // 同步保存保单（产品计划）
 //        // 同步保存保单（产品计划）
 //        savePolicy(productPlan, apiPolicyholderInfoDto, apiInsurantInfoDto, apiProductPlanMainInfoDto, policyBizId, policyTransfer);
 //        savePolicy(productPlan, apiPolicyholderInfoDto, apiInsurantInfoDto, apiProductPlanMainInfoDto, policyBizId, policyTransfer);
-//        // 同步保存保单产品计划附加险
-//        savePolicyAdditional(apiProductPlanAdditionalInfoDtoList, policyBizId);
 //        // 同步保存保单投保人
 //        // 同步保存保单投保人
 //        savePolicyPolicyholder(apiPolicyholderInfoDto, policyBizId);
 //        savePolicyPolicyholder(apiPolicyholderInfoDto, policyBizId);
 //        // 同步保存保单受保人
 //        // 同步保存保单受保人

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

@@ -49,6 +49,11 @@ public class PolicyProductInfo {
     private String reconciliationCompanyBizId;
     private String reconciliationCompanyBizId;
 
 
     /**
     /**
+     * 对账公司编码
+     */
+    private String reconciliationCompanyCode;
+
+    /**
      * 产品计划类型
      * 产品计划类型
      */
      */
     private String productPlanType;
     private String productPlanType;

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

@@ -786,7 +786,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
             }
             }
             // 关联预计来佣信息
             // 关联预计来佣信息
             CommissionExpected expected = getCommissionExpectedBizIdBatch(request, policyNoSet, commission);
             CommissionExpected expected = getCommissionExpectedBizIdBatch(request, policyNoSet, commission);
-            if (expected != null) {
+            if (expected != null && "R".equals(expected.getCommissionBizType())) {
                 // 本次入账比例
                 // 本次入账比例
                 commission.setCurrentCommissionRatio(calculateCurrentCommissionRatio(
                 commission.setCurrentCommissionRatio(calculateCurrentCommissionRatio(
                         commission.getPremium(), commission.getAmount(), commission.getCurrency(), commission.getExchangeRate(), expected));
                         commission.getPremium(), commission.getAmount(), commission.getCurrency(), commission.getExchangeRate(), expected));

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

@@ -272,6 +272,13 @@ public class PolicyServiceImpl extends ServiceImpl<PolicyMapper, Policy>
                 case "对账公司":
                 case "对账公司":
                     productInfo.setReconciliationCompany(value);
                     productInfo.setReconciliationCompany(value);
                     productInfo.setReconciliationCompanyBizId(attribute.getStr("fieldValueBizId"));
                     productInfo.setReconciliationCompanyBizId(attribute.getStr("fieldValueBizId"));
+                    // 尝试获取对账公司编码（如果 API 响应中有 fieldValueCode 字段）
+                    String reconciliationCompanyCode = attribute.getStr("fieldValueCode");
+                    if (StringUtils.isBlank(reconciliationCompanyCode)) {
+                        // 如果没有 fieldValueCode，尝试从其他字段获取
+                        reconciliationCompanyCode = attribute.getStr("code");
+                    }
+                    productInfo.setReconciliationCompanyCode(reconciliationCompanyCode);
                     break;
                     break;
                 case "产品计划类型":
                 case "产品计划类型":
                     productInfo.setProductPlanType(value);
                     productInfo.setProductPlanType(value);