出账检核-增加币种67

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

@@ -147,6 +147,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()
+                .filter(item -> "R".equals(item.getFortuneBizType()))
                 .collect(Collectors.groupingBy(ApiExpectedFortunePageResponse::getExpectedFortuneBizId));
                 .collect(Collectors.groupingBy(ApiExpectedFortunePageResponse::getExpectedFortuneBizId));
 
 
         // 4. 调整数据顺序
         // 4. 调整数据顺序
@@ -158,11 +159,12 @@ public class ExpectedFortuneServiceImpl extends ServiceImpl<ExpectedFortuneMappe
             // 查找对应的实际发佣
             // 查找对应的实际发佣
             List<ApiExpectedFortunePageResponse> matchedList = actualMap.get(expected.getExpectedFortuneBizId());
             List<ApiExpectedFortunePageResponse> matchedList = actualMap.get(expected.getExpectedFortuneBizId());
             if (CollUtil.isNotEmpty(matchedList)) {
             if (CollUtil.isNotEmpty(matchedList)) {
-                // 设置实际出账记录的字段：待出账金额(估)、已出账比例、未出账比例
+                // 设置实际出账记录的字段：待出账金额(估)、已出账比例、未出账比例、已出账金额
                 matchedList.forEach(actual -> {
                 matchedList.forEach(actual -> {
                     actual.setUnpaidAmount(expected.getHkdAmount());
                     actual.setUnpaidAmount(expected.getHkdAmount());
                     actual.setPaidRatio(expected.getPaidRatio());
                     actual.setPaidRatio(expected.getPaidRatio());
                     actual.setUnpaidRatio(expected.getUnpaidRatio());
                     actual.setUnpaidRatio(expected.getUnpaidRatio());
+                    actual.setPaidAmount(expected.getPaidAmount());
                 });
                 });
                 sortedList.addAll(matchedList);
                 sortedList.addAll(matchedList);
 
 

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

@@ -1017,7 +1017,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
             newExpectedFortune.setPaidRatio(BigDecimal.ZERO);
             newExpectedFortune.setPaidRatio(BigDecimal.ZERO);
             newExpectedFortune.setUnpaidRatio(BigDecimal.valueOf(100));
             newExpectedFortune.setUnpaidRatio(BigDecimal.valueOf(100));
 
 
-            newExpectedFortune.setStatus("0");
+            newExpectedFortune.setStatus(FortuneStatusEnum.CAN_SEND.getItemValue());
 
 
             newExpectedFortune.setPayoutDate(LocalDate.parse(splitDto.getPayoutYearMonth() + "-01"));
             newExpectedFortune.setPayoutDate(LocalDate.parse(splitDto.getPayoutYearMonth() + "-01"));
 
 

yd-csf-service/src/main/resources/mappers/ExpectedFortuneMapper.xml

@@ -239,10 +239,10 @@
             f.payout_amount,
             f.payout_amount,
             f.hkd_to_payout_rate,
             f.hkd_to_payout_rate,
             f.hkd_amount,
             f.hkd_amount,
-            f.current_payment_hkd_amount,
+            NULL as current_payment_hkd_amount,
             f.exchange_rate,
             f.exchange_rate,
-            IF(f.status = 2, f.hkd_amount, 0) as paid_amount,
-            IF(f.status != 2 and f.status != 5, f.hkd_amount, 0) as unpaid_amount,
+            NULL as paid_amount,
+            NULL as unpaid_amount,
             NULL as paid_ratio,
             NULL as paid_ratio,
             NULL as unpaid_ratio,
             NULL as unpaid_ratio,
             f.is_tax,
             f.is_tax,