新单跟进54

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

@@ -324,7 +324,7 @@ public class ApiPolicyFollowController {
         if (CollectionUtils.isEmpty(addToPolicyRequest.getPolicyNoList())) {
         if (CollectionUtils.isEmpty(addToPolicyRequest.getPolicyNoList())) {
             return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), "保单号列表不能为空");
             return Result.fail(ErrorCode.PARAMS_ERROR.getCode(), "保单号列表不能为空");
         }
         }
-        return Result.success(policyFollowService.addToPolicy(addToPolicyRequest));
+        return Result.success(policyFollowService.addToPolicy(addToPolicyRequest.getPolicyNoList()));
     }
     }
 
 
     /**
     /**

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

@@ -9,6 +9,7 @@ import com.yd.csf.service.model.PolicyFollow;
 import com.yd.csf.service.vo.PolicyFollowDetailVO;
 import com.yd.csf.service.vo.PolicyFollowDetailVO;
 import com.yd.csf.service.vo.PolicyFollowVO;
 import com.yd.csf.service.vo.PolicyFollowVO;
 
 
+import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
 /**
 /**
@@ -30,7 +31,7 @@ public interface PolicyFollowService extends IService<PolicyFollow> {
 
 
     Map<String, Object> addPolicyFollow(PolicyFollowAddRequest policyFollowAddRequest);
     Map<String, Object> addPolicyFollow(PolicyFollowAddRequest policyFollowAddRequest);
 
 
-    Boolean addToPolicy(AddToPolicyRequest addToPolicyRequest);
+    Boolean addToPolicy(List<String> policyNoList);
 
 
     Boolean changePolicyFollowStatus(ChangePolicyFollowStatusRequest changePolicyFollowStatusRequest);
     Boolean changePolicyFollowStatus(ChangePolicyFollowStatusRequest changePolicyFollowStatusRequest);
 
 

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

@@ -199,9 +199,11 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
     public Boolean addCommission(CommissionAddRequest commissionAddRequest) {
     public Boolean addCommission(CommissionAddRequest commissionAddRequest) {
         // 校验来佣所属保单是否存在
         // 校验来佣所属保单是否存在
         String policyNo = commissionAddRequest.getPolicyNo();
         String policyNo = commissionAddRequest.getPolicyNo();
-        Policy policy = policyService.getOne(new QueryWrapper<Policy>().eq("policy_no", policyNo));
-        if (policy == null) {
-            throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "该保单不存在");
+        boolean exists = policyService.exists(new QueryWrapper<Policy>().eq("policy_no", policyNo));
+        // 校验来佣所属保单跟进是否存在
+        boolean policyFollowExists = policyFollowService.exists(new QueryWrapper<PolicyFollow>().eq("policy_no", policyNo));
+        if (!exists && !policyFollowExists) {
+            throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "该保单号不存在，不能添加来佣");
         }
         }
 
 
         // 获取当前登录用户
         // 获取当前登录用户

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

@@ -9,6 +9,7 @@ import com.yd.auth.core.utils.SecurityUtil;
 import com.yd.common.enums.CommonEnum;
 import com.yd.common.enums.CommonEnum;
 import com.yd.common.enums.ResultCode;
 import com.yd.common.enums.ResultCode;
 import com.yd.common.exception.BusinessException;
 import com.yd.common.exception.BusinessException;
+import com.yd.common.result.Result;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.common.utils.RandomStringGenerator;
 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.*;
@@ -20,6 +21,7 @@ import com.yd.csf.service.utils.AsyncQueryUtil;
 import com.yd.csf.service.vo.PolicyFollowDetailVO;
 import com.yd.csf.service.vo.PolicyFollowDetailVO;
 import com.yd.csf.service.vo.PolicyFollowVO;
 import com.yd.csf.service.vo.PolicyFollowVO;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
@@ -250,12 +252,14 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
     }
     }
 
 
      @Override
      @Override
-    public Boolean addToPolicy(AddToPolicyRequest addToPolicyRequest) {
+     public Boolean addToPolicy(List<String> policyNoList) {
+         if (CollectionUtils.isEmpty(policyNoList)) {
+             throw new BusinessException(ErrorCode.PARAMS_ERROR.getCode(), "保单号列表不能为空");
+         }
          // 获取当前登录用户
          // 获取当前登录用户
          AuthUserDto currentLoginUser = SecurityUtil.getCurrentLoginUser();
          AuthUserDto currentLoginUser = SecurityUtil.getCurrentLoginUser();
          String loginUserId = currentLoginUser.getId().toString();
          String loginUserId = currentLoginUser.getId().toString();
 
 
-        List<String> policyNoList = addToPolicyRequest.getPolicyNoList();
          // 查询所有跟进记录
          // 查询所有跟进记录
          List<PolicyFollow> policyFollowList = list(new QueryWrapper<PolicyFollow>().in("policy_no", policyNoList));
          List<PolicyFollow> policyFollowList = list(new QueryWrapper<PolicyFollow>().in("policy_no", policyNoList));
          for (PolicyFollow policyFollow : policyFollowList) {
          for (PolicyFollow policyFollow : policyFollowList) {
@@ -334,6 +338,11 @@ public class PolicyFollowServiceImpl extends ServiceImpl<PolicyFollowMapper, Pol
         policyFollow.setUpdaterId(loginUserId);
         policyFollow.setUpdaterId(loginUserId);
         policyFollowService.updateById(policyFollow);
         policyFollowService.updateById(policyFollow);
 
 
+        // 如果是已完成状态，同步到保单库
+        if (PolicyFollowStatusEnum.FINISHED.equals(policyFollowStatusEnum)) {
+            addToPolicy(Collections.singletonList(policyFollow.getPolicyNo()));
+        }
+
         // 新增新单状态记录
         // 新增新单状态记录
         PolicyFollowRecord policyFollowRecord = new PolicyFollowRecord();
         PolicyFollowRecord policyFollowRecord = new PolicyFollowRecord();
         policyFollowRecord.setId(null);
         policyFollowRecord.setId(null);