diff --git 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
index f6fd45b4b..1f7447ac5 100644
--- 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,