前端对接问题修复98

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiExpectedFortuneServiceImpl.java

@@ -511,6 +511,9 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
             if (Objects.isNull(expectedFortuneDto.getAmount())) {
                 throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "预计出账金额不能为空");
             }
+            if (Objects.isNull(expectedFortuneDto.getCurrency())) {
+                throw new BusinessException(ResultCode.PARAMS_ERROR.getCode(), "预计出账币种不能为空");
+            }
         }
     }
 

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

@@ -537,15 +537,12 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         List<ExpectedFortune> expectedFortuneList = iExpectedFortuneService.lambdaQuery()
                 .in(ExpectedFortune::getPolicyNo, policyNoSet)
                 .list();
-        // 1.2 根据保单号和期数筛选符合的预计发佣记录
+        // 1.2 根据期数筛选符合的预计发佣记录
+        Set<Integer> commissionPeriodSet = commissions.stream().map(Commission::getCommissionPeriod).collect(Collectors.toSet());
         List<ExpectedFortune> filteredExpectedFortuneList1 = new ArrayList<>();
-        for (Commission commission : commissions) {
-            String policyNo = commission.getPolicyNo();
-            Integer commissionPeriod = commission.getCommissionPeriod();
-            for (ExpectedFortune expectedFortune : expectedFortuneList) {
-                if (expectedFortune.getPolicyNo().equals(policyNo) && expectedFortune.getFortunePeriod().equals(commissionPeriod)) {
-                    filteredExpectedFortuneList1.add(expectedFortune);
-                }
+        for (ExpectedFortune expectedFortune : expectedFortuneList) {
+            if (commissionPeriodSet.contains(expectedFortune.getFortunePeriod())) {
+                filteredExpectedFortuneList1.add(expectedFortune);
             }
         }
         if (CollectionUtils.isEmpty(filteredExpectedFortuneList1)) {
@@ -629,7 +626,8 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         Map<String, Commission> commissionByPolicyPeriod = commissionList.stream()
                 .collect(Collectors.toMap(
                         commission -> buildPolicyPeriodKey(commission.getPolicyNo(), commission.getCommissionPeriod()),
-                        Function.identity()
+                        Function.identity(),
+                        (oldValue, newValue) -> newValue  // 遇到重复时使用新值
                 ));
 
         Date now = new Date();
@@ -639,6 +637,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
                     BeanUtils.copyProperties(expectedFortune, fortune);
 
                     fortune.setFortuneBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_FORTUNE.getCode()));
+                    fortune.setId(null);
                     fortune.setFortuneBizType("R");
                     fortune.setAmount(expectedFortune.getAmount());
                     fortune.setCurrentPaymentAmount(expectedFortune.getAmount());

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

@@ -67,6 +67,9 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
             return queryWrapper;
         }
         List<String> statusList = fortuneAccountQueryRequest.getStatusList();
+        if (CollectionUtils.isEmpty(statusList)) {
+            statusList = Collections.singletonList("6");
+        }
         List<String> brokerBizIdList = fortuneAccountQueryRequest.getBrokerBizIdList();
         List<String> teamBizIdList = fortuneAccountQueryRequest.getTeamBizIdList();
         queryWrapper.in(CollectionUtils.isNotEmpty(brokerBizIdList), "broker_biz_id", brokerBizIdList);

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

@@ -77,7 +77,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
         String reconciliationYearMonth = fortuneQueryRequest.getReconciliationYearMonth();
         List<String> statusList = fortuneQueryRequest.getStatusList();
         if (CollectionUtils.isEmpty(statusList)) {
-            statusList = Collections.singletonList(FortuneStatusEnum.CHECKED.getItemValue());
+            statusList = Collections.singletonList(FortuneStatusEnum.CAN_SEND.getItemValue());
         }
         String policyNo = fortuneQueryRequest.getPolicyNo();
         List<String> insuranceCompanyBizIdList = fortuneQueryRequest.getInsuranceCompanyBizIdList();