From 315c5a3aee7493e6d8e5074744ba01d79c1e9c9b Mon Sep 17 00:00:00 2001 From: API Changelog Bot Date: Tue, 17 Mar 2026 11:11:23 +0800 Subject: [PATCH] =?UTF-8?q?changelog:=2023692ba=20-=20fix:=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8DSwagger=E6=B3=A8=E8=A7=A3=E4=B8=AD=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E4=B8=8E=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .swagger/hl-payment-service.json | 174 +++++++++++++----- .../2026-03-17_1111_23692ba_fix_Swagger.md | 62 +++++++ 2 files changed, 194 insertions(+), 42 deletions(-) create mode 100644 changelogs/2026-03/2026-03-17_1111_23692ba_fix_Swagger.md diff --git a/.swagger/hl-payment-service.json b/.swagger/hl-payment-service.json index 6ed75b8..3549ac1 100644 --- a/.swagger/hl-payment-service.json +++ b/.swagger/hl-payment-service.json @@ -89,8 +89,8 @@ "200": { "description": "OK", "schema": { - "originalRef": "统一响应结果«分页结果«支付交易信息»»", - "$ref": "#/definitions/统一响应结果«分页结果«支付交易信息»»" + "$ref": "#/definitions/统一响应结果«分页结果«支付交易信息»»", + "originalRef": "统一响应结果«分页结果«支付交易信息»»" } }, "401": { @@ -107,8 +107,59 @@ "200": { "description": "OK", "schema": { - "originalRef": "统一响应结果«分页结果«支付交易信息»»", - "$ref": "#/definitions/统一响应结果«分页结果«支付交易信息»»" + "$ref": "#/definitions/统一响应结果«分页结果«支付交易信息»»", + "originalRef": "统一响应结果«分页结果«支付交易信息»»" + } + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "deprecated": false, + "x-order": "2147483647" + } + }, + "/admin/payment/merchants": { + "get": { + "tags": [ + "支付管理" + ], + "summary": "商户号列表", + "description": "返回所有已配置的微信支付商户号，用于下拉选择", + "operationId": "listMerchantsUsingGET", + "produces": [ + "*/*" + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/统一响应结果«List«商户号信息»»", + "originalRef": "统一响应结果«List«商户号信息»»" + } + }, + "401": { + "description": "Unauthorized" + }, + "403": { + "description": "Forbidden" + }, + "404": { + "description": "Not Found" + } + }, + "responsesObject": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/统一响应结果«List«商户号信息»»", + "originalRef": "统一响应结果«List«商户号信息»»" } }, "401": { @@ -150,8 +201,8 @@ "200": { "description": "OK", "schema": { - "originalRef": "统一响应结果«List«支付交易信息»»", - "$ref": "#/definitions/统一响应结果«List«支付交易信息»»" + "$ref": "#/definitions/统一响应结果«List«支付交易信息»»", + "originalRef": "统一响应结果«List«支付交易信息»»" } }, "401": { @@ -168,8 +219,8 @@ "200": { "description": "OK", "schema": { - "originalRef": "统一响应结果«List«支付交易信息»»", - "$ref": "#/definitions/统一响应结果«List«支付交易信息»»" + "$ref": "#/definitions/统一响应结果«List«支付交易信息»»", + "originalRef": "统一响应结果«List«支付交易信息»»" } }, "401": { @@ -211,8 +262,8 @@ "200": { "description": "OK", "schema": { - "originalRef": "统一响应结果«List«退款记录信息»»", - "$ref": "#/definitions/统一响应结果«List«退款记录信息»»" + "$ref": "#/definitions/统一响应结果«List«退款记录信息»»", + "originalRef": "统一响应结果«List«退款记录信息»»" } }, "401": { @@ -229,8 +280,8 @@ "200": { "description": "OK", "schema": { - "originalRef": "统一响应结果«List«退款记录信息»»", - "$ref": "#/definitions/统一响应结果«List«退款记录信息»»" + "$ref": "#/definitions/统一响应结果«List«退款记录信息»»", + "originalRef": "统一响应结果«List«退款记录信息»»" } }, "401": { @@ -272,8 +323,8 @@ "200": { "description": "OK", "schema": { - "originalRef": "统一响应结果«退款记录信息»", - "$ref": "#/definitions/统一响应结果«退款记录信息»" + "$ref": "#/definitions/统一响应结果«退款记录信息»", + "originalRef": "统一响应结果«退款记录信息»" } }, "401": { @@ -290,8 +341,8 @@ "200": { "description": "OK", "schema": { - "originalRef": "统一响应结果«退款记录信息»", - "$ref": "#/definitions/统一响应结果«退款记录信息»" + "$ref": "#/definitions/统一响应结果«退款记录信息»", + "originalRef": "统一响应结果«退款记录信息»" } }, "401": { @@ -337,8 +388,8 @@ "description": "退款请求", "required": false, "schema": { - "originalRef": "退款请求", - "$ref": "#/definitions/退款请求" + "$ref": "#/definitions/退款请求", + "originalRef": "退款请求" } } ], @@ -346,8 +397,8 @@ "200": { "description": "OK", "schema": { - "originalRef": "统一响应结果«退款记录信息»", - "$ref": "#/definitions/统一响应结果«退款记录信息»" + "$ref": "#/definitions/统一响应结果«退款记录信息»", + "originalRef": "统一响应结果«退款记录信息»" } }, "201": { @@ -367,8 +418,8 @@ "200": { "description": "OK", "schema": { - "originalRef": "统一响应结果«退款记录信息»", - "$ref": "#/definitions/统一响应结果«退款记录信息»" + "$ref": "#/definitions/统一响应结果«退款记录信息»", + "originalRef": "统一响应结果«退款记录信息»" } }, "201": { @@ -413,8 +464,8 @@ "200": { "description": "OK", "schema": { - "originalRef": "统一响应结果«支付交易信息»", - "$ref": "#/definitions/统一响应结果«支付交易信息»" + "$ref": "#/definitions/统一响应结果«支付交易信息»", + "originalRef": "统一响应结果«支付交易信息»" } }, "401": { @@ -431,8 +482,8 @@ "200": { "description": "OK", "schema": { - "originalRef": "统一响应结果«支付交易信息»", - "$ref": "#/definitions/统一响应结果«支付交易信息»" + "$ref": "#/definitions/统一响应结果«支付交易信息»", + "originalRef": "统一响应结果«支付交易信息»" } }, "401": { @@ -477,8 +528,8 @@ "200": { "description": "OK", "schema": { - "originalRef": "统一响应结果«支付交易信息»", - "$ref": "#/definitions/统一响应结果«支付交易信息»" + "$ref": "#/definitions/统一响应结果«支付交易信息»", + "originalRef": "统一响应结果«支付交易信息»" } }, "201": { @@ -498,8 +549,8 @@ "200": { "description": "OK", "schema": { - "originalRef": "统一响应结果«支付交易信息»", - "$ref": "#/definitions/统一响应结果«支付交易信息»" + "$ref": "#/definitions/统一响应结果«支付交易信息»", + "originalRef": "统一响应结果«支付交易信息»" } }, "201": { @@ -540,8 +591,8 @@ "type": "array", "description": "数据列表", "items": { - "originalRef": "支付交易信息", - "$ref": "#/definitions/支付交易信息" + "$ref": "#/definitions/支付交易信息", + "originalRef": "支付交易信息" } }, "total": { @@ -553,6 +604,20 @@ }, "title": "分页结果«支付交易信息»" }, + "商户号信息": { + "type": "object", + "properties": { + "mchId": { + "type": "string", + "description": "商户号ID" + }, + "name": { + "type": "string", + "description": "商户名称" + } + }, + "title": "商户号信息" + }, "支付交易信息": { "type": "object", "properties": { @@ -616,6 +681,31 @@ }, "title": "支付交易信息" }, + "统一响应结果«List«商户号信息»»": { + "type": "object", + "properties": { + "code": { + "type": "integer", + "format": "int32", + "example": 200, + "description": "状态码" + }, + "data": { + "type": "array", + "description": "响应数据", + "items": { + "$ref": "#/definitions/商户号信息", + "originalRef": "商户号信息" + } + }, + "message": { + "type": "string", + "example": "成功", + "description": "响应消息" + } + }, + "title": "统一响应结果«List«商户号信息»»" + }, "统一响应结果«List«支付交易信息»»": { "type": "object", "properties": { @@ -629,8 +719,8 @@ "type": "array", "description": "响应数据", "items": { - "originalRef": "支付交易信息", - "$ref": "#/definitions/支付交易信息" + "$ref": "#/definitions/支付交易信息", + "originalRef": "支付交易信息" } }, "message": { @@ -654,8 +744,8 @@ "type": "array", "description": "响应数据", "items": { - "originalRef": "退款记录信息", - "$ref": "#/definitions/退款记录信息" + "$ref": "#/definitions/退款记录信息", + "originalRef": "退款记录信息" } }, "message": { @@ -677,8 +767,8 @@ }, "data": { "description": "响应数据", - "originalRef": "分页结果«支付交易信息»", - "$ref": "#/definitions/分页结果«支付交易信息»" + "$ref": "#/definitions/分页结果«支付交易信息»", + "originalRef": "分页结果«支付交易信息»" }, "message": { "type": "string", @@ -699,8 +789,8 @@ }, "data": { "description": "响应数据", - "originalRef": "支付交易信息", - "$ref": "#/definitions/支付交易信息" + "$ref": "#/definitions/支付交易信息", + "originalRef": "支付交易信息" }, "message": { "type": "string", @@ -721,8 +811,8 @@ }, "data": { "description": "响应数据", - "originalRef": "退款记录信息", - "$ref": "#/definitions/退款记录信息" + "$ref": "#/definitions/退款记录信息", + "originalRef": "退款记录信息" }, "message": { "type": "string", diff --git a/changelogs/2026-03/2026-03-17_1111_23692ba_fix_Swagger.md b/changelogs/2026-03/2026-03-17_1111_23692ba_fix_Swagger.md new file mode 100644 index 0000000..4b51382 --- /dev/null +++ b/changelogs/2026-03/2026-03-17_1111_23692ba_fix_Swagger.md @@ -0,0 +1,62 @@ +# 接口变更记录 — 2026-03-17 11:11 + +> **提交** `23692ba` · **作者** wx · **时间** 2026-03-17 11:11:23 +0800 +> +> fix: 修复Swagger注解中字典引用与数据库不一致的问题 + +## 变更总览 + + +--- + +## 📦 其他数据对象变更 + +> 以下变更未直接关联到本次接口变更，但可能影响现有接口的请求/响应 + +### 用户服务 + +#### ✏️ ContactRequest + + - ✏️ `status`: 说明 "状态，关联字典common_status：0=下线, 1=上线" → "状态，关联字典common_status：ACTIVE=启用, INACTIVE=停用" + +#### ✏️ ContactVO + + - ✏️ `status`: 说明 "状态，关联字典common_status：0=下线, 1=上线" → "状态，关联字典common_status：ACTIVE=启用, INACTIVE=停用" + +#### ✏️ LoginLogVO + + - ✏️ `loginMethod`: 说明 "登录方式，关联字典login_method：PASSWORD=密码登录, WECHAT_QR=企微扫码登录, TWO_FA=二次验证登录" → "登录方式：PASSWORD=密码登录, WECHAT_QR=企微扫码登录, TWO_FA=二次验证登录（非字典，代码常量）" + +#### ✏️ SendLogVO + + - ✏️ `channel`: 说明 "通道，关联字典notification_channel：INAPP=站内信, SMS=短信, MINIAPP=小程序订阅, OA=公众号模板, WEWORK=企业微信" → "通道，关联字典notification_channel：SMS=短信, MINIAPP=小程序, OA=公众号, INAPP=站内信, WECHAT_WORK=企业微信" + - ✏️ `status`: 说明 "发送状态，关联字典notification_send_status：0=成功, 1=失败, 2=跳过" → "发送状态，关联字典notification_send_status：0=成功, 1=失败, 2=已过滤, 3=已跳过(已禁用)" + +#### ✏️ TravelerRequest + + - ✏️ `travelerType`: 说明 "出行人类型，关联字典traveler_type：ADULT=成人, CHILD=儿童, INFANT=婴儿（无需传入，后端根据birthday自动判断）" → "出行人类型，关联字典traveler_type：ADULT=成人, CHILD=儿童, YOUNG_CHILD=小童, BABY=幼童（无需传入，后端根据birthday自动判断）" + - ✏️ `gender`: 说明 "性别，关联字典gender：0=女, 1=男" → "性别，关联字典gender：1=男, 2=女" + +#### ✏️ UserVO + + - ✏️ `gender`: 说明 "性别，关联字典gender：0=女, 1=男" → "性别，关联字典gender：1=男, 2=女" + +
+📁 全部变更文件 (点击展开) + +``` +M .gitignore +M hl-monitor-service/src/main/java/com/hulalv/monitor/controller/OperationLogController.java +M hl-mp-service/src/main/java/com/hulalv/mp/controller/MpPaymentController.java +M hl-mp-service/src/main/java/com/hulalv/mp/controller/MpRefundController.java +M hl-payment-service/src/main/java/com/hulalv/payment/controller/InternalPaymentController.java +M hl-resource-service/src/main/java/com/hulalv/resource/restaurant/controller/RestaurantController.java +M hl-user-service/src/main/java/com/hulalv/user/dto/ContactRequest.java +M hl-user-service/src/main/java/com/hulalv/user/dto/TravelerRequest.java +M hl-user-service/src/main/java/com/hulalv/user/notification/vo/SendLogVO.java +M hl-user-service/src/main/java/com/hulalv/user/vo/ContactVO.java +M hl-user-service/src/main/java/com/hulalv/user/vo/LoginLogVO.java +M hl-user-service/src/main/java/com/hulalv/user/vo/UserVO.java +A scripts/check-dict-consistency.py +``` +
\ No newline at end of file