前端对接问题修复55

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

@@ -215,6 +215,12 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         List<Policy> policyList = policyService.list(queryWrapper);
         Map<String, Policy> policyMap = policyList.stream().collect(Collectors.toMap(Policy::getPolicyNo, a -> a, (oldValue, newValue) -> newValue));
 
+        // 2.关联查询预计入账信息
+        List<CommissionExpected> commissionExpectedList = commissionExpectedService.lambdaQuery()
+                .in(CommissionExpected::getPolicyNo, policyNoSet)
+                .select(CommissionExpected::getCommissionExpectedBizId, CommissionExpected::getReceivableNo, CommissionExpected::getStatus)
+                .list();
+
         // 填充信息
         commissionList.forEach(commission -> {
             Policy policy = policyMap.get(commission.getPolicyNo());
@@ -227,6 +233,23 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
                 commission.setReconciliationCompanyCode(policy.getReconciliationCompanyCode());
                 commission.setReconciliationCompanyBizId(policy.getReconciliationCompanyBizId());
             }
+            // 根据保单号、期数、入账名称、币种查询预计来佣记录
+            CommissionExpected expected = commissionExpectedList.stream()
+                    .filter(item -> item.getPolicyNo().equals(commission.getPolicyNo())
+                            && item.getCommissionPeriod().equals(commission.getCommissionPeriod())
+                            && item.getCommissionName().equals(commission.getCommissionName())
+                            && item.getCurrency().equals(commission.getCurrency()))
+                    .findFirst()
+                    .orElse(null);
+            if (expected != null) {
+                commission.setCommissionExpectedBizId(expected.getCommissionExpectedBizId());
+            } else {
+                log.warn("导入入账：未查询到预计来佣记录, policyNo: {}, commissionPeriod: {}, commissionName: {}, currency: {}",
+                        commission.getPolicyNo(), commission.getCommissionPeriod(), commission.getCommissionName(), commission.getCurrency());
+                commission.setRemark("未查询到预计来佣记录");
+                commission.setStatus(CommissionStatusEnum.MATCH_FAILED.getItemValue());
+            }
+
         });
     }