diff --git a/.swagger/dict_data.json b/.swagger/dict_data.json index 4ee46f8..d8492dc 100644 --- a/.swagger/dict_data.json +++ b/.swagger/dict_data.json @@ -1183,6 +1183,147 @@ } ] }, + "customize_budget": { + "name": "\u9884\u7b97\u8303\u56f4", + "category": "ORDER", + "remark": "", + "items": [ + { + "value": "UNDER_3000", + "label": "3000\u5143\u4ee5\u4e0b/\u4eba", + "sort": 1, + "status": "ACTIVE" + }, + { + "value": "BUDGET_3000_5000", + "label": "3000-5000\u5143/\u4eba", + "sort": 2, + "status": "ACTIVE" + }, + { + "value": "BUDGET_5000_10000", + "label": "5000-10000\u5143/\u4eba", + "sort": 3, + "status": "ACTIVE" + }, + { + "value": "BUDGET_10000_20000", + "label": "10000-20000\u5143/\u4eba", + "sort": 4, + "status": "ACTIVE" + }, + { + "value": "ABOVE_20000", + "label": "20000\u5143\u4ee5\u4e0a/\u4eba", + "sort": 5, + "status": "ACTIVE" + }, + { + "value": "NO_LIMIT", + "label": "\u4e0d\u9650\u9884\u7b97", + "sort": 6, + "status": "ACTIVE" + } + ] + }, + "customize_request_status": { + "name": "\u5b9a\u5236\u8bf7\u6c42\u72b6\u6001", + "category": "ORDER", + "remark": "", + "items": [ + { + "value": "PENDING", + "label": "\u5f85\u5904\u7406", + "sort": 1, + "status": "ACTIVE" + }, + { + "value": "ACCEPTED", + "label": "\u5df2\u63a5\u53d7", + "sort": 2, + "status": "ACTIVE" + }, + { + "value": "DESIGNING", + "label": "\u8bbe\u8ba1\u4e2d", + "sort": 3, + "status": "ACTIVE" + }, + { + "value": "QUOTED", + "label": "\u5df2\u62a5\u4ef7", + "sort": 4, + "status": "ACTIVE" + }, + { + "value": "COMPLETED", + "label": "\u5df2\u5b8c\u6210", + "sort": 5, + "status": "ACTIVE" + }, + { + "value": "CANCELLED", + "label": "\u5df2\u53d6\u6d88", + "sort": 6, + "status": "ACTIVE" + } + ] + }, + "customize_request_type": { + "name": "\u5b9a\u5236\u9700\u6c42\u7c7b\u578b", + "category": "ORDER", + "remark": "", + "items": [ + { + "value": "FAMILY_TRIP", + "label": "\u4eb2\u5b50\u6e38", + "sort": 1, + "status": "ACTIVE" + }, + { + "value": "HONEYMOON", + "label": "\u871c\u6708\u6e38", + "sort": 2, + "status": "ACTIVE" + }, + { + "value": "GROUP_TRIP", + "label": "\u56e2\u5efa\u6e38", + "sort": 3, + "status": "ACTIVE" + }, + { + "value": "SENIOR_TRIP", + "label": "\u94f6\u53d1\u6e38", + "sort": 4, + "status": "ACTIVE" + }, + { + "value": "ADVENTURE", + "label": "\u63a2\u9669\u6e38", + "sort": 5, + "status": "ACTIVE" + }, + { + "value": "PHOTOGRAPHY", + "label": "\u6444\u5f71\u6e38", + "sort": 6, + "status": "ACTIVE" + }, + { + "value": "CULTURE", + "label": "\u6587\u5316\u6e38", + "sort": 7, + "status": "ACTIVE" + }, + { + "value": "OTHER", + "label": "\u5176\u4ed6", + "sort": 99, + "status": "ACTIVE" + } + ] + }, "dept_status": { "name": "\u90e8\u95e8\u72b6\u6001", "category": "BASE", @@ -2417,6 +2558,37 @@ } ] }, + "invoice_status": { + "name": "\u53d1\u7968\u72b6\u6001", + "category": "ORDER", + "remark": "", + "items": [ + { + "value": "PENDING", + "label": "\u5f85\u5f00\u7968", + "sort": 1, + "status": "ACTIVE" + }, + { + "value": "ISSUED", + "label": "\u5df2\u5f00\u7968", + "sort": 2, + "status": "ACTIVE" + }, + { + "value": "FAILED", + "label": "\u5f00\u7968\u5931\u8d25", + "sort": 3, + "status": "ACTIVE" + }, + { + "value": "VOIDED", + "label": "\u5df2\u4f5c\u5e9f", + "sort": 4, + "status": "ACTIVE" + } + ] + }, "job_group": { "name": "\u4efb\u52a1\u5206\u7ec4", "category": "BASE", @@ -5001,6 +5173,55 @@ "remark": "\u8ba2\u5355\u4ea4\u901a\u4fe1\u606f\u7c7b\u578b\uff1a\u822a\u73ed/\u706b\u8f66", "items": [] }, + "travel_purpose": { + "name": "\u65c5\u6e38\u76ee\u7684", + "category": "ORDER", + "remark": "", + "items": [ + { + "value": "LEISURE", + "label": "\u4f11\u95f2\u5ea6\u5047", + "sort": 1, + "status": "ACTIVE" + }, + { + "value": "ADVENTURE", + "label": "\u63a2\u9669\u4f53\u9a8c", + "sort": 2, + "status": "ACTIVE" + }, + { + "value": "CULTURE", + "label": "\u6587\u5316\u63a2\u8bbf", + "sort": 3, + "status": "ACTIVE" + }, + { + "value": "FAMILY", + "label": "\u4eb2\u5b50\u966a\u4f34", + "sort": 4, + "status": "ACTIVE" + }, + { + "value": "ROMANCE", + "label": "\u6d6a\u6f2b\u65c5\u884c", + "sort": 5, + "status": "ACTIVE" + }, + { + "value": "TEAM", + "label": "\u56e2\u961f\u5efa\u8bbe", + "sort": 6, + "status": "ACTIVE" + }, + { + "value": "OTHER", + "label": "\u5176\u4ed6", + "sort": 99, + "status": "ACTIVE" + } + ] + }, "traveler_type": { "name": "\u51fa\u884c\u4eba\u7c7b\u578b", "category": "BUSINESS", diff --git a/changelogs/2026-03/2026-03-24_1434_50e2536_refactor.md b/changelogs/2026-03/2026-03-24_1434_50e2536_refactor.md new file mode 100644 index 0000000..e5b81cb --- /dev/null +++ b/changelogs/2026-03/2026-03-24_1434_50e2536_refactor.md @@ -0,0 +1,244 @@ +# 接口变更记录 — 2026-03-24 14:34 + +> **提交** `50e2536` · **作者** wx · **时间** 2026-03-24 14:34:21 +0800 +> +> refactor: 资源管理去除草稿状态,只保留上架/下架二态 + +## 变更总览 + + +--- + +## 📦 其他数据对象变更 + +> 以下变更未直接关联到本次接口变更,但可能影响现有接口的请求/响应 + +### 资源服务 + +#### ✏️ ActivityListVO + + - ✏️ `status`: 说明 "状态:0=草稿 1=上架 2=下架" → "状态:0=下架 1=上架" + +#### ✏️ ActivityQueryRequest + + - ✏️ `status`: 说明 "状态:0=草稿 1=上架 2=下架" → "状态:0=下架 1=上架" + +#### ✏️ ActivityStatusRequest + + - ✏️ `status`: 说明 "目标状态:0=草稿 1=上架 2=下架" → "目标状态:0=下架 1=上架" + +#### ✏️ ActivityVO + + - ✏️ `status`: 说明 "状态:0=草稿 1=上架 2=下架" → "状态:0=下架 1=上架" + +#### ✏️ ApprovalSubmitRequest + + - ✏️ `targetStatus`: 说明 "目标状态:1=上架 2=下架" → "目标状态:0=下架 1=上架" + +#### ✏️ CostItemListVO + + - ✏️ `status`: 说明 "状态:0=草稿 1=上架 2=下架" → "状态:0=下架 1=上架" + +#### ✏️ CostItemQueryRequest + + - ✏️ `status`: 说明 "状态筛选:0=草稿 1=上架 2=下架" → "状态筛选:0=下架 1=上架" + +#### ✏️ CostItemVO + + - ✏️ `status`: 说明 "状态:0=草稿 1=上架 2=下架" → "状态:0=下架 1=上架" + +#### ✏️ HotelListVO + + - ✏️ `status`: 说明 "状态:0=草稿 1=上架 2=下架" → "状态:0=下架 1=上架" + +#### ✏️ HotelQueryRequest + + - ✏️ `status`: 说明 "状态筛选:0=草稿 1=上架 2=下架" → "状态筛选:0=下架 1=上架" + +#### ✏️ HotelStatusRequest + + - ✏️ `status`: 说明 "目标状态:0=草稿 1=上架 2=下架" → "目标状态:0=下架 1=上架" + +#### ✏️ HotelVO + + - ✏️ `status`: 说明 "状态:0=草稿 1=上架 2=下架" → "状态:0=下架 1=上架" + +#### ✏️ RestaurantListVO + + - ✏️ `status`: 说明 "状态:0=草稿 1=上架 2=下架" → "状态:0=下架 1=上架" + +#### ✏️ RestaurantQueryRequest + + - ✏️ `status`: 说明 "状态:0=草稿 1=上架 2=下架" → "状态:0=下架 1=上架" + +#### ✏️ RestaurantStatusRequest + + - ✏️ `status`: 说明 "目标状态:0=草稿 1=上架 2=下架" → "目标状态:0=下架 1=上架" + +#### ✏️ RestaurantUpdateRequest + + - ✏️ `status`: 说明 "状态:0=草稿 1=上架 2=下架" → "状态:0=下架 1=上架" + +#### ✏️ RestaurantVO + + - ✏️ `status`: 说明 "状态:0=草稿 1=上架 2=下架" → "状态:0=下架 1=上架" + +#### ✏️ RoomTypeStatusRequest + + - ✏️ `status`: 说明 "状态:0=禁用 1=启用" → "状态:0=下架 1=上架" + +#### ✏️ RoomTypeVO + + - ✏️ `status`: 说明 "状态:0=禁用 1=启用" → "状态:0=下架 1=上架" + +#### ✏️ ScenicSpotListVO + + - ✏️ `status`: 说明 "状态:0=草稿 1=上架 2=下架" → "状态:0=下架 1=上架" + +#### ✏️ ScenicSpotQueryRequest + + - ✏️ `status`: 说明 "状态筛选:0=草稿 1=上架 2=下架" → "状态筛选:0=下架 1=上架" + +#### ✏️ ScenicSpotUpdateRequest + + - ✏️ `status`: 说明 "状态:0=草稿 1=上架 2=下架" → "状态:0=下架 1=上架" + +#### ✏️ ScenicSpotVO + + - ✏️ `status`: 说明 "状态:0=草稿 1=上架 2=下架" → "状态:0=下架 1=上架" + +#### ✏️ ScenicStatusRequest + + - ✏️ `status`: 说明 "目标状态:0=草稿 1=上架 2=下架" → "目标状态:0=下架 1=上架" + +#### ✏️ ServiceItemListVO + + - ✏️ `status`: 说明 "状态:0=草稿 1=上架 2=下架" → "状态:0=下架 1=上架" + +#### ✏️ ServiceItemVO + + - ✏️ `status`: 说明 "状态:0=草稿 1=上架 2=下架" → "状态:0=下架 1=上架" + +#### ✏️ ServiceQueryRequest + + - ✏️ `status`: 说明 "状态筛选:0=草稿 1=上架 2=下架" → "状态筛选:0=下架 1=上架" + +#### ✏️ ServiceStatusRequest + + - ✏️ `status`: 说明 "目标状态:0=草稿 1=上架 2=下架" → "目标状态:0=下架 1=上架" + +#### ✏️ StaffListVO + + - ✏️ `status`: 说明 "状态:0=禁用 1=启用" → "状态:0=下架 1=上架" + +#### ✏️ StaffQueryRequest + + - ✏️ `status`: 说明 "状态筛选:0=禁用 1=启用" → "状态筛选:0=下架 1=上架" + +#### ✏️ StaffStatusRequest + + - ✏️ `status`: 说明 "目标状态:0=草稿 1=上架 2=下架" → "目标状态:0=下架 1=上架" + +#### ✏️ StaffVO + + - ✏️ `status`: 说明 "状态:0=禁用 1=启用" → "状态:0=下架 1=上架" + +#### ✏️ SuppliesListVO + + - ✏️ `status`: 说明 "状态:0=草稿 1=上架 2=下架" → "状态:0=下架 1=上架" + +#### ✏️ SuppliesQueryRequest + + - ✏️ `status`: 说明 "状态:0=草稿 1=上架 2=下架" → "状态:0=下架 1=上架" + +#### ✏️ SuppliesStatusRequest + + - ✏️ `status`: 说明 "目标状态:0=草稿 1=上架 2=下架" → "目标状态:0=下架 1=上架" + +#### ✏️ SuppliesUpdateRequest + + - ✏️ `status`: 说明 "状态:0=草稿 1=上架 2=下架" → "状态:0=下架 1=上架" + +#### ✏️ SuppliesVO + + - ✏️ `status`: 说明 "状态:0=草稿 1=上架 2=下架" → "状态:0=下架 1=上架" + +#### ✏️ VehicleModelListVO + + - ✏️ `status`: 说明 "状态:0=草稿 1=上架 2=下架" → "状态:0=下架 1=上架" + +#### ✏️ VehicleModelVO + + - ✏️ `status`: 说明 "状态:0=草稿 1=上架 2=下架" → "状态:0=下架 1=上架" + +#### ✏️ VehicleQueryRequest + + - ✏️ `status`: 说明 "状态筛选:0=草稿 1=上架 2=下架" → "状态筛选:0=下架 1=上架" + +#### ✏️ VehicleStatusRequest + + - ✏️ `status`: 说明 "目标状态:0=草稿 1=上架 2=下架" → "目标状态:0=下架 1=上架" + +
+📁 全部变更文件 (点击展开) + +``` +M hl-resource-service/src/main/java/com/hulalv/resource/activity/controller/ActivityController.java +M hl-resource-service/src/main/java/com/hulalv/resource/activity/dto/ActivityQueryRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/activity/dto/ActivityStatusRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/activity/dto/ApprovalSubmitRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/activity/vo/ActivityListVO.java +M hl-resource-service/src/main/java/com/hulalv/resource/activity/vo/ActivityVO.java +M hl-resource-service/src/main/java/com/hulalv/resource/cost/dto/CostItemQueryRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/cost/vo/CostItemListVO.java +M hl-resource-service/src/main/java/com/hulalv/resource/cost/vo/CostItemVO.java +M hl-resource-service/src/main/java/com/hulalv/resource/hotel/controller/HotelController.java +M hl-resource-service/src/main/java/com/hulalv/resource/hotel/controller/RoomTypeController.java +M hl-resource-service/src/main/java/com/hulalv/resource/hotel/dto/ApprovalSubmitRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/hotel/dto/HotelQueryRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/hotel/dto/HotelStatusRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/hotel/dto/RoomTypeStatusRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/hotel/vo/HotelListVO.java +M hl-resource-service/src/main/java/com/hulalv/resource/hotel/vo/HotelVO.java +M hl-resource-service/src/main/java/com/hulalv/resource/hotel/vo/RoomTypeVO.java +M hl-resource-service/src/main/java/com/hulalv/resource/restaurant/controller/RestaurantController.java +M hl-resource-service/src/main/java/com/hulalv/resource/restaurant/dto/ApprovalSubmitRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/restaurant/dto/RestaurantQueryRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/restaurant/dto/RestaurantStatusRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/restaurant/dto/RestaurantUpdateRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/restaurant/vo/RestaurantListVO.java +M hl-resource-service/src/main/java/com/hulalv/resource/restaurant/vo/RestaurantVO.java +M hl-resource-service/src/main/java/com/hulalv/resource/scenic/controller/ScenicSpotController.java +M hl-resource-service/src/main/java/com/hulalv/resource/scenic/dto/ApprovalSubmitRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/scenic/dto/ScenicSpotCreateRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/scenic/dto/ScenicSpotQueryRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/scenic/dto/ScenicSpotUpdateRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/scenic/dto/ScenicStatusRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/scenic/service/ScenicSpotService.java +M hl-resource-service/src/main/java/com/hulalv/resource/scenic/vo/ScenicSpotListVO.java +M hl-resource-service/src/main/java/com/hulalv/resource/scenic/vo/ScenicSpotVO.java +M hl-resource-service/src/main/java/com/hulalv/resource/service/controller/ServiceItemController.java +M hl-resource-service/src/main/java/com/hulalv/resource/service/dto/ApprovalSubmitRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/service/dto/ServiceQueryRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/service/dto/ServiceStatusRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/service/vo/ServiceItemListVO.java +M hl-resource-service/src/main/java/com/hulalv/resource/service/vo/ServiceItemVO.java +M hl-resource-service/src/main/java/com/hulalv/resource/staff/controller/StaffController.java +M hl-resource-service/src/main/java/com/hulalv/resource/staff/dto/StaffQueryRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/staff/dto/StaffStatusRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/staff/vo/StaffListVO.java +M hl-resource-service/src/main/java/com/hulalv/resource/staff/vo/StaffVO.java +M hl-resource-service/src/main/java/com/hulalv/resource/supplies/controller/SuppliesController.java +M hl-resource-service/src/main/java/com/hulalv/resource/supplies/dto/ApprovalSubmitRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/supplies/dto/SuppliesQueryRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/supplies/dto/SuppliesStatusRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/supplies/dto/SuppliesUpdateRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/supplies/vo/SuppliesListVO.java +M hl-resource-service/src/main/java/com/hulalv/resource/supplies/vo/SuppliesVO.java +M hl-resource-service/src/main/java/com/hulalv/resource/vehicle/controller/VehicleModelController.java +M hl-resource-service/src/main/java/com/hulalv/resource/vehicle/dto/VehicleQueryRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/vehicle/dto/VehicleStatusRequest.java +M hl-resource-service/src/main/java/com/hulalv/resource/vehicle/vo/VehicleModelListVO.java +M hl-resource-service/src/main/java/com/hulalv/resource/vehicle/vo/VehicleModelVO.java +``` +
\ No newline at end of file