|
|
@@ -95,7 +95,8 @@
|
|
|
if(t5.id is null,'内舱房',concat(t5.room_model_name,t5.floor,'楼(',t6.type_name,')')) as roomFullName,
|
|
|
if(rr.id is null,'',concat(rrm.name,' | ',rr.room_num)) as roomName
|
|
|
from trade_detail t inner join trade_visitor v on v.detail_id = t.id
|
|
|
- left join trade_order_jz_detail t3 on v.credential_no = t3.id_card and t3.deleted =0
|
|
|
+ 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 product_price_room_model_type t6 on t5.room_model_type_id=t6.id
|
