订单详情游客显示国籍

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/order/TradeDetailMapper.xml

@@ -222,6 +222,7 @@
         <result property="inDate" column="in_date"/>
         <result property="outDate" column="out_date"/>
         <result property="nationality" column="nationality"/>
+        <result property="nationalityName" column="nationalityName"/>
         <result property="roomIndexId" column="room_index_id"/>
         <result property="roomModelId" column="room_model_id"/>
         <result property="floor" column="floor"/>
@@ -264,11 +265,12 @@
 
     <select id="getOrderIdDetail" resultMap="MiddleWareDtoResultMap">
         SELECT td.*,tv.detail_id,tv.name,tv.id visitorId,tv.gender,tv.credential_no,tv.age,tv.birthday,tv.nationality,tv.cohabitation,tv.room_id,tv.in_date,tv.out_date,tv.remark,tv.init_room_id,tv.final_room_id,tv.type,
-               tv.credential_type, tv.mobile,tv.ota_detail_id,tv.is_insure,tv.room_index_id,tv.room_model_id,tv.floor,tv.vid,pc.full_path_name,p.product_tag,p.product_tag2
+        tv.credential_type, tv.mobile,tv.ota_detail_id,tv.is_insure,tv.room_index_id,tv.room_model_id,tv.floor,tv.vid,pc.full_path_name,p.product_tag,p.product_tag2, a.name nationalityName
         FROM trade_detail td
         left join product_spu p on p.id = td.product_id
         left join product_category pc on pc.id = p.category_id
         left JOIN trade_visitor tv on td.visitor_id = tv.id and tv.deleted=0
+        left join area a on tv.nationality = a.id
         where 1= 1 and td.deleted = 0
         <if test="orderId != null and orderId != ''">
             AND td.order_id = #{orderId}

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/order/TradeVisitorMapper.xml

@@ -92,8 +92,9 @@
 
     <select id="selectShipVisitor"
             resultType="com.yc.ship.module.trade.dal.dataobject.order.TradeVisitorDO">
-        select t.product_type productType,v.*,t3.id_card jzCard,t3.arrive_time jzTime,t3.phone jzPhone,t3.address jzAddress from trade_detail t inner join trade_visitor v on v.detail_id = t.id
+        select t.product_type productType,v.*,t3.id_card jzCard,t3.arrive_time jzTime,t3.phone jzPhone,t3.address jzAddress, a.name nationalityName 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 area a on v.nationality = a.id
         where t.order_id = #{orderId} and v.deleted =0 and t.product_type =0 and t.deleted =0
         group by v.id
     </select>