changelog: 05d9b09f - fix: 全局"定金"改为"订金"——统一用字规范
这个提交包含在：
API Changelog Bot
父节点
ae3ae92fa1
当前提交
40e5788a02
@ -0,0 +1,206 @@
|
||||
# 接口变更记录 — 2026-04-02 10:39
|
||||
|
||||
> **提交** `05d9b09f` · **作者** wx · **时间** 2026-04-02 10:39:29 +0800
|
||||
>
|
||||
> fix: 全局"定金"改为"订金"——统一用字规范
|
||||
|
||||
## 变更总览
|
||||
|
||||
- **订单服务**
|
||||
- AdminOrder (名1)
|
||||
|
||||
---
|
||||
|
||||
## 订单服务
|
||||
|
||||
### AdminOrder
|
||||
|
||||
> 📖 **接口文档**: [http://192.168.100.236:8084/doc.html](http://192.168.100.236:8084/doc.html) → 分组 **「3.1 订单管理」** → 标签 **「管理端订单接口」**
|
||||
|
||||
### 接口名称更新
|
||||
|
||||
| 方法 | 路径 | 原名称 → 新名称 |
|
||||
| --- | --- | --- |
|
||||
| `PUT` | `/admin/order/{orderId}/deposit` | 修改定金金额 → **修改订金金额** |
|
||||
|
||||
---
|
||||
|
||||
## 📦 其他数据对象变更
|
||||
|
||||
> 以下变更未直接关联到本次接口变更，但可能影响现有接口的请求/响应
|
||||
|
||||
### 产品服务
|
||||
|
||||
#### ✏️ GroupBatchCalendarVO
|
||||
|
||||
- ✏️ `depositAmount`: 说明 "定金金额(元/人)，根据起步价×定金比例计算" → "订金金额(元/人)，根据起步价×订金比例计算"
|
||||
|
||||
#### ✏️ MpProductListVO
|
||||
|
||||
- ✏️ `startPrice`: 说明 "起步价：全款模式=最低售价，定金模式=最低定金额" → "起步价：全款模式=最低售价，订金模式=最低订金额"
|
||||
- ✏️ `startPriceLabel`: 说明 "起步价标签：'起' 或 '定金起'" → "起步价标签：'起' 或 '订金起'"
|
||||
- ✏️ `paymentMode`: 说明 "支付模式：FULL=全款 DEPOSIT=定金+尾款" → "支付模式：FULL=全款 DEPOSIT=订金+尾款"
|
||||
|
||||
#### ✏️ MpProductQueryRequest
|
||||
|
||||
- ✏️ `paymentMode`: 说明 "支付模式筛选：FULL=全款 DEPOSIT=定金+尾款 null=全部" → "支付模式筛选：FULL=全款 DEPOSIT=订金+尾款 null=全部"
|
||||
|
||||
#### ✏️ PricingRequest
|
||||
|
||||
- ✏️ `profitMode`: 说明 "利润模式：FIXED=在成本基础上加固定金额 PERCENT=在成本基础上按百分比加价" → "利润模式：FIXED=在成本基础上加固订金额 PERCENT=在成本基础上按百分比加价"
|
||||
- ✏️ `paymentType`: 说明 "支付方式：FULL=全款支付 DEPOSIT=定金+尾款分期支付" → "支付方式：FULL=全款支付 DEPOSIT=订金+尾款分期支付"
|
||||
- ✏️ `depositRatio`: 说明 "定金比例（百分比，如30代表30%。与depositAmount二选一，优先使用比例）" → "订金比例（百分比，如30代表30%。与depositAmount二选一，优先使用比例）"
|
||||
- ✏️ `depositAmount`: 说明 "定金金额（固定金额，与depositRatio二选一）" → "订金金额（固订金额，与depositRatio二选一）"
|
||||
|
||||
#### ✏️ ProductPricingVO
|
||||
|
||||
- ✏️ `profitMode`: 说明 "利润模式：FIXED=固定金额 PERCENT=百分比" → "利润模式：FIXED=固订金额 PERCENT=百分比"
|
||||
- ✏️ `paymentType`: 说明 "支付方式：FULL=全款 DEPOSIT=定金+尾款" → "支付方式：FULL=全款 DEPOSIT=订金+尾款"
|
||||
- ✏️ `depositRatio`: 说明 "定金比例（百分比）" → "订金比例（百分比）"
|
||||
- ✏️ `depositAmount`: 说明 "定金金额" → "订金金额"
|
||||
|
||||
#### ✏️ ProductVO
|
||||
|
||||
- ✏️ `paymentMode`: 说明 "支付模式：FULL=全款 DEPOSIT=定金+尾款" → "支付模式：FULL=全款 DEPOSIT=订金+尾款"
|
||||
- ✏️ `startPrice`: 说明 "起步价：全款模式=最低售价，定金模式=最低定金额" → "起步价：全款模式=最低售价，订金模式=最低订金额"
|
||||
- ✏️ `startPriceLabel`: 说明 "起步价标签：'起' 或 '定金起'" → "起步价标签：'起' 或 '订金起'"
|
||||
|
||||
### 公共模块
|
||||
|
||||
#### ✏️ OrderPayInfoDTO
|
||||
|
||||
- ✏️ `depositAmount`: 说明 "定金金额" → "订金金额"
|
||||
- ✏️ `paymentMode`: 说明 "支付模式: FULL=全款, DEPOSIT=定金+尾款" → "支付模式: FULL=全款, DEPOSIT=订金+尾款"
|
||||
- ✏️ `isBooking`: 说明 "是否预定产品: true=预定(定金可不填出行人), false=非预定(支付前必须填出行人)" → "是否预定产品: true=预定(订金可不填出行人), false=非预定(支付前必须填出行人)"
|
||||
|
||||
#### ✏️ PaymentResultDTO
|
||||
|
||||
- ✏️ `payType`: 说明 "支付类型: FULL=全款, DEPOSIT=定金, BALANCE=尾款" → "支付类型: FULL=全款, DEPOSIT=订金, BALANCE=尾款"
|
||||
|
||||
### 小程序聚合服务
|
||||
|
||||
#### ✏️ MpCustomProductDetailVO
|
||||
|
||||
- ✏️ `paymentMode`: 说明 "支付模式：FULL=全款 DEPOSIT=定金+尾款" → "支付模式：FULL=全款 DEPOSIT=订金+尾款"
|
||||
- ✏️ `profitMode`: 说明 "利润模式：FIXED=固定金额 PERCENT=百分比" → "利润模式：FIXED=固订金额 PERCENT=百分比"
|
||||
- ✏️ `paymentType`: 说明 "支付方式：FULL=全款 DEPOSIT=定金+尾款" → "支付方式：FULL=全款 DEPOSIT=订金+尾款"
|
||||
- ✏️ `depositRatio`: 说明 "定金比例（百分比）" → "订金比例（百分比）"
|
||||
- ✏️ `depositAmount`: 说明 "定金金额" → "订金金额"
|
||||
|
||||
#### ✏️ MpCustomProductListVO
|
||||
|
||||
- ✏️ `paymentMode`: 说明 "支付模式：FULL=全款 DEPOSIT=定金+尾款" → "支付模式：FULL=全款 DEPOSIT=订金+尾款"
|
||||
|
||||
#### ✏️ MpOrderDetailVO
|
||||
|
||||
- ✏️ `depositRatio`: 说明 "定金比例" → "订金比例"
|
||||
- ✏️ `depositAmount`: 说明 "定金金额" → "订金金额"
|
||||
- ✏️ `payMethodLabel`: 说明 "支付方式标签（如：微信支付、定金微信+尾款线下）" → "支付方式标签（如：微信支付、订金微信+尾款线下）"
|
||||
|
||||
#### ✏️ MpOrderListItemVO
|
||||
|
||||
- ✏️ `depositAmount`: 说明 "定金金额" → "订金金额"
|
||||
|
||||
#### ✏️ MpProductQuoteVO
|
||||
|
||||
- ✏️ `paymentMode`: 说明 "支付方式: FULL(全额支付) / DEPOSIT(定金+尾款)" → "支付方式: FULL(全额支付) / DEPOSIT(订金+尾款)"
|
||||
- ✏️ `depositPayment`: 说明 "定金支付信息（仅paymentMode=DEPOSIT时有值）" → "订金支付信息（仅paymentMode=DEPOSIT时有值）"
|
||||
- ✏️ `depositRatio`: 说明 "定金比例(%)" → "订金比例(%)"
|
||||
- ✏️ `depositAmount`: 说明 "定金金额（首次需付）" → "订金金额（首次需付）"
|
||||
|
||||
#### ✏️ MpRefundDetailVO
|
||||
|
||||
- ✏️ `refundType`: 说明 "退款类型: DEPOSIT(定金)/BALANCE(尾款)/FULL(全款)" → "退款类型: DEPOSIT(订金)/BALANCE(尾款)/FULL(全款)"
|
||||
|
||||
### 订单服务
|
||||
|
||||
#### ✏️ AdminUpdateOrderRequest
|
||||
|
||||
- ✏️ `depositAmount`: 说明 "定金金额" → "订金金额"
|
||||
|
||||
#### ✏️ MpOrderListVO
|
||||
|
||||
- ✏️ `depositAmount`: 说明 "定金金额" → "订金金额"
|
||||
- ✏️ `balanceAmount`: 说明 "尾款金额（DEPOSIT模式：总售价-定金-优惠）" → "尾款金额（DEPOSIT模式：总售价-订金-优惠）"
|
||||
|
||||
#### ✏️ OrderDetailVO
|
||||
|
||||
- ✏️ `paymentModeLabel`: 说明 "支付模式中文标签（DEPOSIT=定金+尾款, FULL=全款）" → "支付模式中文标签（DEPOSIT=订金+尾款, FULL=全款）"
|
||||
- ✏️ `depositRatio`: 说明 "定金比例" → "订金比例"
|
||||
- ✏️ `depositAmount`: 说明 "定金金额" → "订金金额"
|
||||
- ✏️ `balanceAmount`: 说明 "尾款金额（总售价-定金）" → "尾款金额（总售价-订金）"
|
||||
- ✏️ `payMethodLabel`: 说明 "支付方式标签（如：微信支付、定金微信+尾款线下）" → "支付方式标签（如：微信支付、订金微信+尾款线下）"
|
||||
|
||||
#### ✏️ OrderListVO
|
||||
|
||||
- ✏️ `depositAmount`: 说明 "定金金额" → "订金金额"
|
||||
- ✏️ `balanceAmount`: 说明 "尾款金额（DEPOSIT模式：总售价-定金-优惠）" → "尾款金额（DEPOSIT模式：总售价-订金-优惠）"
|
||||
|
||||
#### ✏️ UpdateDepositRequest
|
||||
|
||||
- ✏️ `amount`: 说明 "定金金额" → "订金金额"
|
||||
|
||||
#### ✏️ UpdateOrderStatusRequest
|
||||
|
||||
- ✏️ `status`: 说明 "目标状态。可选值：PENDING_PAY(待支付)/DEPOSIT_PAID(已付定金)/PAID(已全额支付)/" → "目标状态。可选值：PENDING_PAY(待支付)/DEPOSIT_PAID(已付订金)/PAID(已全额支付)/"
|
||||
|
||||
<details>
|
||||
<summary>📁 全部变更文件 (点击展开)</summary>
|
||||
|
||||
```
|
||||
M hl-common/hl-common-core/src/main/java/com/hulalv/common/dto/OrderPayInfoDTO.java
|
||||
M hl-common/hl-common-core/src/main/java/com/hulalv/common/dto/PaymentResultDTO.java
|
||||
M hl-mp-service/src/main/java/com/hulalv/mp/controller/MpCustomizeController.java
|
||||
M hl-mp-service/src/main/java/com/hulalv/mp/controller/MpOrderController.java
|
||||
M hl-mp-service/src/main/java/com/hulalv/mp/controller/MpProductController.java
|
||||
M hl-mp-service/src/main/java/com/hulalv/mp/vo/MpCustomProductDetailVO.java
|
||||
M hl-mp-service/src/main/java/com/hulalv/mp/vo/MpCustomProductListVO.java
|
||||
M hl-mp-service/src/main/java/com/hulalv/mp/vo/MpOrderDetailVO.java
|
||||
M hl-mp-service/src/main/java/com/hulalv/mp/vo/MpOrderListItemVO.java
|
||||
M hl-mp-service/src/main/java/com/hulalv/mp/vo/MpProductQuoteVO.java
|
||||
M hl-mp-service/src/main/java/com/hulalv/mp/vo/MpRefundDetailVO.java
|
||||
M hl-mp-service/src/test/java/com/hulalv/mp/VoCoverageTest.java
|
||||
M hl-mp-service/src/test/java/com/hulalv/mp/VoExtraDeepCoverageTest.java
|
||||
M hl-mp-service/src/test/java/com/hulalv/mp/controller/MpProductControllerBranchTest.java
|
||||
M hl-mp-service/src/test/java/com/hulalv/mp/service/ProductAggregationServiceTest.java
|
||||
M hl-order-service/src/main/java/com/hulalv/order/constant/OrderConstants.java
|
||||
M hl-order-service/src/main/java/com/hulalv/order/controller/AdminOrderController.java
|
||||
M hl-order-service/src/main/java/com/hulalv/order/controller/InternalMpOrderController.java
|
||||
M hl-order-service/src/main/java/com/hulalv/order/controller/InternalPaymentOrderController.java
|
||||
M hl-order-service/src/main/java/com/hulalv/order/controller/InternalRefundController.java
|
||||
M hl-order-service/src/main/java/com/hulalv/order/controller/MpOrderController.java
|
||||
M hl-order-service/src/main/java/com/hulalv/order/dto/AdminUpdateOrderRequest.java
|
||||
M hl-order-service/src/main/java/com/hulalv/order/dto/UpdateDepositRequest.java
|
||||
M hl-order-service/src/main/java/com/hulalv/order/dto/UpdateOrderStatusRequest.java
|
||||
M hl-order-service/src/main/java/com/hulalv/order/entity/OrderInfo.java
|
||||
M hl-order-service/src/main/java/com/hulalv/order/job/DepartureReminderJob.java
|
||||
M hl-order-service/src/main/java/com/hulalv/order/service/NotificationEventHelper.java
|
||||
M hl-order-service/src/main/java/com/hulalv/order/service/OrderItineraryEditService.java
|
||||
M hl-order-service/src/main/java/com/hulalv/order/service/OrderService.java
|
||||
M hl-order-service/src/main/java/com/hulalv/order/service/OrderTodoService.java
|
||||
M hl-order-service/src/main/java/com/hulalv/order/service/RefundApplicationService.java
|
||||
M hl-order-service/src/main/java/com/hulalv/order/vo/MpOrderListVO.java
|
||||
M hl-order-service/src/main/java/com/hulalv/order/vo/OrderDetailVO.java
|
||||
M hl-order-service/src/main/java/com/hulalv/order/vo/OrderListVO.java
|
||||
M hl-order-service/src/main/java/com/hulalv/payment/service/PaymentService.java
|
||||
M hl-order-service/src/test/java/com/hulalv/order/constant/OrderConstantsTest.java
|
||||
M hl-order-service/src/test/java/com/hulalv/order/service/NotificationEventHelperTest.java
|
||||
M hl-order-service/src/test/java/com/hulalv/order/service/OrderServiceExtendedTest.java
|
||||
M hl-order-service/src/test/java/com/hulalv/order/service/OrderServiceTest.java
|
||||
M hl-order-service/src/test/java/com/hulalv/order/service/RefundApplicationServiceTest.java
|
||||
M hl-order-service/src/test/java/com/hulalv/payment/service/PaymentServiceTest.java
|
||||
M hl-product-service/src/main/java/com/hulalv/product/controller/MpProductController.java
|
||||
M hl-product-service/src/main/java/com/hulalv/product/controller/PricingController.java
|
||||
M hl-product-service/src/main/java/com/hulalv/product/dto/MpProductQueryRequest.java
|
||||
M hl-product-service/src/main/java/com/hulalv/product/dto/PricingRequest.java
|
||||
M hl-product-service/src/main/java/com/hulalv/product/service/GroupTourBatchService.java
|
||||
M hl-product-service/src/main/java/com/hulalv/product/service/ProductPricingService.java
|
||||
M hl-product-service/src/main/java/com/hulalv/product/service/ProductService.java
|
||||
M hl-product-service/src/main/java/com/hulalv/product/service/ProductStatusService.java
|
||||
M hl-product-service/src/main/java/com/hulalv/product/vo/GroupBatchCalendarVO.java
|
||||
M hl-product-service/src/main/java/com/hulalv/product/vo/MpProductListVO.java
|
||||
M hl-product-service/src/main/java/com/hulalv/product/vo/ProductPricingVO.java
|
||||
M hl-product-service/src/main/java/com/hulalv/product/vo/ProductVO.java
|
||||
M hl-product-service/src/test/java/com/hulalv/product/service/MpProductServiceTest.java
|
||||
```
|
||||
</details>
|
||||
正在加载...
x
在新工单中引用
屏蔽一个用户