出账检核-增加币种88

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

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

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

@@ -181,7 +181,7 @@
             ef.hkd_amount as current_payment_hkd_amount,
             ef.hkd_amount as current_payment_hkd_amount,
             ef.default_exchange_rate as exchange_rate,
             ef.default_exchange_rate as exchange_rate,
             ef.paid_amount,
             ef.paid_amount,
-            ef.unpaid_amount,
+            (ef.hkd_amount - ef.paid_amount) as unpaid_amount,
             ef.paid_ratio,
             ef.paid_ratio,
             ef.unpaid_ratio,
             ef.unpaid_ratio,
             ef.is_tax,
             ef.is_tax,