应付明细6

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

@@ -158,9 +158,6 @@ public class ExpectedFortuneServiceImpl extends ServiceImpl<ExpectedFortuneMappe
             if (CollUtil.isNotEmpty(matchedList)) {
             if (CollUtil.isNotEmpty(matchedList)) {
                 // 设置实际出账记录的字段：待出账金额(估)、已出账比例、未出账比例、已出账金额
                 // 设置实际出账记录的字段：待出账金额(估)、已出账比例、未出账比例、已出账金额
                 matchedList.forEach(actual -> {
                 matchedList.forEach(actual -> {
-                    actual.setPaidRatio(expected.getPaidRatio());
-                    actual.setUnpaidRatio(expected.getUnpaidRatio());
-                    actual.setPaidAmount(expected.getPaidAmount());
                     actual.setBrokerRatio(expected.getBrokerRatio());
                     actual.setBrokerRatio(expected.getBrokerRatio());
                     actual.setPremium(expected.getPremium());
                     actual.setPremium(expected.getPremium());
                 });
                 });

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

@@ -168,7 +168,7 @@
             ef.rule_currency,
             ef.rule_currency,
             ef.status,
             ef.status,
             ef.payout_date,
             ef.payout_date,
-            ef.actual_payout_date,
+            NULL as actual_payout_date,
             ef.default_exchange_rate as exchangeRate,
             ef.default_exchange_rate as exchangeRate,
             ef.original_currency,
             ef.original_currency,
             ef.original_amount,
             ef.original_amount,
@@ -227,7 +227,7 @@
             f.status,
             f.status,
             f.payout_date,
             f.payout_date,
             f.actual_payout_date,
             f.actual_payout_date,
-            NUll as default_exchange_rate,
+            f.exchange_rate,
             f.original_currency,
             f.original_currency,
             f.original_amount,
             f.original_amount,
             f.original_to_hkd_rate,
             f.original_to_hkd_rate,
@@ -235,8 +235,7 @@
             f.payout_amount,
             f.payout_amount,
             f.hkd_to_payout_rate,
             f.hkd_to_payout_rate,
             f.hkd_amount,
             f.hkd_amount,
-            NULL as current_payment_hkd_amount,
-            f.exchange_rate,
+            f.current_payment_hkd_amount,
             NULL as paid_amount,
             NULL as paid_amount,
             NULL as paid_ratio,
             NULL as paid_ratio,
             NULL as unpaid_ratio,
             NULL as unpaid_ratio,
@@ -389,7 +388,7 @@
             COALESCE(SUM(hkd_amount), 0) AS totalExpectedAmount,
             COALESCE(SUM(hkd_amount), 0) AS totalExpectedAmount,
             COALESCE(SUM(paid_amount), 0) AS totalPaidAmount,
             COALESCE(SUM(paid_amount), 0) AS totalPaidAmount,
             COALESCE(SUM(unpaid_amount), 0) AS totalUnpaidAmount,
             COALESCE(SUM(unpaid_amount), 0) AS totalUnpaidAmount,
-            COALESCE(totalPremiumAmount, 0) AS totalPremiumAmount,
+            COALESCE(SUM(totalPremiumAmount), 0) AS totalPremiumAmount,
             COUNT(DISTINCT policy_no) AS totalPolicyCount
             COUNT(DISTINCT policy_no) AS totalPolicyCount
         FROM (
         FROM (
             SELECT
             SELECT