新单跟进120

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

@@ -13,11 +13,9 @@ import com.yd.csf.service.dto.CommissionExpectedAddRequest;
 import com.yd.csf.service.dto.CommissionExpectedQueryRequest;
 import com.yd.csf.service.dto.CommissionExpectedQueryRequest;
 import com.yd.csf.service.dto.CommissionExpectedUpdateRequest;
 import com.yd.csf.service.dto.CommissionExpectedUpdateRequest;
 import com.yd.csf.service.enums.CommissionExpectedStatusEnum;
 import com.yd.csf.service.enums.CommissionExpectedStatusEnum;
-import com.yd.csf.service.model.Commission;
 import com.yd.csf.service.model.CommissionExpected;
 import com.yd.csf.service.model.CommissionExpected;
 import com.yd.csf.service.service.CommissionExpectedService;
 import com.yd.csf.service.service.CommissionExpectedService;
 import com.yd.csf.service.dao.CommissionExpectedMapper;
 import com.yd.csf.service.dao.CommissionExpectedMapper;
-import com.yd.csf.service.service.CommissionService;
 import com.yd.csf.service.vo.CommissionExpectedVO;
 import com.yd.csf.service.vo.CommissionExpectedVO;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.ObjectUtils;
@@ -26,7 +24,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
@@ -40,9 +37,6 @@ import java.util.stream.Collectors;
 public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpectedMapper, CommissionExpected>
 public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpectedMapper, CommissionExpected>
     implements CommissionExpectedService{
     implements CommissionExpectedService{
 
 
-    @Resource
-    private CommissionService commissionService;
-
     @Override
     @Override
     public Page<CommissionExpectedVO> getCommissionExpectedVOPage(Page<CommissionExpected> commissionExpectedPage) {
     public Page<CommissionExpectedVO> getCommissionExpectedVOPage(Page<CommissionExpected> commissionExpectedPage) {
         List<CommissionExpected> CommissionExpectedList = commissionExpectedPage.getRecords();
         List<CommissionExpected> CommissionExpectedList = commissionExpectedPage.getRecords();
@@ -150,11 +144,6 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
         if (CollUtil.isEmpty(addDtoList)) {
         if (CollUtil.isEmpty(addDtoList)) {
             throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "预计来佣列表不能为空");
             throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "预计来佣列表不能为空");
         }
         }
-        // 查询保单号对应的来佣记录
-        List<String> policyNoList = addDtoList.stream().map(CommissionExpectedAddDto::getPolicyNo).collect(Collectors.toList());
-        List<Commission> commissionList = commissionService.list(new QueryWrapper<Commission>().in("policy_no", policyNoList));
-
-        Map<String, List<Commission>> commissionMap = commissionList.stream().collect(Collectors.groupingBy(item -> item.getCommissionPeriod() + "-" + item.getTotalPeriod()));
 
 
         List<CommissionExpected> addList = new ArrayList<>();
         List<CommissionExpected> addList = new ArrayList<>();
         List<CommissionExpected> updateList = new ArrayList<>();
         List<CommissionExpected> updateList = new ArrayList<>();
@@ -192,20 +181,6 @@ public class CommissionExpectedServiceImpl extends ServiceImpl<CommissionExpecte
             }
             }
             this.updateBatchById(updateList);
             this.updateBatchById(updateList);
         }
         }
-        // 关联预计来佣与来佣记录
-        addList.addAll(updateList);
-        boolean isCommissionUpdated = false;
-        for (CommissionExpected expected : addList) {
-            List<Commission> commissionListFromDb = commissionMap.get(expected.getCommissionPeriod() + "-" + expected.getTotalPeriod());
-            if (CollectionUtils.isNotEmpty(commissionListFromDb)) {
-                // 关联预计来佣与来佣记录
-                commissionListFromDb.forEach(commission -> commission.setCommissionExpectedBizId(expected.getCommissionExpectedBizId()));
-                isCommissionUpdated = true;
-            }
-        }
-        if (isCommissionUpdated) {
-            commissionService.updateBatchById(commissionList);
-        }
         return true;
         return true;
     }
     }
 
 

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

@@ -221,7 +221,12 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         queryWrapper.eq("commission_name", commission.getCommissionName());
         queryWrapper.eq("commission_name", commission.getCommissionName());
         queryWrapper.eq("commission_period", commission.getCommissionPeriod());
         queryWrapper.eq("commission_period", commission.getCommissionPeriod());
         queryWrapper.eq("currency", commission.getCurrency());
         queryWrapper.eq("currency", commission.getCurrency());
-        return commissionExpectedService.getOne(queryWrapper);
+        CommissionExpected one = commissionExpectedService.getOne(queryWrapper);
+        if (ObjectUtils.isEmpty(one)) {
+            log.info("未找到当前来佣对应的预计来佣，policy_no：{}, commission_name：{}, commission_period：{}, currency：{}",
+                    commission.getPolicyNo(), commission.getCommissionName(), commission.getCommissionPeriod(), commission.getCurrency());
+        }
+        return one;
     }
     }
 
 
     @Override
     @Override