新单跟进66

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

@@ -17,7 +17,6 @@ import com.yd.csf.api.dto.PolicyExcelDTO;
 import com.yd.csf.api.dto.PolicyFollowDTO;
 import com.yd.csf.api.dto.PolicyFollowDTO;
 import com.yd.csf.api.listener.PolicyDataListener;
 import com.yd.csf.api.listener.PolicyDataListener;
 import com.yd.csf.api.service.ApiExpectedFortuneService;
 import com.yd.csf.api.service.ApiExpectedFortuneService;
-import com.yd.csf.feign.request.expectedfortune.ApiGenerateExpectedFortuneRequest;
 import com.yd.csf.service.common.ErrorCode;
 import com.yd.csf.service.common.ErrorCode;
 import com.yd.csf.service.dto.*;
 import com.yd.csf.service.dto.*;
 import com.yd.csf.service.enums.PolicyFollowStatusEnum;
 import com.yd.csf.service.enums.PolicyFollowStatusEnum;
@@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.text.DecimalFormat;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.ParseException;
 import java.util.*;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 /**
 /**
@@ -80,10 +78,6 @@ public class ApiPolicyFollowController {
     private PolicyFollowRecordService policyFollowRecordService;
     private PolicyFollowRecordService policyFollowRecordService;
     @Resource
     @Resource
     private PolicyFollowFileService policyFollowFileService;
     private PolicyFollowFileService policyFollowFileService;
-    @Autowired
-    private ApiExpectedFortuneService apiExpectedFortuneService;
-    @Resource
-    private AsyncQueryUtil asyncQueryUtil;
 
 
 
 
     @PostMapping("/upload/excel")
     @PostMapping("/upload/excel")
@@ -528,40 +522,7 @@ public class ApiPolicyFollowController {
         if (policyFollow == null) {
         if (policyFollow == null) {
             return Result.fail(ErrorCode.NOT_FOUND_ERROR.getCode(), ErrorCode.NOT_FOUND_ERROR.getMessage());
             return Result.fail(ErrorCode.NOT_FOUND_ERROR.getCode(), ErrorCode.NOT_FOUND_ERROR.getMessage());
         }
         }
-        Boolean result = policyFollowService.changePolicyFollowStatus(changePolicyFollowStatusRequest, policyFollow);
-
-        // 如果是已完成状态，计算预计发佣
-        PolicyFollowStatusEnum policyFollowStatusEnum = PolicyFollowStatusEnum.getEnumByValue(changePolicyFollowStatusRequest.getStatus());
-        if (PolicyFollowStatusEnum.FINISHED.equals(policyFollowStatusEnum)) {
-            ApiGenerateExpectedFortuneRequest apiGenerateExpectedFortuneRequest = new ApiGenerateExpectedFortuneRequest();
-            apiGenerateExpectedFortuneRequest.setPolicyNo(policyFollow.getPolicyNo());
-
-//            CompletableFuture.runAsync(() -> {
-//                long startTime = System.currentTimeMillis();
-//                String taskName = "新单跟进生成预计发佣: " + policyBizId;
-//                try {
-//                    log.info("异步任务: {}", taskName);
-//                    apiExpectedFortuneService.generate(apiGenerateExpectedFortuneRequest);
-//                    long costTime = System.currentTimeMillis() - startTime;
-//                    log.info("异步任务完成: {}, 耗时: {}ms", taskName, costTime);
-//
-//                } catch (Exception e) {
-//                    log.error("异步任务失败: {}, 错误: {}", taskName, e.getMessage(), e);
-//                }
-//            });
-
-            long startTime = System.currentTimeMillis();
-            String taskName = "新单跟进生成预计发佣: " + policyBizId;
-            log.info("任务: {}", taskName);
-            try {
-                apiExpectedFortuneService.generate(apiGenerateExpectedFortuneRequest);
-                long costTime = System.currentTimeMillis() - startTime;
-                log.info("任务完成: {}, 耗时: {}ms", taskName, costTime);
-            } catch (Exception e) {
-                log.error("任务失败: {}, 错误: {}", taskName, e.getMessage(), e);
-            }
-        }
-        return Result.success(result);
+        return Result.success(policyFollowService.changePolicyFollowStatus(changePolicyFollowStatusRequest, policyFollow));
     }
     }
 
 
     /**
     /**