订单详情修改

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/dataobject/order/TradeVisitorDO.java

@@ -182,6 +182,15 @@ public class TradeVisitorDO extends TenantSyncDO {
 
     private Long shipId;
 
+
+    @Schema(description = "房型全名称")
+    @TableField(exist = false)
+    private String roomFullName;
+
+    @Schema(description = "房型全名称")
+    @TableField(exist = false)
+    private String roomName;
+
     /**
      * 入住类型
      * 1:实际入住 2:临时入住 3:预分房

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

@@ -91,13 +91,19 @@
     <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
-        , a.name nationalityName,t5.room_model_name roomModelName
+                , a.name nationalityName,t5.room_model_name roomModelName,
+               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 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_jz_detail t3 on v.credential_no = t3.id_card and t3.deleted =0
+                            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
+                            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
         where t.order_id = #{orderId} and v.deleted =0 and t.product_type =0 and t.deleted =0
-        group by v.id
+        GROUP BY v.room_index_id,v.id
+        order by v.room_index_id,v.id
     </select>
     <select id="selectRoomShipVisitor"
             resultType="com.yc.ship.module.product.api.dto.OrderRoomUseDTO">