Merge branch 'develop'

6 years ago · 0de6b19eed
parent 9c5a7e4ae9 09cd0ffa32
commit 0de6b19eed
1 changed files with 2 additions and 2 deletions
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
@ -657,9 +657,9 @@
        o.refund_amount refund_fee,
        o.customer_id,
        o.order_detail,
-        t.clearing_amount,
+        CASE o.channel WHEN 'Rpay' THEN o.customer_payment_amount ELSE t.clearing_amount END clearing_amount,
        t.refund_id,
-        t.create_time transaction_time,
+        CASE o.channel WHEN 'Rpay' THEN t.create_time ELSE t.transaction_time END transaction_time,
        t.transaction_type,
        t.transaction_id,
        t.exchange_rate,