From 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 01 七月 2025 14:37:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/request/OrderRequest.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/request/OrderRequest.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/request/OrderRequest.java
index b2d86e0..f09f7cc 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/request/OrderRequest.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/request/OrderRequest.java
@@ -14,9 +14,16 @@
*/
@Data
public class OrderRequest {
+ @ApiModelProperty("订单id")
+ private String orderId;
@ApiModelProperty("下单城市")
private String city;
+ private String provinceCode;
+ private String areaCode;
+
+ @ApiModelProperty("城市编码")
+ private String cityCode;
@ApiModelProperty("订单编号")
private String orderNumber;
@@ -73,7 +80,7 @@
private Integer state;
@ApiModelProperty("师傅到达预约地点时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date arriveTime;
@ApiModelProperty("订单类型(0:正常订单,1:后台订单(后台订单与用户端、师傅端无联系))")
@@ -91,7 +98,7 @@
@ApiModelProperty("订单补贴金额")
private BigDecimal subsidy;
- @ApiModelProperty("是否已提现(0:未提现，1:已提现)")
+ @ApiModelProperty("是否已提现(0:未提现，1:审核中 2审核通过 3:已确认收款)")
private Integer isWithdrawal;
@ApiModelProperty("详细地址")
--
Gitblit v1.7.1