来佣接口29

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

@@ -14,13 +14,9 @@ import com.yd.csf.service.dto.*;
 import com.yd.csf.service.enums.CommissionStatusEnum;
 import com.yd.csf.service.enums.CommissionStatusEnum;
 import com.yd.csf.service.enums.FortuneStatusEnum;
 import com.yd.csf.service.enums.FortuneStatusEnum;
 import com.yd.csf.service.model.*;
 import com.yd.csf.service.model.*;
-import com.yd.csf.service.service.CommissionService;
+import com.yd.csf.service.service.*;
 import com.yd.csf.service.dao.CommissionMapper;
 import com.yd.csf.service.dao.CommissionMapper;
-import com.yd.csf.service.service.FortuneService;
-import com.yd.csf.service.service.PolicyBrokerService;
-import com.yd.csf.service.service.PolicyService;
 import com.yd.csf.service.vo.CommissionVO;
 import com.yd.csf.service.vo.CommissionVO;
-import com.yd.csf.service.vo.FnaVO;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
@@ -44,7 +40,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
     private FortuneService fortuneService;
     private FortuneService fortuneService;
 
 
     @Resource
     @Resource
-    private PolicyService policyService;
+    private PolicyFollowService policyFollowService;
 
 
     @Resource
     @Resource
     private PolicyBrokerService policyBrokerService;
     private PolicyBrokerService policyBrokerService;
@@ -121,14 +117,12 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         for (Fortune item : fortuneList) {
         for (Fortune item : fortuneList) {
             if (StringUtils.equals(item.getStatus(), FortuneStatusEnum.CAN_SEND.getItemValue()) ||
             if (StringUtils.equals(item.getStatus(), FortuneStatusEnum.CAN_SEND.getItemValue()) ||
                     StringUtils.equals(item.getStatus(), FortuneStatusEnum.SENT.getItemValue())) {
                     StringUtils.equals(item.getStatus(), FortuneStatusEnum.SENT.getItemValue())) {
-                throw new BusinessException(ResultCode.FAIL.getCode(), "该来佣记录已被处理，不能重复生成");
+                throw new BusinessException(ResultCode.FAIL.getCode(), "该来佣记录已有出帐，不能重复生成");
             }
             }
         }
         }
 
 
-        // 1.查询所有保单号对应的保单
-        List<Policy> policyList = policyService.list(new QueryWrapper<Policy>().in("policy_no", policyNoSet));
-        // 构建保单号到保单的映射
-        Map<String, Policy> policyMap = policyList.stream().collect(Collectors.toMap(Policy::getPolicyNo, policy -> policy));
+        // 1.查询所有保单号对应的保单跟进记录
+        List<PolicyFollow> policyFollowListList = policyFollowService.list(new QueryWrapper<PolicyFollow>().in("policy_no", policyNoSet));
 
 
         // 2.根据保单号查询所有转介人
         // 2.根据保单号查询所有转介人
         List<PolicyBroker> brokerList = policyBrokerService.list(new QueryWrapper<PolicyBroker>().in("policy_no", policyNoSet));
         List<PolicyBroker> brokerList = policyBrokerService.list(new QueryWrapper<PolicyBroker>().in("policy_no", policyNoSet));
@@ -140,8 +134,8 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
 
 
         // 4. 构建发佣记录
         // 4. 构建发佣记录
         List<Fortune> newFortuneList = new ArrayList<>();
         List<Fortune> newFortuneList = new ArrayList<>();
-        for (Policy policy : policyList) {
-            String policyNo = policy.getPolicyNo();
+        for (PolicyFollow policyFollow : policyFollowListList) {
+            String policyNo = policyFollow.getPolicyNo();
 
 
             List<PolicyBroker> policyBrokers = brokerMap.get(policyNo);
             List<PolicyBroker> policyBrokers = brokerMap.get(policyNo);
             if (CollectionUtils.isNotEmpty(policyBrokers)) {
             if (CollectionUtils.isNotEmpty(policyBrokers)) {