新单跟进同步预约信息11

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

@@ -22,6 +22,7 @@ import com.yd.csf.api.dto.PolicyFollowDTO;
 import com.yd.csf.api.listener.PolicyDataListener;
 import com.yd.csf.api.service.ApiExpectedFortuneService;
 import com.yd.csf.feign.request.expectedfortune.ApiGenerateExpectedFortuneRequest;
+import com.yd.csf.feign.response.expectedfortune.ApiGenerateExpectedFortuneResponse;
 import com.yd.csf.service.common.ErrorCode;
 import com.yd.csf.service.component.PolicyReportPdfService;
 import com.yd.csf.service.dto.*;
@@ -534,22 +535,13 @@ public class ApiPolicyFollowController {
         // 修改逻辑
         policyFollowService.changePolicyFollowStatus(changePolicyFollowStatusRequest, policyFollow);
 
-        // 修改为生效, 异步计算预计发佣
+        // 修改为生效时需要同步预计发佣
         if (PolicyFollowStatusEnum.EFFECTIVE.equals(currentStatusEnum)) {
             // 获取Token
             String token = request.getHeader("Authorization");
             log.info("修改跟进状态获取token：{}", token);
-
-            // 设置ThreadLocal Token
-            FeignTokenInterceptor.setThreadLocalToken(token);
-            // 保单号
-            String policyNo = policyFollow.getPolicyNo();
-
-            ApiGenerateExpectedFortuneRequest generateExpectedFortuneRequest = new ApiGenerateExpectedFortuneRequest();
-            generateExpectedFortuneRequest.setPolicyNo(policyNo);
-
-            log.info("生成预计发佣 generate ——> PolicyNo：{}", policyNo);
-            apiExpectedFortuneService.generate(generateExpectedFortuneRequest);
+            // 同步：根据保单生成预计出账记录
+            generateExpectedFortuneSync(token, policyFollow.getPolicyNo());
         }
         return Result.success(true);
     }
@@ -695,6 +687,26 @@ public class ApiPolicyFollowController {
     }
 
     /**
+     * 同步生成预计出账记录
+     *
+     * @param token 认证Token
+     * @param policyNo 保单号
+     */
+    private void generateExpectedFortuneSync(String token, String policyNo) {
+        // 设置ThreadLocal Token
+        FeignTokenInterceptor.setThreadLocalToken(token);
+
+        // 调用 ApiExpectedFortuneService 的 generateSyncWithLogAndRedis（同步版本，包含日志和Redis处理）
+        ApiGenerateExpectedFortuneRequest generateExpectedFortuneRequest = new ApiGenerateExpectedFortuneRequest();
+        generateExpectedFortuneRequest.setPolicyNo(policyNo);
+        log.info("生成预计发佣generateSyncWithLogAndRedis——>PolicyNo：{}", policyNo);
+        Result<ApiGenerateExpectedFortuneResponse> result = apiExpectedFortuneService.generateSyncWithLogAndRedis(generateExpectedFortuneRequest);
+        if (result != null && result.getCode() == 200) {
+            log.info("新单跟进-同步生成预计出账记录成功:保单号={}", policyNo);
+        }
+    }
+
+    /**
      * 查询产品计划信息
      *
      * @param policyBizId 新单跟进业务ID

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

@@ -529,6 +529,12 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
 
             // 根据保单生成预计入账记录
             generateExpectedCommission(policyFollow, policy);
+
+            // 更新FNA状态为 "签单完成"
+            fnaService.update(new UpdateWrapper<Fna>()
+                    .set("status", FnaStatusEnum.SIGNED_COMPLETED.getItemValue())
+                    .set("policy_no", policy.getPolicyNo())
+                    .eq("fna_biz_id", policyFollow.getFnaBizId()));
         }
 
         // 新增新单状态记录