出账检核-增加币种62

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

@@ -93,7 +93,7 @@ public class ExpectedFortuneServiceImpl extends ServiceImpl<ExpectedFortuneMappe
             return expectedFortuneVOPage;
             return expectedFortuneVOPage;
         }
         }
 
 
-        // 调整数据顺序
+        // 调整数据顺序、格式
         processData(expectedFortuneList);
         processData(expectedFortuneList);
 
 
         // 1. 转介人职级信息
         // 1. 转介人职级信息
@@ -158,8 +158,9 @@ 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)) {
-                // 设置实际发佣的已出账比例、未出账比例 为 expected 的已出账比例、未出账比例
+                // 设置实际出账记录的字段：待出账金额(估)、已出账比例、未出账比例
                 matchedList.forEach(actual -> {
                 matchedList.forEach(actual -> {
+                    actual.setUnpaidAmount(expected.getHkdAmount());
                     actual.setPaidRatio(expected.getPaidRatio());
                     actual.setPaidRatio(expected.getPaidRatio());
                     actual.setUnpaidRatio(expected.getUnpaidRatio());
                     actual.setUnpaidRatio(expected.getUnpaidRatio());
                 });
                 });
@@ -176,7 +177,13 @@ public class ExpectedFortuneServiceImpl extends ServiceImpl<ExpectedFortuneMappe
             }
             }
         }
         }
 
 
-        // 6. 将排序后的结果写回原列表
+        // 6.设置实际出账记录的字段：待出账金额(估)
+        for (ApiExpectedFortunePageResponse item : sortedList) {
+            if (item.getType() == 2) {
+                item.setCurrentPaymentHkdAmount(item.getHkdAmount());
+            }
+        }
+        // 7. 将排序后的结果写回原列表
         expectedFortuneList.clear();
         expectedFortuneList.clear();
         expectedFortuneList.addAll(sortedList);
         expectedFortuneList.addAll(sortedList);
 
 

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

@@ -169,7 +169,7 @@
             ef.status_desc,
             ef.status_desc,
             ef.payout_date,
             ef.payout_date,
             ef.actual_payout_date,
             ef.actual_payout_date,
-            ef.default_exchange_rate,
+            ef.default_exchange_rate as exchangeRate,
             ef.original_currency,
             ef.original_currency,
             ef.original_amount,
             ef.original_amount,
             ef.original_to_hkd_rate,
             ef.original_to_hkd_rate,
@@ -178,7 +178,7 @@
             ef.hkd_to_payout_rate,
             ef.hkd_to_payout_rate,
             ef.hkd_amount,
             ef.hkd_amount,
             NULL as current_payment_hkd_amount,
             NULL as current_payment_hkd_amount,
-            NULL as exchange_rate,
+            ef.default_exchange_rate as exchange_rate,
             ef.paid_amount,
             ef.paid_amount,
             ef.unpaid_amount,
             ef.unpaid_amount,
             ef.paid_ratio,
             ef.paid_ratio,
@@ -241,8 +241,8 @@
             f.hkd_amount,
             f.hkd_amount,
             f.current_payment_amount,
             f.current_payment_amount,
             f.exchange_rate,
             f.exchange_rate,
-            NULL as paid_amount,
-            NULL as unpaid_amount,
+            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_ratio,
             NULL as paid_ratio,
             NULL as unpaid_ratio,
             NULL as unpaid_ratio,
             f.is_tax,
             f.is_tax,