计调模板提交

ship-module-resource/ship-module-resource-api/src/main/java/com/yc/ship/module/resource/enums/DictTypeConstants.java

@@ -36,6 +36,7 @@ public interface DictTypeConstants {
 
     String VISITOR_CREDENTIAL_TYPE = "credential_type"; //运营一体化 - 游客证件类型
     String VOUCHER_STATUS = "voucher_status"; //运营一体化 - 票券状态
+    String TOUR_TYPE = "tour_type"; //运营一体化 - 游客类型
 
     String TAXI_INVOICE_STATUS = "taxi_invoice_status"; //出租车票申请单状态
 

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

@@ -40,6 +40,12 @@ public class TouristExportVisitorVO {
     @Schema(description = "支付状态（1=已支付，其他=未支付）")
     private Integer payStatus;
 
+    @Schema(description = "接站")
+    private String jz;
+
+    @Schema(description = "订单状态")
+    private String orderStatus;
+
     // ==================== 房间详情 ====================
     @Schema(description = "房间索引ID（用于合并）")
     private String roomIndexId;
@@ -72,6 +78,15 @@ public class TouristExportVisitorVO {
     @Schema(description = "国籍名称")
     private String nationalityName;
 
+    @Schema(description = "生日")
+    private String birthday;
+
+    @Schema(description = "手机号")
+    private String mobile;
+
+    @Schema(description = "楼层")
+    private String floor;
+
     @Schema(description = "增值服务")
     private String valueAddedService;
 

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

@@ -2895,6 +2895,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                         item.put("travelDate", StringUtils.isEmpty(visitor.getTravelDate()) ? "" : visitor.getTravelDate()); // 航期（格式：yyyy.M.d）
                         item.put("amount", visitor.getAmount() != null ? visitor.getAmount() : BigDecimal.ZERO); // 应收款
 
+
                         // 实收款计算逻辑：根据支付状态判断
                         //Integer payStatus = visitor.getPayStatus(); // 支付状态
                         //BigDecimal payAmount = visitor.getPayAmount() != null ? visitor.getPayAmount() : BigDecimal.ZERO; // 实际金额
@@ -2906,8 +2907,10 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                         item.put("deposi", deposi); // 定金
 
                         // 房间详情（3列）：同一房间的游客合并显示这些列
+                        item.put("floor", StringUtils.isEmpty(visitor.getFloor()) ? "" : visitor.getFloor()); // 楼层
+
                         item.put("roomIndex", roomIndex); // 序号（按订单内的房间顺序）
-                        item.put("roomType", StringUtils.isEmpty(visitor.getRoomType()) ? "" : visitor.getRoomType()); // 房型（如：豪华标准间）
+                        item.put("roomType", (StringUtils.isEmpty(visitor.getRoomType()) ? "" : visitor.getRoomType()) + (StringUtils.isEmpty(visitor.getFloor()) ? "" : (" (" + visitor.getFloor() + ")"))); // 房型（如：豪华标准间 (2F)）
                         item.put("roomDescription", roomDescription); // 入住类型（如：2个成人/1个儿童）
 
                         // 游客详情（8列）：每个游客独立显示
@@ -2921,6 +2924,13 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                         item.put("policyName", ""); // 优惠政策（如：早鸟优惠、团立减等）
                         item.put("remark", StringUtils.isEmpty(visitor.getRemark()) ? "" : visitor.getRemark()); // 备注信息
 
+
+                        item.put("visitorHome", StringUtils.isEmpty(visitor.getVisitorType()) ? "" : DictFrameworkUtils.getDictDataLabel(DictTypeConstants.TOUR_TYPE, visitor.getVisitorType())); // 游客入住类型
+
+                        item.put("birthday", StringUtils.isEmpty(visitor.getBirthday()) ? "" : visitor.getBirthday()); // 生日
+                        item.put("mobile", StringUtils.isEmpty(visitor.getMobile()) ? "" : visitor.getMobile()); // 手机号
+                        item.put("jz", StringUtils.isEmpty(visitor.getJz()) ? "" : visitor.getJz()); // 是否接站
+                        item.put("orderStatus", StringUtils.isEmpty(visitor.getOrderStatus()) ? "" : TradeOrderStatusEnum.valueOf(visitor.getOrderStatus()).getName()); // 订单状态
                         touristData.add(item);
                     }
                     roomIndex++;

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

@@ -252,6 +252,7 @@
             tor.order_no AS orderNo,
             tor.group_no AS groupNo,
             CASE WHEN rr.direction = 1 THEN '上水' ELSE '下水' END AS direction,
+            CASE WHEN tjz.is_jz = 1 THEN '是' ELSE '否' END AS jz,
             DATE_FORMAT(pv.start_time, '%Y.%m.%d') AS travelDate,
             tor.pay_amount AS amount,
             top.pay_amount AS payAmount,
@@ -260,12 +261,16 @@
             torm.room_model_name AS roomType,
             tv.name,
             tv.gender,
+            tv.birthday,
+            tv.mobile,
             tv.credential_type AS credentialType,
             tv.credential_no AS credentialNo,
             tv.type AS visitorType,
+            tv.floor as floor,
             a.name AS nationalityName,
             GROUP_CONCAT(ps.product_name) AS valueAddedService,
-            tor.remark
+            tor.remark,
+            tor.order_status as orderStatus
         FROM trade_visitor tv
         INNER JOIN trade_order tor ON tv.order_id = tor.id AND tor.deleted = 0
         INNER JOIN trade_detail td ON tv.id = td.visitor_id AND td.deleted = 0
@@ -276,6 +281,7 @@
         LEFT JOIN trade_order_room_model torm ON tv.room_index_id = torm.room_index_id AND torm.deleted = 0
         left JOIN product_spu ps on ps.id = td.product_id
         left join trade_order_pay top ON top.order_id = tor.id and top.deleted = 0 and top.pay_status = 1
+        left Join trade_order_jz tjz on tjz.order_id = tor.id
 
         WHERE tv.deleted = 0