前端对接问题修复38

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

@@ -591,23 +591,14 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
 
 
         // 关联查询保单信息、预计入账信息
         // 关联查询保单信息、预计入账信息
         Map<String, Policy> policyMap = new HashMap<>();
         Map<String, Policy> policyMap = new HashMap<>();
-        Map<String, CommissionExpected> commissionExpectedMap = new HashMap<>();
+        List<CommissionExpected> commissionExpectedList = new ArrayList<>();
         if (CollUtil.isNotEmpty(policyNoSet)) {
         if (CollUtil.isNotEmpty(policyNoSet)) {
             // 查询保单信息
             // 查询保单信息
             List<Policy> policyList = policyService.lambdaQuery().in(Policy::getPolicyNo, policyNoSet).list();
             List<Policy> policyList = policyService.lambdaQuery().in(Policy::getPolicyNo, policyNoSet).list();
             // 保单映射
             // 保单映射
             policyMap = policyList.stream().collect(Collectors.toMap(Policy::getPolicyNo, Function.identity()));
             policyMap = policyList.stream().collect(Collectors.toMap(Policy::getPolicyNo, Function.identity()));
             // 查询预计入账信息
             // 查询预计入账信息
-            List<CommissionExpected> commissionExpectedList = commissionExpectedService.lambdaQuery().in(CommissionExpected::getPolicyNo, policyNoSet).list();
-            // 预计入账映射, 根据保单号、期数、入账名称、币种映射
-            try {
-                commissionExpectedMap = commissionExpectedList.stream()
-                        .collect(Collectors.toMap(
-                                key -> key.getPolicyNo() + "_" + key.getCommissionPeriod() + "_" + key.getCommissionName() + "_" + key.getCurrency(),
-                                Function.identity()));
-            } catch (Exception e) {
-                throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "该保单已存在当前币种、期数的佣金项目，请勿重复添加");
-            }
+            commissionExpectedList = commissionExpectedService.lambdaQuery().in(CommissionExpected::getPolicyNo, policyNoSet).list();
         }
         }
 
 
         List<Commission> commissionList = new ArrayList<>();
         List<Commission> commissionList = new ArrayList<>();
@@ -628,8 +619,15 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
                 }
                 }
             }
             }
             // 关联预计来佣信息
             // 关联预计来佣信息
-            if (MapUtils.isNotEmpty(commissionExpectedMap)) {
-                CommissionExpected expected = commissionExpectedMap.get(request.getPolicyNo() + "_" + request.getCommissionPeriod() + "_" + request.getCommissionName() + "_" + request.getCurrency());
+            if (CollectionUtils.isNotEmpty(commissionExpectedList)) {
+                // 根据保单号、期数、入账名称、币种查询预计来佣记录
+                CommissionExpected expected = commissionExpectedList.stream()
+                        .filter(item -> item.getPolicyNo().equals(request.getPolicyNo())
+                                && item.getCommissionPeriod().equals(request.getCommissionPeriod())
+                                && item.getCommissionName().equals(request.getCommissionName())
+                                && item.getCurrency().equals(request.getCurrency()))
+                        .findFirst()
+                        .orElse(null);
                 if (expected != null) {
                 if (expected != null) {
                     commission.setCommissionExpectedBizId(expected.getCommissionExpectedBizId());
                     commission.setCommissionExpectedBizId(expected.getCommissionExpectedBizId());
                 } else {
                 } else {