出账检核-增加币种29

yd-csf-feign/src/main/java/com/yd/csf/feign/response/expectedfortune/ApiExpectedFortunePageResponse.java

@@ -161,7 +161,7 @@ public class ApiExpectedFortunePageResponse {
      * 保单币种 -> 港币汇率
      * 保单币种 -> 港币汇率
      */
      */
     @Schema(description = "保单币种 -> 港币汇率")
     @Schema(description = "保单币种 -> 港币汇率")
-    private BigDecimal exchangeRate;
+    private BigDecimal defaultExchangeRate;
 
 
     /**
     /**
      * HKD应出账金额
      * HKD应出账金额
@@ -170,6 +170,18 @@ public class ApiExpectedFortunePageResponse {
     private BigDecimal hkdAmount;
     private BigDecimal hkdAmount;
 
 
     /**
     /**
+     * 本次出账金额（HKD）
+     */
+    @Schema(description = "本次出账金额（HKD）")
+    private BigDecimal currentPaymentHkdAmount;
+
+    /**
+     * 本期结算汇率
+     */
+    @Schema(description = "本期结算汇率")
+    private BigDecimal exchangeRate;
+
+    /**
      * 出账状态
      * 出账状态
      */
      */
     @Schema(description = "出账状态 0=待出账 1=可出帐，待检核 2=完成出账 3=部分出账 4=保留 5=已失效 6=可出账, 已检核 7=未找到当前预计出账对应的来佣 字典值: csf_expected_fortune_status")
     @Schema(description = "出账状态 0=待出账 1=可出帐，待检核 2=完成出账 3=部分出账 4=保留 5=已失效 6=可出账, 已检核 7=未找到当前预计出账对应的来佣 字典值: csf_expected_fortune_status")

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

@@ -190,6 +190,8 @@
             ef.payout_amount,
             ef.payout_amount,
             ef.hkd_to_payout_rate,
             ef.hkd_to_payout_rate,
             ef.hkd_amount,
             ef.hkd_amount,
+            NULL as current_payment_hkd_amount,
+            NULL as exchange_rate,
             ef.paid_amount,
             ef.paid_amount,
             ef.unpaid_amount,
             ef.unpaid_amount,
             ef.paid_ratio,
             ef.paid_ratio,
@@ -242,7 +244,7 @@
             NULL as status_desc,
             NULL as status_desc,
             f.payout_date,
             f.payout_date,
             f.actual_payout_date,
             f.actual_payout_date,
-            f.exchange_rate as default_exchange_rate,
+            NUll as default_exchange_rate,
             f.original_currency,
             f.original_currency,
             f.original_amount,
             f.original_amount,
             f.original_to_hkd_rate,
             f.original_to_hkd_rate,
@@ -250,7 +252,9 @@
             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_amount as paid_amount,
+            f.current_payment_amount,
+            f.exchange_rate,
+            NULL as paid_amount,
             0 as unpaid_amount,
             0 as unpaid_amount,
             f.current_payment_ratio as paid_ratio,
             f.current_payment_ratio as paid_ratio,
             0 as unpaid_ratio,
             0 as unpaid_ratio,