楼层增加

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -3156,7 +3156,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                         item.put("floor", StringUtils.isEmpty(visitor.getFloor()) ? "" : visitor.getFloor()); // 楼层
 
                         item.put("roomIndex", roomIndex); // 序号（按订单内的房间顺序）
-                        item.put("roomType", (StringUtils.isEmpty(visitor.getRoomType()) ? "" : visitor.getRoomType()) + (StringUtils.isEmpty(visitor.getFloor()) ? "" : (" (" + visitor.getFloor() + ")"))); // 房型（如：豪华标准间 (2F)）
+                        item.put("roomType", (StringUtils.isEmpty(visitor.getRoomType()) ? "" : visitor.getRoomType()) + (StringUtils.isEmpty(visitor.getFloor()) ? "" : (" (" + visitor.getFloor() + "F)"))); // 房型（如：豪华标准间 (2F)）
                         item.put("roomDescription", roomDescription); // 入住类型（如：2个成人/1个儿童）
 
                         // 游客详情（8列）：每个游客独立显示

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

@@ -274,7 +274,7 @@
             tv.credential_type AS credentialType,
             tv.credential_no AS credentialNo,
             tv.type AS visitorType,
-            tv.floor as floor,
+            torm.floor as floor,
             a.name AS nationalityName,
             GROUP_CONCAT(ps.product_name) AS valueAddedService,
             tor.remark,