Merge branch 'develop'

master
james.zhao 6 years ago
commit 33700aa64e

@ -749,7 +749,7 @@
FROM pmt_orders o FROM pmt_orders o
LEFT JOIN pmt_transactions t LEFT JOIN pmt_transactions t
ON t.order_id = o.order_id ON t.order_id = o.order_id
AND t.refund_id IS NULL WHERE t.refund_id IS NULL
AND t.transaction_type = 'Credit' AND t.transaction_type = 'Credit'
AND t.channel != 'System' AND t.channel != 'System'
and o.transaction_date = #{transaction_date} and o.transaction_date = #{transaction_date}

Loading…
Cancel
Save