出账检核-增加币种30

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

@@ -146,7 +146,7 @@ public class ExpectedFortuneServiceImpl extends ServiceImpl<ExpectedFortuneMappe
 
 
         // 3. 将 actualList 转换为 Map
         // 3. 将 actualList 转换为 Map
         Map<String, List<ApiExpectedFortunePageResponse>> actualMap = actualList.stream()
         Map<String, List<ApiExpectedFortunePageResponse>> actualMap = actualList.stream()
-                .collect(Collectors.groupingBy(ApiExpectedFortunePageResponse::getPayableNo));
+                .collect(Collectors.groupingBy(ApiExpectedFortunePageResponse::getExpectedFortuneBizId));
 
 
         // 4. 调整数据顺序
         // 4. 调整数据顺序
         List<ApiExpectedFortunePageResponse> sortedList = new ArrayList<>();
         List<ApiExpectedFortunePageResponse> sortedList = new ArrayList<>();
@@ -155,16 +155,16 @@ public class ExpectedFortuneServiceImpl extends ServiceImpl<ExpectedFortuneMappe
         for (ApiExpectedFortunePageResponse expected : expectedList) {
         for (ApiExpectedFortunePageResponse expected : expectedList) {
             sortedList.add(expected);
             sortedList.add(expected);
             // 查找对应的实际发佣
             // 查找对应的实际发佣
-            List<ApiExpectedFortunePageResponse> matchedList = actualMap.get(expected.getPayableNo());
+            List<ApiExpectedFortunePageResponse> matchedList = actualMap.get(expected.getExpectedFortuneBizId());
             if (CollUtil.isNotEmpty(matchedList)) {
             if (CollUtil.isNotEmpty(matchedList)) {
                 sortedList.addAll(matchedList);
                 sortedList.addAll(matchedList);
-                matchedActualPayableNos.add(expected.getPayableNo());
+                matchedActualPayableNos.add(expected.getExpectedFortuneBizId());
             }
             }
         }
         }
 
 
         // 5. 添加未匹配的实际发佣记录
         // 5. 添加未匹配的实际发佣记录
         for (ApiExpectedFortunePageResponse actual : actualList) {
         for (ApiExpectedFortunePageResponse actual : actualList) {
-            if (!matchedActualPayableNos.contains(actual.getPayableNo())) {
+            if (!matchedActualPayableNos.contains(actual.getExpectedFortuneBizId())) {
                 sortedList.add(actual);
                 sortedList.add(actual);
             }
             }
         }
         }