应付明细3

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

@@ -148,12 +148,12 @@
             ef.id,
             ef.id,
             ef.expected_fortune_biz_id,
             ef.expected_fortune_biz_id,
             ef.fortune_biz_type,
             ef.fortune_biz_type,
-            ef.is_part,
+            NULL as currentPaymentRuleAmount,
+            NULL as currentPayoutAmount,
+            NULL as currentPaymentRatio,
             ef.payable_no,
             ef.payable_no,
             ef.policy_no,
             ef.policy_no,
             ef.premium,
             ef.premium,
-            ef.policy_currency,
-            ef.insurance_company_biz_id,
             ef.product_launch_biz_id,
             ef.product_launch_biz_id,
             ef.fortune_period,
             ef.fortune_period,
             ef.fortune_total_period,
             ef.fortune_total_period,
@@ -167,7 +167,6 @@
             ef.rule_amount,
             ef.rule_amount,
             ef.rule_currency,
             ef.rule_currency,
             ef.status,
             ef.status,
-            ef.status_desc,
             ef.payout_date,
             ef.payout_date,
             ef.actual_payout_date,
             ef.actual_payout_date,
             ef.default_exchange_rate as exchangeRate,
             ef.default_exchange_rate as exchangeRate,
@@ -179,15 +178,12 @@
             ef.hkd_to_payout_rate,
             ef.hkd_to_payout_rate,
             ef.hkd_amount,
             ef.hkd_amount,
             ef.hkd_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.paid_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.tax_amount,
-            ef.net_amount,
-            ef.rule_item_biz_id,
+            ef.paid_rule_amount as paidRuleAmount,
+            ef.unpaid_rule_amount as unpaidRuleAmount,
+            ef.unpaid_rule_amount_hkd as unpaidRuleAmounthHkd,
             ef.remark,
             ef.remark,
             ef.create_time,
             ef.create_time,
             ef.creator_name,
             ef.creator_name,
@@ -210,12 +206,12 @@
             f.id,
             f.id,
             f.expected_fortune_biz_id,
             f.expected_fortune_biz_id,
             f.fortune_biz_type,
             f.fortune_biz_type,
-            f.is_part,
+            f.rule_amount as currentPaymentRuleAmount,
+            f.current_payment_amount as currentPayoutAmount,
+            f.current_payment_ratio as currentPaymentRatio,
             f.payable_no,
             f.payable_no,
             f.policy_no,
             f.policy_no,
             NULL as premium,
             NULL as premium,
-            f.policy_currency,
-            NULL as insurance_company_biz_id,
             NULL as product_launch_biz_id,
             NULL as product_launch_biz_id,
             f.fortune_period,
             f.fortune_period,
             f.fortune_total_period,
             f.fortune_total_period,
@@ -229,7 +225,6 @@
             f.rule_amount,
             f.rule_amount,
             f.rule_currency,
             f.rule_currency,
             f.status,
             f.status,
-            NULL as status_desc,
             f.payout_date,
             f.payout_date,
             f.actual_payout_date,
             f.actual_payout_date,
             NUll as default_exchange_rate,
             NUll as default_exchange_rate,
@@ -243,13 +238,11 @@
             NULL as current_payment_hkd_amount,
             NULL as current_payment_hkd_amount,
             f.exchange_rate,
             f.exchange_rate,
             NULL as paid_amount,
             NULL as paid_amount,
-            NULL as unpaid_amount,
             NULL as paid_ratio,
             NULL as paid_ratio,
             NULL as unpaid_ratio,
             NULL as unpaid_ratio,
-            f.is_tax,
-            f.tax_amount,
-            f.net_amount,
-            NULL as rule_item_biz_id,
+            NULL as paidRuleAmount,
+            NULL as unpaidRuleAmount,
+            NULL as unpaidRuleAmounthHkd,
             f.remark,
             f.remark,
             f.create_time,
             f.create_time,
             f.reconciliation_operator as creator_name,
             f.reconciliation_operator as creator_name,