push

yd-csf-api/src/main/java/com/yd/csf/api/service/ApiPremiumReconciliationService.java

@@ -32,7 +32,7 @@ public interface ApiPremiumReconciliationService {
     Result editResult(ApiPremiumReconciliationResultEditRequest request);
     Result editResult(ApiPremiumReconciliationResultEditRequest request);
 
 
     @Async("commonAsyncExecutor")
     @Async("commonAsyncExecutor")
-    void execute(ChangePolicyFollowStatusRequest changePolicyFollowStatusRequest);
+    void execute(ChangePolicyFollowStatusRequest changePolicyFollowStatusRequest,String token);
 
 
     Result<Boolean> checkReconciliationComplete(String policyNo);
     Result<Boolean> checkReconciliationComplete(String policyNo);
 
 

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

@@ -1084,6 +1084,11 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     public Result editResult(ApiPremiumReconciliationResultEditRequest request) {
     public Result editResult(ApiPremiumReconciliationResultEditRequest request) {
+        // 通过 RequestContextHolder 获取 HttpServletRequest
+        HttpServletRequest httpServletRequest = ((ServletRequestAttributes)
+                RequestContextHolder.currentRequestAttributes()).getRequest();
+        // 获取Token
+        String token = httpServletRequest.getHeader("Authorization");
         //校验保费对账记录信息是否存在
         //校验保费对账记录信息是否存在
         Result<PremiumReconciliation> result = checkPremiumReconciliationIsExist(request.getPremiumReconciliationBizId());
         Result<PremiumReconciliation> result = checkPremiumReconciliationIsExist(request.getPremiumReconciliationBizId());
         PremiumReconciliation premiumReconciliation = result.getData();
         PremiumReconciliation premiumReconciliation = result.getData();
@@ -1115,11 +1120,11 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
                 statusRequest.setStatus("TAKE_EFFECT");
                 statusRequest.setStatus("TAKE_EFFECT");
                 //遍历保单转介人列表信息 -> 调用基本法算出预计发佣列表
                 //遍历保单转介人列表信息 -> 调用基本法算出预计发佣列表
                 // 通过代理对象调用
                 // 通过代理对象调用
-//                getSelf().execute(statusRequest,token);
-                Result<Boolean> result1 = changePolicyFollowStatus(statusRequest);
-                if (result1.getCode() != 200) {
-                    throw new BusinessException(result1.getMsg());
-                }
+                getSelf().execute(statusRequest,token);
+//                Result<Boolean> result1 = changePolicyFollowStatus(statusRequest);
+//                if (result1.getCode() != 200) {
+//                    throw new BusinessException(result1.getMsg());
+//                }
             }else {
             }else {
                 //大于0，只更新新单跟进：新单状态——>保费对账成功，核保中
                 //大于0，只更新新单跟进：新单状态——>保费对账成功，核保中
                 PolicyFollow policyFollow = policyFollowService.queryOneByPolicyNo(premiumReconciliation.getPolicyNo());
                 PolicyFollow policyFollow = policyFollowService.queryOneByPolicyNo(premiumReconciliation.getPolicyNo());
@@ -1135,8 +1140,8 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
 
 
     @Override
     @Override
     @Async("commonAsyncExecutor")
     @Async("commonAsyncExecutor")
-    public void execute(ChangePolicyFollowStatusRequest changePolicyFollowStatusRequest) {
-        changePolicyFollowStatus(changePolicyFollowStatusRequest);
+    public void execute(ChangePolicyFollowStatusRequest changePolicyFollowStatusRequest,String token) {
+        changePolicyFollowStatus(changePolicyFollowStatusRequest,token);
     }
     }
 
 
     /**
     /**
@@ -1146,10 +1151,11 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
      * @return
      * @return
      */
      */
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    public Result<Boolean> changePolicyFollowStatus(ChangePolicyFollowStatusRequest changePolicyFollowStatusRequest) {
-        // 通过 RequestContextHolder 获取 HttpServletRequest
-        HttpServletRequest httpServletRequest = ((ServletRequestAttributes)
-                RequestContextHolder.currentRequestAttributes()).getRequest();
+    public Result<Boolean> changePolicyFollowStatus(ChangePolicyFollowStatusRequest changePolicyFollowStatusRequest,String token) {
+
+        // 设置ThreadLocal Token
+        FeignTokenInterceptor.setThreadLocalToken(token);
+
         if (changePolicyFollowStatusRequest == null || StringUtils.isBlank(changePolicyFollowStatusRequest.getPolicyBizId())) {
         if (changePolicyFollowStatusRequest == null || StringUtils.isBlank(changePolicyFollowStatusRequest.getPolicyBizId())) {
             return Result.fail(ResultCode.PARAMS_ERROR.getCode(), "policyBizId不能为空");
             return Result.fail(ResultCode.PARAMS_ERROR.getCode(), "policyBizId不能为空");
         }
         }
@@ -1190,8 +1196,6 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
 
 
         // 修改为生效时需要同步预计发佣
         // 修改为生效时需要同步预计发佣
         if (PolicyFollowStatusEnum.EFFECTIVE.equals(currentStatusEnum)) {
         if (PolicyFollowStatusEnum.EFFECTIVE.equals(currentStatusEnum)) {
-            // 获取Token
-            String token = httpServletRequest.getHeader("Authorization");
             log.info("修改跟进状态获取token：{}", token);
             log.info("修改跟进状态获取token：{}", token);
             // 同步：根据保单生成预计出账记录
             // 同步：根据保单生成预计出账记录
             generateExpectedFortuneSync(token, policyFollow.getPolicyNo());
             generateExpectedFortuneSync(token, policyFollow.getPolicyNo());
@@ -1206,9 +1210,6 @@ public class ApiPremiumReconciliationServiceImpl implements ApiPremiumReconcilia
      * @param policyNo 保单号
      * @param policyNo 保单号
      */
      */
     private void generateExpectedFortuneSync(String token, String policyNo) {
     private void generateExpectedFortuneSync(String token, String policyNo) {
-        // 设置ThreadLocal Token
-        FeignTokenInterceptor.setThreadLocalToken(token);
-
         // 调用 ApiExpectedFortuneService 的 generateSyncWithLogAndRedis（同步版本，包含日志和Redis处理）
         // 调用 ApiExpectedFortuneService 的 generateSyncWithLogAndRedis（同步版本，包含日志和Redis处理）
         ApiGenerateExpectedFortuneRequest generateExpectedFortuneRequest = new ApiGenerateExpectedFortuneRequest();
         ApiGenerateExpectedFortuneRequest generateExpectedFortuneRequest = new ApiGenerateExpectedFortuneRequest();
         generateExpectedFortuneRequest.setPolicyNo(policyNo);
         generateExpectedFortuneRequest.setPolicyNo(policyNo);