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

src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml

@@ -698,9 +698,9 @@
         o.refund_amount refund_fee,
         o.customer_id,
         o.order_detail,
-        CASE o.channel WHEN 'Rpay' THEN o.customer_payment_amount ELSE t.clearing_amount END clearing_amount,
+        t.clearing_amount,
         t.refund_id,
-        CASE o.channel WHEN 'Rpay' THEN t.create_time ELSE t.transaction_time END transaction_time,
+        IFNULL(t.create_time,t.transaction_time) transaction_time,
         t.transaction_type,
         t.transaction_id,
         t.exchange_rate,