新下单流程优化

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/TradeVisitorRespVO.java

@@ -18,6 +18,8 @@ public class TradeVisitorRespVO {
 
     @Schema(description = "游客编号")
     private String vid;
+    @Schema(description = "游客类型")
+    private String type;
 
     @Schema(description = "明细ID")
     private Long orderId;

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

@@ -220,6 +220,11 @@
         <result property="inDate" column="in_date"/>
         <result property="outDate" column="out_date"/>
         <result property="nationality" column="nationality"/>
+        <result property="roomIndexId" column="room_index_id"/>
+        <result property="roomModelId" column="room_model_id"/>
+        <result property="floor" column="floor"/>
+        <result property="area" column="area"/>
+
     </resultMap>
 
 
@@ -256,7 +261,7 @@
 
     <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,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
         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