新单跟进v2

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

@@ -13,7 +13,9 @@ import com.yd.csf.api.dto.ReceivableReportResponse;
 import com.yd.csf.service.common.ErrorCode;
 import com.yd.csf.service.dto.*;
 import com.yd.csf.service.model.CommissionExpected;
+import com.yd.csf.service.model.Policy;
 import com.yd.csf.service.service.CommissionExpectedService;
+import com.yd.csf.service.service.PolicyService;
 import com.yd.csf.service.vo.CommissionExpectedExportDTO;
 import com.yd.csf.service.vo.CommissionExpectedStatisticsVO;
 import com.yd.csf.service.vo.CommissionExpectedVO;
@@ -45,6 +47,8 @@ public class ApiCommissionExpectedController {
 
     @Resource
     private CommissionExpectedService commissionExpectedService;
+    @Resource
+    private PolicyService policyService;
 
     /**
      * 批量新增预计入账
@@ -225,8 +229,12 @@ public class ApiCommissionExpectedController {
         if (request == null) {
             return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), ErrorCode.PARAMS_ERROR.getMessage());
         }
+        Policy policy = policyService.lambdaQuery().eq(Policy::getPolicyNo, request.getPolicyNo()).one();
+        if (policy == null) {
+            return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), "保单不存在");
+        }
         commissionExpectedService.getExpectedCommissionByProductlaunchId(
-                request.getPolicyNo(),
+                policy,
                 request.getProductLaunchBizId(),
                 request.getInsuranceCompanyBizId(),
                 request.getReconciliationCompany(),

yd-csf-service/src/main/java/com/yd/csf/service/model/CommissionExpected.java

@@ -9,9 +9,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
-import com.yd.csf.service.vo.FnaVO;
 import lombok.Data;
-import org.springframework.beans.BeanUtils;
 
 /**
  * 预计来佣表

yd-csf-service/src/main/java/com/yd/csf/service/service/CommissionExpectedService.java

@@ -8,6 +8,7 @@ import com.yd.csf.service.dto.CommissionExpectedQueryRequest;
 import com.yd.csf.service.dto.CommissionExpectedUpdateRequest;
 import com.yd.csf.service.model.CommissionExpected;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yd.csf.service.model.Policy;
 import com.yd.csf.service.vo.CommissionExpectedStatisticsVO;
 import com.yd.csf.service.vo.CommissionExpectedVO;
 import com.yd.csf.service.vo.ReceivableReportVO;
@@ -59,7 +60,7 @@ public interface CommissionExpectedService extends IService<CommissionExpected>
 
     CommissionExpected getByBizId(String commissionExpectedBizId);
 
-    void getExpectedCommissionByProductlaunchId(String policyNo, String productLaunchBizId, String insuranceCompanyBizId, String reconciliationCompany, String reconciliationCompanyCode, String reconciliationCompanyBizId);
+    void getExpectedCommissionByProductlaunchId(Policy policy, String productLaunchBizId, String insuranceCompanyBizId, String reconciliationCompany, String reconciliationCompanyCode, String reconciliationCompanyBizId);
 
     /**
      * 应收款报表 - 按保单号和期数维度统计（分页）

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

@@ -827,7 +827,7 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
 
         // 调用预计入账服务生成记录
         commissionExpectedService.getExpectedCommissionByProductlaunchId(
-                policyNo,
+                policy,
                 productLaunchBizId,
                 insuranceCompanyBizId,
                 reconciliationCompany,