From 9acb17a6871d84a85c373eb90b980f98894e30e0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 18 二月 2025 17:58:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/vo/OrderListVO.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/vo/OrderListVO.java b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/vo/OrderListVO.java
index f51284a..d2590d1 100644
--- a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/vo/OrderListVO.java
+++ b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/vo/OrderListVO.java
@@ -16,8 +16,11 @@
@Data
public class OrderListVO {
+ @ApiModelProperty("字符串订单id")
+ private String orderIdStr;
+
@ApiModelProperty("订单id")
- private Integer orderId;
+ private String orderId;
@ApiModelProperty("订单编号")
private String orderNumber;
@@ -30,6 +33,9 @@
@ApiModelProperty("回收服务id")
private Integer serveId;
+
+ @ApiModelProperty("虚假订单")
+ private Integer fake;
@ApiModelProperty("回收服务名称")
private String serveName;
@@ -74,11 +80,11 @@
private Integer state;
@ApiModelProperty("接单时间(师傅接单或后台派单，更新该字段时间)")
- @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date acceptTime;
@ApiModelProperty("师傅到达预约地点时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date arriveTime;
@ApiModelProperty("订单类型(0:正常订单,1:后台订单(后台订单与用户端、师傅端无联系))")
@@ -94,7 +100,8 @@
@TableField("top_sort")
private Integer topSort;
- public OrderListVO(Integer orderId) {
- this.orderId = orderId;
+ public String getOrderIdStr() {
+ return String.valueOf(getOrderId());
}
+
}
--
Gitblit v1.7.1