Merge remote-tracking branch 'origin/test' into test

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

@@ -777,6 +777,10 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
                 fortune.setHkdAmount(hkdAmount);
                 fortune.setCurrentPaymentAmount(hkdAmount);
                 fortune.setCurrentPaymentHkdAmount(hkdAmount);
+                // 默认发放币种、汇率、发放币种金额
+                fortune.setPayoutCurrency("HKD");
+                fortune.setHkdToPayoutRate(BigDecimal.ONE);
+                fortune.setPayoutAmount(hkdAmount);
 
                 // 更新预计发佣记录的港币金额
                 ExpectedFortune update = new ExpectedFortune();
@@ -785,6 +789,9 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
                 update.setOriginalToHkdRate(exchangeRate);
                 update.setHkdAmount(hkdAmount);
                 update.setUnpaidAmount(hkdAmount);
+                update.setPayoutCurrency("HKD");
+                update.setHkdToPayoutRate(BigDecimal.ONE);
+                update.setPayoutAmount(hkdAmount);
                 updatedExpectedFortuneList.add(update);
             } else {
                 fortune.setExchangeRate(expectedFortune.getDefaultExchangeRate());

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

@@ -177,7 +177,7 @@
             ef.payout_amount,
             ef.hkd_to_payout_rate,
             ef.hkd_amount,
-            ef.current_payment_amount as current_payment_hkd_amount,
+            ef.hkd_amount as current_payment_hkd_amount,
             ef.default_exchange_rate as exchange_rate,
             ef.paid_amount,
             ef.unpaid_amount,
@@ -239,7 +239,7 @@
             f.payout_amount,
             f.hkd_to_payout_rate,
             f.hkd_amount,
-            f.current_payment_amount,
+            f.current_payment_hkd_amount,
             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,