Merge branch 'develop'

master
taylor.dang 6 years ago
commit 0de6b19eed

@ -657,9 +657,9 @@
o.refund_amount refund_fee, o.refund_amount refund_fee,
o.customer_id, o.customer_id,
o.order_detail, 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.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_type,
t.transaction_id, t.transaction_id,
t.exchange_rate, t.exchange_rate,

Loading…
Cancel
Save