changelog: a6d360a - feat: 订单交通信息管理 + 合同平台选择 + 超时通知 + transport-service
这个提交包含在:
父节点
8c0c99ecbf
当前提交
e5acd699ce
@ -578,13 +578,13 @@
|
|||||||
"items": [
|
"items": [
|
||||||
{
|
{
|
||||||
"value": "hailar",
|
"value": "hailar",
|
||||||
"label": "\u6d77\u62c9\u5c14",
|
"label": "\u822a\u73ed",
|
||||||
"sort": 1,
|
"sort": 1,
|
||||||
"status": "ACTIVE"
|
"status": "ACTIVE"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"value": "manzhouli",
|
"value": "manzhouli",
|
||||||
"label": "\u6ee1\u6d32\u91cc",
|
"label": "\u706b\u8f66",
|
||||||
"sort": 2,
|
"sort": 2,
|
||||||
"status": "ACTIVE"
|
"status": "ACTIVE"
|
||||||
},
|
},
|
||||||
@ -675,25 +675,25 @@
|
|||||||
"items": [
|
"items": [
|
||||||
{
|
{
|
||||||
"value": "hailar",
|
"value": "hailar",
|
||||||
"label": "\u6d77\u62c9\u5c14",
|
"label": "\u5168\u56fd\u65c5\u6e38\u76d1\u7ba1\u5e73\u53f0",
|
||||||
"sort": 1,
|
"sort": 1,
|
||||||
"status": "ACTIVE"
|
"status": "ACTIVE"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"value": "manzhouli",
|
"value": "manzhouli",
|
||||||
"label": "\u6ee1\u6d32\u91cc",
|
"label": "\u6cd5\u5927\u5927",
|
||||||
"sort": 2,
|
"sort": 2,
|
||||||
"status": "ACTIVE"
|
"status": "ACTIVE"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"value": "eergu",
|
"value": "eergu",
|
||||||
"label": "\u989d\u5c14\u53e4\u7eb3",
|
"label": "e\u7b7e\u5b9d",
|
||||||
"sort": 3,
|
"sort": 3,
|
||||||
"status": "ACTIVE"
|
"status": "ACTIVE"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"value": "genhe",
|
"value": "genhe",
|
||||||
"label": "\u6839\u6cb3",
|
"label": "\u817e\u8baf\u7535\u5b50\u7b7e",
|
||||||
"sort": 4,
|
"sort": 4,
|
||||||
"status": "ACTIVE"
|
"status": "ACTIVE"
|
||||||
},
|
},
|
||||||
@ -4171,6 +4171,12 @@
|
|||||||
"category": "BUSINESS",
|
"category": "BUSINESS",
|
||||||
"remark": "Room-level facilities",
|
"remark": "Room-level facilities",
|
||||||
"items": [
|
"items": [
|
||||||
|
{
|
||||||
|
"value": "wired_net",
|
||||||
|
"label": "\u6709\u7ebf\u5bbd\u5e26",
|
||||||
|
"sort": 1,
|
||||||
|
"status": "ACTIVE"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"value": "kettle",
|
"value": "kettle",
|
||||||
"label": "\u70ed\u6c34\u58f6",
|
"label": "\u70ed\u6c34\u58f6",
|
||||||
@ -4202,9 +4208,9 @@
|
|||||||
"status": "ACTIVE"
|
"status": "ACTIVE"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"value": "wired_net",
|
"value": "smart_tv",
|
||||||
"label": "\u6709\u7ebf\u5bbd\u5e26",
|
"label": "\u667a\u80fd\u7535\u89c6",
|
||||||
"sort": 1,
|
"sort": 2,
|
||||||
"status": "ACTIVE"
|
"status": "ACTIVE"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -4238,9 +4244,9 @@
|
|||||||
"status": "ACTIVE"
|
"status": "ACTIVE"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"value": "smart_tv",
|
"value": "phone",
|
||||||
"label": "\u667a\u80fd\u7535\u89c6",
|
"label": "\u72ec\u7acb\u7535\u8bdd",
|
||||||
"sort": 2,
|
"sort": 3,
|
||||||
"status": "ACTIVE"
|
"status": "ACTIVE"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -4273,12 +4279,6 @@
|
|||||||
"sort": 3,
|
"sort": 3,
|
||||||
"status": "ACTIVE"
|
"status": "ACTIVE"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"value": "phone",
|
|
||||||
"label": "\u72ec\u7acb\u7535\u8bdd",
|
|
||||||
"sort": 3,
|
|
||||||
"status": "ACTIVE"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"value": "corner_guard",
|
"value": "corner_guard",
|
||||||
"label": "\u9632\u649e\u89d2",
|
"label": "\u9632\u649e\u89d2",
|
||||||
@ -4315,6 +4315,12 @@
|
|||||||
"sort": 4,
|
"sort": 4,
|
||||||
"status": "ACTIVE"
|
"status": "ACTIVE"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"value": "coffee",
|
||||||
|
"label": "\u5496\u5561\u673a",
|
||||||
|
"sort": 5,
|
||||||
|
"status": "ACTIVE"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"value": "bath_towel",
|
"value": "bath_towel",
|
||||||
"label": "\u6d74\u5dfe",
|
"label": "\u6d74\u5dfe",
|
||||||
@ -4339,12 +4345,6 @@
|
|||||||
"sort": 5,
|
"sort": 5,
|
||||||
"status": "ACTIVE"
|
"status": "ACTIVE"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"value": "coffee",
|
|
||||||
"label": "\u5496\u5561\u673a",
|
|
||||||
"sort": 5,
|
|
||||||
"status": "ACTIVE"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"value": "bathtub",
|
"value": "bathtub",
|
||||||
"label": "\u6d74\u7f38",
|
"label": "\u6d74\u7f38",
|
||||||
@ -4375,18 +4375,6 @@
|
|||||||
"sort": 6,
|
"sort": 6,
|
||||||
"status": "ACTIVE"
|
"status": "ACTIVE"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"value": "bathrobe",
|
|
||||||
"label": "\u6d74\u888d",
|
|
||||||
"sort": 7,
|
|
||||||
"status": "ACTIVE"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"value": "mirror",
|
|
||||||
"label": "\u5168\u8eab\u955c",
|
|
||||||
"sort": 7,
|
|
||||||
"status": "ACTIVE"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"value": "balcony",
|
"value": "balcony",
|
||||||
"label": "\u9633\u53f0",
|
"label": "\u9633\u53f0",
|
||||||
@ -4399,6 +4387,18 @@
|
|||||||
"sort": 7,
|
"sort": 7,
|
||||||
"status": "ACTIVE"
|
"status": "ACTIVE"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"value": "bathrobe",
|
||||||
|
"label": "\u6d74\u888d",
|
||||||
|
"sort": 7,
|
||||||
|
"status": "ACTIVE"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"value": "mirror",
|
||||||
|
"label": "\u5168\u8eab\u955c",
|
||||||
|
"sort": 7,
|
||||||
|
"status": "ACTIVE"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"value": "power_220v",
|
"value": "power_220v",
|
||||||
"label": "220V\u7535\u6e90\u63d2\u5ea7",
|
"label": "220V\u7535\u6e90\u63d2\u5ea7",
|
||||||
@ -4989,6 +4989,12 @@
|
|||||||
"remark": "",
|
"remark": "",
|
||||||
"items": []
|
"items": []
|
||||||
},
|
},
|
||||||
|
"transport_type": {
|
||||||
|
"name": "\u4ea4\u901a\u7c7b\u578b",
|
||||||
|
"category": "ORDER",
|
||||||
|
"remark": "\u8ba2\u5355\u4ea4\u901a\u4fe1\u606f\u7c7b\u578b\uff1a\u822a\u73ed/\u706b\u8f66",
|
||||||
|
"items": []
|
||||||
|
},
|
||||||
"traveler_type": {
|
"traveler_type": {
|
||||||
"name": "\u51fa\u884c\u4eba\u7c7b\u578b",
|
"name": "\u51fa\u884c\u4eba\u7c7b\u578b",
|
||||||
"category": "BUSINESS",
|
"category": "BUSINESS",
|
||||||
|
|||||||
文件差异内容过多而无法显示
加载差异
@ -0,0 +1,470 @@
|
|||||||
|
# 接口变更记录 — 2026-03-18 20:48
|
||||||
|
|
||||||
|
> **提交** `a6d360a` · **作者** wx · **时间** 2026-03-18 20:48:58 +0800
|
||||||
|
>
|
||||||
|
> feat: 订单交通信息管理 + 合同平台选择 + 超时通知 + transport-service
|
||||||
|
|
||||||
|
## 变更总览
|
||||||
|
|
||||||
|
- **hl-transport-service**
|
||||||
|
- 🆕 AdminTransport (+7 接口)
|
||||||
|
- **合同服务**
|
||||||
|
- AdminContract (+1)
|
||||||
|
- **订单服务**
|
||||||
|
- AdminOrder (+2)
|
||||||
|
- MpOrder (+2)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## hl-transport-service
|
||||||
|
|
||||||
|
### 🆕 新增: AdminTransport
|
||||||
|
|
||||||
|
### 📌 `GET` /admin/transport/flight/by-flight-no — 按航班号查询航班动态
|
||||||
|
|
||||||
|
**参数**
|
||||||
|
|
||||||
|
- `flightNo` (`String`) — 查询参数
|
||||||
|
- `date` (`String`) — 查询参数
|
||||||
|
|
||||||
|
**响应** `Result<List<FlightVO>>`
|
||||||
|
|
||||||
|
| 字段 | 类型 | 说明 |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| `flightNo` | `String` | 航班号 |
|
||||||
|
| `airline` | `String` | 航空公司名称 |
|
||||||
|
| `category` | `String` | 航班属性:国内/国际/地区 |
|
||||||
|
| `departAirportCode` | `String` | 出发机场三字码 |
|
||||||
|
| `arriveAirportCode` | `String` | 到达机场三字码 |
|
||||||
|
| `departAirport` | `String` | 出发机场名称 |
|
||||||
|
| `arriveAirport` | `String` | 到达机场名称 |
|
||||||
|
| `departCity` | `String` | 出发城市 |
|
||||||
|
| `arriveCity` | `String` | 到达城市 |
|
||||||
|
| `planDepartTime` | `String` | 计划起飞时间(yyyy-MM-dd HH:mm:ss) |
|
||||||
|
| `planArriveTime` | `String` | 计划到达时间(yyyy-MM-dd HH:mm:ss) |
|
||||||
|
| `actualDepartTime` | `String` | 实际起飞时间(yyyy-MM-dd HH:mm:ss) |
|
||||||
|
| `actualArriveTime` | `String` | 实际到达时间(yyyy-MM-dd HH:mm:ss) |
|
||||||
|
| `status` | `String` | 航班状态:计划/起飞/到达/延误/取消/返航/备降等 |
|
||||||
|
| `stopFlag` | `String` | 是否经停:0不经停,1经停1次,n经停n次 |
|
||||||
|
| `shareFlag` | `String` | 是否共享航班:0否,1是 |
|
||||||
|
| `shareFlightNo` | `String` | 共享航班号(实际承运航班号) |
|
||||||
|
| `departTerminal` | `String` | 出发航站楼 |
|
||||||
|
| `arriveTerminal` | `String` | 到达航站楼 |
|
||||||
|
| `boardGate` | `String` | 登机口 |
|
||||||
|
| `arriveExit` | `String` | 到达出口 |
|
||||||
|
| `departTimezone` | `String` | 出发时区偏移(秒) |
|
||||||
|
| `arriveTimezone` | `String` | 到达时区偏移(秒) |
|
||||||
|
|
||||||
|
### 📌 `GET` /admin/transport/flight/by-airport — 按机场三字码查询航班动态
|
||||||
|
|
||||||
|
**参数**
|
||||||
|
|
||||||
|
- `dep` (`String`) — 查询参数
|
||||||
|
- `arr` (`String`) — 查询参数
|
||||||
|
- `date` (`String`) — 查询参数
|
||||||
|
|
||||||
|
**响应** `Result<List<FlightVO>>`
|
||||||
|
|
||||||
|
| 字段 | 类型 | 说明 |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| `flightNo` | `String` | 航班号 |
|
||||||
|
| `airline` | `String` | 航空公司名称 |
|
||||||
|
| `category` | `String` | 航班属性:国内/国际/地区 |
|
||||||
|
| `departAirportCode` | `String` | 出发机场三字码 |
|
||||||
|
| `arriveAirportCode` | `String` | 到达机场三字码 |
|
||||||
|
| `departAirport` | `String` | 出发机场名称 |
|
||||||
|
| `arriveAirport` | `String` | 到达机场名称 |
|
||||||
|
| `departCity` | `String` | 出发城市 |
|
||||||
|
| `arriveCity` | `String` | 到达城市 |
|
||||||
|
| `planDepartTime` | `String` | 计划起飞时间(yyyy-MM-dd HH:mm:ss) |
|
||||||
|
| `planArriveTime` | `String` | 计划到达时间(yyyy-MM-dd HH:mm:ss) |
|
||||||
|
| `actualDepartTime` | `String` | 实际起飞时间(yyyy-MM-dd HH:mm:ss) |
|
||||||
|
| `actualArriveTime` | `String` | 实际到达时间(yyyy-MM-dd HH:mm:ss) |
|
||||||
|
| `status` | `String` | 航班状态:计划/起飞/到达/延误/取消/返航/备降等 |
|
||||||
|
| `stopFlag` | `String` | 是否经停:0不经停,1经停1次,n经停n次 |
|
||||||
|
| `shareFlag` | `String` | 是否共享航班:0否,1是 |
|
||||||
|
| `shareFlightNo` | `String` | 共享航班号(实际承运航班号) |
|
||||||
|
| `departTerminal` | `String` | 出发航站楼 |
|
||||||
|
| `arriveTerminal` | `String` | 到达航站楼 |
|
||||||
|
| `boardGate` | `String` | 登机口 |
|
||||||
|
| `arriveExit` | `String` | 到达出口 |
|
||||||
|
| `departTimezone` | `String` | 出发时区偏移(秒) |
|
||||||
|
| `arriveTimezone` | `String` | 到达时区偏移(秒) |
|
||||||
|
|
||||||
|
### 📌 `GET` /admin/transport/flight/by-city — 按城市三字码查询航班动态
|
||||||
|
|
||||||
|
**参数**
|
||||||
|
|
||||||
|
- `depCity` (`String`) — 查询参数
|
||||||
|
- `arrCity` (`String`) — 查询参数
|
||||||
|
- `date` (`String`) — 查询参数
|
||||||
|
|
||||||
|
**响应** `Result<List<FlightVO>>`
|
||||||
|
|
||||||
|
| 字段 | 类型 | 说明 |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| `flightNo` | `String` | 航班号 |
|
||||||
|
| `airline` | `String` | 航空公司名称 |
|
||||||
|
| `category` | `String` | 航班属性:国内/国际/地区 |
|
||||||
|
| `departAirportCode` | `String` | 出发机场三字码 |
|
||||||
|
| `arriveAirportCode` | `String` | 到达机场三字码 |
|
||||||
|
| `departAirport` | `String` | 出发机场名称 |
|
||||||
|
| `arriveAirport` | `String` | 到达机场名称 |
|
||||||
|
| `departCity` | `String` | 出发城市 |
|
||||||
|
| `arriveCity` | `String` | 到达城市 |
|
||||||
|
| `planDepartTime` | `String` | 计划起飞时间(yyyy-MM-dd HH:mm:ss) |
|
||||||
|
| `planArriveTime` | `String` | 计划到达时间(yyyy-MM-dd HH:mm:ss) |
|
||||||
|
| `actualDepartTime` | `String` | 实际起飞时间(yyyy-MM-dd HH:mm:ss) |
|
||||||
|
| `actualArriveTime` | `String` | 实际到达时间(yyyy-MM-dd HH:mm:ss) |
|
||||||
|
| `status` | `String` | 航班状态:计划/起飞/到达/延误/取消/返航/备降等 |
|
||||||
|
| `stopFlag` | `String` | 是否经停:0不经停,1经停1次,n经停n次 |
|
||||||
|
| `shareFlag` | `String` | 是否共享航班:0否,1是 |
|
||||||
|
| `shareFlightNo` | `String` | 共享航班号(实际承运航班号) |
|
||||||
|
| `departTerminal` | `String` | 出发航站楼 |
|
||||||
|
| `arriveTerminal` | `String` | 到达航站楼 |
|
||||||
|
| `boardGate` | `String` | 登机口 |
|
||||||
|
| `arriveExit` | `String` | 到达出口 |
|
||||||
|
| `departTimezone` | `String` | 出发时区偏移(秒) |
|
||||||
|
| `arriveTimezone` | `String` | 到达时区偏移(秒) |
|
||||||
|
|
||||||
|
### 📌 `GET` /admin/transport/train/by-train-no-stations — 按车次+出发站+到达站查询火车动态
|
||||||
|
|
||||||
|
**参数**
|
||||||
|
|
||||||
|
- `trainNo` (`String`) — 查询参数
|
||||||
|
- `dep` (`String`) — 查询参数
|
||||||
|
- `arr` (`String`) — 查询参数
|
||||||
|
- `date` (`String`) — 查询参数
|
||||||
|
|
||||||
|
**响应** `Result<List<TrainVO>>`
|
||||||
|
|
||||||
|
| 字段 | 类型 | 说明 |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| `trainNo` | `String` | 车次 |
|
||||||
|
| `departStation` | `String` | 出发车站 |
|
||||||
|
| `arriveStation` | `String` | 到达车站 |
|
||||||
|
| `shutdown` | `String` | 是否停运:0否,1是 |
|
||||||
|
| `planDepartTime` | `String` | 计划出发时间 |
|
||||||
|
| `planArriveTime` | `String` | 计划到达时间 |
|
||||||
|
| `estimatedDepartTime` | `String` | 预计出发时间 |
|
||||||
|
| `estimatedArriveTime` | `String` | 预计到达时间 |
|
||||||
|
| `actualDepartTime` | `String` | 实际出发时间 |
|
||||||
|
| `actualArriveTime` | `String` | 实际到达时间 |
|
||||||
|
| `departStatus` | `String` | 出发状态:计划/正点/晚点/出发 |
|
||||||
|
| `arriveStatus` | `String` | 到达状态:计划/正点/晚点/到达 |
|
||||||
|
| `duration` | `Integer` | 运行时长(分钟) |
|
||||||
|
| `stops` | `List<TrainStopVO>` | 经停站列表 |
|
||||||
|
|
||||||
|
### 📌 `GET` /admin/transport/train/by-train-no — 按车次查询火车动态(含全部经停站)
|
||||||
|
|
||||||
|
**参数**
|
||||||
|
|
||||||
|
- `trainNo` (`String`) — 查询参数
|
||||||
|
- `date` (`String`) — 查询参数
|
||||||
|
|
||||||
|
**响应** `Result<List<TrainVO>>`
|
||||||
|
|
||||||
|
| 字段 | 类型 | 说明 |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| `trainNo` | `String` | 车次 |
|
||||||
|
| `departStation` | `String` | 出发车站 |
|
||||||
|
| `arriveStation` | `String` | 到达车站 |
|
||||||
|
| `shutdown` | `String` | 是否停运:0否,1是 |
|
||||||
|
| `planDepartTime` | `String` | 计划出发时间 |
|
||||||
|
| `planArriveTime` | `String` | 计划到达时间 |
|
||||||
|
| `estimatedDepartTime` | `String` | 预计出发时间 |
|
||||||
|
| `estimatedArriveTime` | `String` | 预计到达时间 |
|
||||||
|
| `actualDepartTime` | `String` | 实际出发时间 |
|
||||||
|
| `actualArriveTime` | `String` | 实际到达时间 |
|
||||||
|
| `departStatus` | `String` | 出发状态:计划/正点/晚点/出发 |
|
||||||
|
| `arriveStatus` | `String` | 到达状态:计划/正点/晚点/到达 |
|
||||||
|
| `duration` | `Integer` | 运行时长(分钟) |
|
||||||
|
| `stops` | `List<TrainStopVO>` | 经停站列表 |
|
||||||
|
|
||||||
|
### 📌 `GET` /admin/transport/train/by-station — 按出发站+到达站查询火车车次
|
||||||
|
|
||||||
|
**参数**
|
||||||
|
|
||||||
|
- `dep` (`String`) — 查询参数
|
||||||
|
- `arr` (`String`) — 查询参数
|
||||||
|
- `date` (`String`) — 查询参数
|
||||||
|
|
||||||
|
**响应** `Result<List<TrainVO>>`
|
||||||
|
|
||||||
|
| 字段 | 类型 | 说明 |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| `trainNo` | `String` | 车次 |
|
||||||
|
| `departStation` | `String` | 出发车站 |
|
||||||
|
| `arriveStation` | `String` | 到达车站 |
|
||||||
|
| `shutdown` | `String` | 是否停运:0否,1是 |
|
||||||
|
| `planDepartTime` | `String` | 计划出发时间 |
|
||||||
|
| `planArriveTime` | `String` | 计划到达时间 |
|
||||||
|
| `estimatedDepartTime` | `String` | 预计出发时间 |
|
||||||
|
| `estimatedArriveTime` | `String` | 预计到达时间 |
|
||||||
|
| `actualDepartTime` | `String` | 实际出发时间 |
|
||||||
|
| `actualArriveTime` | `String` | 实际到达时间 |
|
||||||
|
| `departStatus` | `String` | 出发状态:计划/正点/晚点/出发 |
|
||||||
|
| `arriveStatus` | `String` | 到达状态:计划/正点/晚点/到达 |
|
||||||
|
| `duration` | `Integer` | 运行时长(分钟) |
|
||||||
|
| `stops` | `List<TrainStopVO>` | 经停站列表 |
|
||||||
|
|
||||||
|
### 📌 `GET` /admin/transport/train/by-city — 按出发城市+到达城市查询火车车次
|
||||||
|
|
||||||
|
**参数**
|
||||||
|
|
||||||
|
- `depCity` (`String`) — 查询参数
|
||||||
|
- `arrCity` (`String`) — 查询参数
|
||||||
|
- `date` (`String`) — 查询参数
|
||||||
|
|
||||||
|
**响应** `Result<List<TrainVO>>`
|
||||||
|
|
||||||
|
| 字段 | 类型 | 说明 |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| `trainNo` | `String` | 车次 |
|
||||||
|
| `departStation` | `String` | 出发车站 |
|
||||||
|
| `arriveStation` | `String` | 到达车站 |
|
||||||
|
| `shutdown` | `String` | 是否停运:0否,1是 |
|
||||||
|
| `planDepartTime` | `String` | 计划出发时间 |
|
||||||
|
| `planArriveTime` | `String` | 计划到达时间 |
|
||||||
|
| `estimatedDepartTime` | `String` | 预计出发时间 |
|
||||||
|
| `estimatedArriveTime` | `String` | 预计到达时间 |
|
||||||
|
| `actualDepartTime` | `String` | 实际出发时间 |
|
||||||
|
| `actualArriveTime` | `String` | 实际到达时间 |
|
||||||
|
| `departStatus` | `String` | 出发状态:计划/正点/晚点/出发 |
|
||||||
|
| `arriveStatus` | `String` | 到达状态:计划/正点/晚点/到达 |
|
||||||
|
| `duration` | `Integer` | 运行时长(分钟) |
|
||||||
|
| `stops` | `List<TrainStopVO>` | 经停站列表 |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 合同服务
|
||||||
|
|
||||||
|
### AdminContract
|
||||||
|
|
||||||
|
> 📖 **接口文档**: [http://192.168.100.236:8095/doc.html](http://192.168.100.236:8095/doc.html) → 标签 **「合同管理」**
|
||||||
|
|
||||||
|
### 🆕 `GET` /admin/contract/platforms — 可用合同平台列表
|
||||||
|
|
||||||
|
> 返回系统已对接的合同平台列表及可用状态。
|
||||||
|
|
||||||
|
**响应** `Result<List<ContractPlatformInfo>>`
|
||||||
|
|
||||||
|
| 字段 | 类型 | 说明 |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| `platformName` | `String` | |
|
||||||
|
| `displayName` | `String` | |
|
||||||
|
| `available` | `boolean` | |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 订单服务
|
||||||
|
|
||||||
|
### AdminOrder
|
||||||
|
|
||||||
|
> 📖 **接口文档**: [http://192.168.100.236:8084/doc.html](http://192.168.100.236:8084/doc.html) → 分组 **「3.1 订单管理」** → 标签 **「管理端订单接口」**
|
||||||
|
|
||||||
|
### 🆕 `PUT` /admin/order/{orderId}/transport — 保存交通信息(航班/车次)
|
||||||
|
|
||||||
|
> 为订单保存交通信息,支持多条航班和车次。每次提交为全量替换(先删后增)。
|
||||||
|
|
||||||
|
**参数**
|
||||||
|
|
||||||
|
- `{orderId}` (`Long`) — 路径参数:订单ID
|
||||||
|
|
||||||
|
**请求体** `TransportSegmentRequest`
|
||||||
|
|
||||||
|
| 字段 | 类型 | 说明 |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| `segments` | `List<SegmentItem>` | 交通分段列表 |
|
||||||
|
| `transportType` | `String` | 交通类型(字典:transport_type): FLIGHT-航班, TRAIN-火车 |
|
||||||
|
| `transportNo` | `String` | 航班号/车次号 |
|
||||||
|
| `departStation` | `String` | 出发站/出发机场 |
|
||||||
|
| `arriveStation` | `String` | 到达站/到达机场 |
|
||||||
|
| `departTime` | `LocalDateTime` | 出发时间 |
|
||||||
|
| `arriveTime` | `LocalDateTime` | 到达时间 |
|
||||||
|
| `remark` | `String` | 备注 |
|
||||||
|
|
||||||
|
**响应** `Result<List<OrderTransportSegment>>`
|
||||||
|
|
||||||
|
| 字段 | 类型 | 说明 |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| `segmentId` | `Long` | 分段ID |
|
||||||
|
| `orderId` | `Long` | 订单ID |
|
||||||
|
| `transportType` | `String` | 交通类型(字典:transport_type): FLIGHT-航班, TRAIN-火车 |
|
||||||
|
| `transportNo` | `String` | 航班号/车次号 |
|
||||||
|
| `departStation` | `String` | 出发站/出发机场 |
|
||||||
|
| `arriveStation` | `String` | 到达站/到达机场 |
|
||||||
|
| `departTime` | `LocalDateTime` | 出发时间 |
|
||||||
|
| `arriveTime` | `LocalDateTime` | 到达时间 |
|
||||||
|
| `remark` | `String` | 备注 |
|
||||||
|
| `sortOrder` | `Integer` | 排序序号 |
|
||||||
|
| `deletedAt` | `LocalDateTime` | 删除时间(软删除) |
|
||||||
|
| `createTime` | `LocalDateTime` | 创建时间 |
|
||||||
|
| `updateTime` | `LocalDateTime` | 更新时间 |
|
||||||
|
|
||||||
|
### 🆕 `GET` /admin/order/{orderId}/transport — 查询交通信息
|
||||||
|
|
||||||
|
> 查询订单的所有交通信息(航班/车次),按排序序号和出发时间升序排列
|
||||||
|
|
||||||
|
**参数**
|
||||||
|
|
||||||
|
- `{orderId}` (`Long`) — 路径参数:订单ID
|
||||||
|
|
||||||
|
**响应** `Result<List<OrderTransportSegment>>`
|
||||||
|
|
||||||
|
| 字段 | 类型 | 说明 |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| `segmentId` | `Long` | 分段ID |
|
||||||
|
| `orderId` | `Long` | 订单ID |
|
||||||
|
| `transportType` | `String` | 交通类型(字典:transport_type): FLIGHT-航班, TRAIN-火车 |
|
||||||
|
| `transportNo` | `String` | 航班号/车次号 |
|
||||||
|
| `departStation` | `String` | 出发站/出发机场 |
|
||||||
|
| `arriveStation` | `String` | 到达站/到达机场 |
|
||||||
|
| `departTime` | `LocalDateTime` | 出发时间 |
|
||||||
|
| `arriveTime` | `LocalDateTime` | 到达时间 |
|
||||||
|
| `remark` | `String` | 备注 |
|
||||||
|
| `sortOrder` | `Integer` | 排序序号 |
|
||||||
|
| `deletedAt` | `LocalDateTime` | 删除时间(软删除) |
|
||||||
|
| `createTime` | `LocalDateTime` | 创建时间 |
|
||||||
|
| `updateTime` | `LocalDateTime` | 更新时间 |
|
||||||
|
|
||||||
|
### MpOrder
|
||||||
|
|
||||||
|
> 📖 **接口文档**: [http://192.168.100.236:8084/doc.html](http://192.168.100.236:8084/doc.html) → 标签 **「C端订单接口」**
|
||||||
|
|
||||||
|
### 🆕 `PUT` /mp/order/{orderId}/transport — 保存交通信息(航班/车次)
|
||||||
|
|
||||||
|
> 用户为自己的订单录入交通信息,支持多条航班和车次。每次提交为全量替换。
|
||||||
|
|
||||||
|
**参数**
|
||||||
|
|
||||||
|
- `{orderId}` (`Long`) — 路径参数:订单ID
|
||||||
|
|
||||||
|
**请求体** `TransportSegmentRequest`
|
||||||
|
|
||||||
|
| 字段 | 类型 | 说明 |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| `segments` | `List<SegmentItem>` | 交通分段列表 |
|
||||||
|
| `transportType` | `String` | 交通类型(字典:transport_type): FLIGHT-航班, TRAIN-火车 |
|
||||||
|
| `transportNo` | `String` | 航班号/车次号 |
|
||||||
|
| `departStation` | `String` | 出发站/出发机场 |
|
||||||
|
| `arriveStation` | `String` | 到达站/到达机场 |
|
||||||
|
| `departTime` | `LocalDateTime` | 出发时间 |
|
||||||
|
| `arriveTime` | `LocalDateTime` | 到达时间 |
|
||||||
|
| `remark` | `String` | 备注 |
|
||||||
|
|
||||||
|
**响应** `Result<List<OrderTransportSegment>>`
|
||||||
|
|
||||||
|
| 字段 | 类型 | 说明 |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| `segmentId` | `Long` | 分段ID |
|
||||||
|
| `orderId` | `Long` | 订单ID |
|
||||||
|
| `transportType` | `String` | 交通类型(字典:transport_type): FLIGHT-航班, TRAIN-火车 |
|
||||||
|
| `transportNo` | `String` | 航班号/车次号 |
|
||||||
|
| `departStation` | `String` | 出发站/出发机场 |
|
||||||
|
| `arriveStation` | `String` | 到达站/到达机场 |
|
||||||
|
| `departTime` | `LocalDateTime` | 出发时间 |
|
||||||
|
| `arriveTime` | `LocalDateTime` | 到达时间 |
|
||||||
|
| `remark` | `String` | 备注 |
|
||||||
|
| `sortOrder` | `Integer` | 排序序号 |
|
||||||
|
| `deletedAt` | `LocalDateTime` | 删除时间(软删除) |
|
||||||
|
| `createTime` | `LocalDateTime` | 创建时间 |
|
||||||
|
| `updateTime` | `LocalDateTime` | 更新时间 |
|
||||||
|
|
||||||
|
### 🆕 `GET` /mp/order/{orderId}/transport — 查询交通信息
|
||||||
|
|
||||||
|
> 查询自己订单的所有交通信息(航班/车次)
|
||||||
|
|
||||||
|
**参数**
|
||||||
|
|
||||||
|
- `{orderId}` (`Long`) — 路径参数:订单ID
|
||||||
|
|
||||||
|
**响应** `Result<List<OrderTransportSegment>>`
|
||||||
|
|
||||||
|
| 字段 | 类型 | 说明 |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| `segmentId` | `Long` | 分段ID |
|
||||||
|
| `orderId` | `Long` | 订单ID |
|
||||||
|
| `transportType` | `String` | 交通类型(字典:transport_type): FLIGHT-航班, TRAIN-火车 |
|
||||||
|
| `transportNo` | `String` | 航班号/车次号 |
|
||||||
|
| `departStation` | `String` | 出发站/出发机场 |
|
||||||
|
| `arriveStation` | `String` | 到达站/到达机场 |
|
||||||
|
| `departTime` | `LocalDateTime` | 出发时间 |
|
||||||
|
| `arriveTime` | `LocalDateTime` | 到达时间 |
|
||||||
|
| `remark` | `String` | 备注 |
|
||||||
|
| `sortOrder` | `Integer` | 排序序号 |
|
||||||
|
| `deletedAt` | `LocalDateTime` | 删除时间(软删除) |
|
||||||
|
| `createTime` | `LocalDateTime` | 创建时间 |
|
||||||
|
| `updateTime` | `LocalDateTime` | 更新时间 |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 📦 其他数据对象变更
|
||||||
|
|
||||||
|
> 以下变更未直接关联到本次接口变更,但可能影响现有接口的请求/响应
|
||||||
|
|
||||||
|
### hl-transport-service
|
||||||
|
|
||||||
|
#### 🆕 TrainStopVO
|
||||||
|
|
||||||
|
| 字段 | 类型 | 说明 |
|
||||||
|
| --- | --- | --- |
|
||||||
|
| `stationName` | `String` | 车站名称 |
|
||||||
|
| `arriveTime` | `String` | 到站时间 |
|
||||||
|
| `departTime` | `String` | 发车时间 |
|
||||||
|
|
||||||
|
### 合同服务
|
||||||
|
|
||||||
|
#### ✏️ CreateContractRequest
|
||||||
|
|
||||||
|
- 🆕 `platform` (`String`) — 合同平台(字典:contract_platform): 12301-全国旅游监管平台, FADADA-法大大, ESIGN-e签宝, TENCENT_ESS-腾讯电子签。不传则根据模板自动确定
|
||||||
|
|
||||||
|
#### ✏️ ReportContractRequest
|
||||||
|
|
||||||
|
- 🆕 `platform` (`String`) — 合同平台(字典:contract_platform): 12301-全国旅游监管平台, FADADA-法大大, ESIGN-e签宝, TENCENT_ESS-腾讯电子签
|
||||||
|
|
||||||
|
### 订单服务
|
||||||
|
|
||||||
|
#### ✏️ OrderDetailVO
|
||||||
|
|
||||||
|
- 🆕 `transportSegments` (`List<OrderTransportSegment>`) — 交通信息列表(航班/车次,含transportType/transportNo/departStation/arriveStation/departTime/arriveTime等)
|
||||||
|
|
||||||
|
<details>
|
||||||
|
<summary>📁 全部变更文件 (点击展开)</summary>
|
||||||
|
|
||||||
|
```
|
||||||
|
M hl-contract-service/src/main/java/com/hulalv/contract/controller/AdminContractController.java
|
||||||
|
M hl-contract-service/src/main/java/com/hulalv/contract/dto/CreateContractRequest.java
|
||||||
|
M hl-contract-service/src/main/java/com/hulalv/contract/dto/ReportContractRequest.java
|
||||||
|
M hl-contract-service/src/main/java/com/hulalv/contract/service/ContractService.java
|
||||||
|
M hl-gateway/src/main/resources/application.yml
|
||||||
|
M hl-order-service/src/main/java/com/hulalv/order/controller/AdminOrderController.java
|
||||||
|
M hl-order-service/src/main/java/com/hulalv/order/controller/MpOrderController.java
|
||||||
|
A hl-order-service/src/main/java/com/hulalv/order/dto/TransportSegmentRequest.java
|
||||||
|
A hl-order-service/src/main/java/com/hulalv/order/entity/OrderTransportSegment.java
|
||||||
|
A hl-order-service/src/main/java/com/hulalv/order/mapper/OrderTransportSegmentMapper.java
|
||||||
|
M hl-order-service/src/main/java/com/hulalv/order/service/OrderService.java
|
||||||
|
A hl-order-service/src/main/java/com/hulalv/order/service/OrderTransportSegmentService.java
|
||||||
|
M hl-order-service/src/main/java/com/hulalv/order/vo/OrderDetailVO.java
|
||||||
|
M hl-order-service/src/test/java/com/hulalv/order/service/OrderServiceTest.java
|
||||||
|
A hl-transport-service/pom.xml
|
||||||
|
A hl-transport-service/src/main/java/com/hulalv/transport/TransportServiceApplication.java
|
||||||
|
A hl-transport-service/src/main/java/com/hulalv/transport/config/Knife4jConfig.java
|
||||||
|
A hl-transport-service/src/main/java/com/hulalv/transport/config/RestTemplateConfig.java
|
||||||
|
A hl-transport-service/src/main/java/com/hulalv/transport/config/VariFlightProperties.java
|
||||||
|
A hl-transport-service/src/main/java/com/hulalv/transport/config/WebMvcConfig.java
|
||||||
|
A hl-transport-service/src/main/java/com/hulalv/transport/constant/TransportConstants.java
|
||||||
|
A hl-transport-service/src/main/java/com/hulalv/transport/controller/AdminTransportController.java
|
||||||
|
A hl-transport-service/src/main/java/com/hulalv/transport/interceptor/AdminAuthInterceptor.java
|
||||||
|
A hl-transport-service/src/main/java/com/hulalv/transport/service/FlightService.java
|
||||||
|
A hl-transport-service/src/main/java/com/hulalv/transport/service/TrainService.java
|
||||||
|
A hl-transport-service/src/main/java/com/hulalv/transport/service/VariFlightApiClient.java
|
||||||
|
A hl-transport-service/src/main/java/com/hulalv/transport/vo/FlightVO.java
|
||||||
|
A hl-transport-service/src/main/java/com/hulalv/transport/vo/TrainStopVO.java
|
||||||
|
A hl-transport-service/src/main/java/com/hulalv/transport/vo/TrainVO.java
|
||||||
|
A hl-transport-service/src/main/resources/bootstrap.yml
|
||||||
|
A nacos-config/hl-transport-service-dev.yml
|
||||||
|
M pom.xml
|
||||||
|
A sql/order_transport_segment.sql
|
||||||
|
```
|
||||||
|
</details>
|
||||||
正在加载...
x
在新工单中引用
屏蔽一个用户