select cr.pay_time,cr.order_code,m2.name as receivedMarketName,m1.name as performanceMarketName,cr.name,cr.jwcode,cr.goods_name,cr.remark,cr.good_num,cr.pay_type,r2.rate_name as receivedCurrency,cr.payment_amount,cr.handling_charge,cr.received_amount
select cr.pay_time,cr.order_code,m2.name as receivedMarketName,m1.name as performanceMarketName,cr.name,cr.jwcode,cr.goods_name,cr.remark,cr.good_num,cr.pay_type,r2.rate_name as receivedCurrency,cr.payment_amount/100,cr.handling_charge/100,cr.received_amount/100
from cash_record_collection cr
left join market m1 on m1.id = cr.performance_market
left join market m2 on m2.id = cr.received_market
@ -371,7 +371,7 @@
<!-- 当cr.status = 6时,添加退款记录 -->
UNION ALL
select crr.refund_time as pay_time,crr.order_code,m2.name as receivedMarketName,m1.name as performanceMarketName,crr.name,crr.jwcode,cr.goods_name,crr.refund_reason as remark,cr.good_num,cr.pay_type,r3.rate_name as receivedCurrency,-crr.refund_amount as payment_amount,0 as handling_charge,-crr.refund_amount as received_amount
select crr.refund_time as pay_time,crr.order_code,m2.name as receivedMarketName,m1.name as performanceMarketName,crr.name,crr.jwcode,cr.goods_name,crr.refund_reason as remark,cr.good_num,cr.pay_type,r3.rate_name as receivedCurrency,-crr.refund_amount/100 as payment_amount,0 as handling_charge,-crr.refund_amount/100 as received_amount
from cash_record_refund crr
left join cash_record_collection cr on cr.id = crr.related_id
left join market m1 on m1.id = cr.performance_market