|
|
@@ -98,7 +98,7 @@
|
|
|
left join trade_order_jz jz on jz.order_id = t.order_id and jz.deleted = 0
|
|
|
left join trade_order_jz_detail t3 on v.credential_no = t3.id_card and t3.deleted =0 and t3.jz_id = jz.id
|
|
|
left join area a on v.nationality = a.id
|
|
|
- left join trade_order_room_model t5 on v.room_index_id = t5.room_index_id
|
|
|
+ left join trade_order_room_model t5 on v.room_index_id = t5.room_index_id and v.order_id=t5.order_id and t5.deleted=0
|
|
|
left join product_price_room_model_type t6 on t5.room_model_type_id=t6.id
|
|
|
left join resource_room rr on v.final_room_id=concat(rr.id,'')
|
|
|
left join resource_room_model rrm on rr.room_model_id = rrm.id
|