|
@@ -505,7 +505,7 @@
|
|
|
LEFT JOIN (select m2.order_id,sum(m2.refund_amount) refund_amount,sum(m2.origin_amount) origin_amount from trade_refund m2 where m2.refund_status = 6 and m2.refund_method !=2 GROUP BY m2.order_id) tr on td.id = tr.order_id
|
|
LEFT JOIN (select m2.order_id,sum(m2.refund_amount) refund_amount,sum(m2.origin_amount) origin_amount from trade_refund m2 where m2.refund_status = 6 and m2.refund_method !=2 GROUP BY m2.order_id) tr on td.id = tr.order_id
|
|
|
LEFT JOIN trade_order_room_model torm on torm.order_id = td.id
|
|
LEFT JOIN trade_order_room_model torm on torm.order_id = td.id
|
|
|
left join trade_insurance tins on tins.order_id = td.id
|
|
left join trade_insurance tins on tins.order_id = td.id
|
|
|
- where td.deleted = 0 and tou.deleted = 0 and tins.deleted = 0
|
|
|
|
|
|
|
+ where td.deleted = 0 and tou.deleted = 0 and (tins.deleted = 0 or tins.deleted is null)
|
|
|
<if test="vo.orderStatus!=null and vo.orderStatus.size()>0">
|
|
<if test="vo.orderStatus!=null and vo.orderStatus.size()>0">
|
|
|
and td.order_status in
|
|
and td.order_status in
|
|
|
<foreach collection="vo.orderStatus" item="item" separator="," open="(" close=")">
|
|
<foreach collection="vo.orderStatus" item="item" separator="," open="(" close=")">
|