From a782d74cf0a6e2181f68bb1f4472ade94626f688 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 01 七月 2025 18:09:53 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/vo/OrderListVO.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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 666b6eb..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
@@ -1,5 +1,7 @@
package com.ruoyi.worker.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -14,8 +16,11 @@
@Data
public class OrderListVO {
+ @ApiModelProperty("字符串订单id")
+ private String orderIdStr;
+
@ApiModelProperty("订单id")
- private Integer orderId;
+ private String orderId;
@ApiModelProperty("订单编号")
private String orderNumber;
@@ -28,6 +33,9 @@
@ApiModelProperty("回收服务id")
private Integer serveId;
+
+ @ApiModelProperty("虚假订单")
+ private Integer fake;
@ApiModelProperty("回收服务名称")
private String serveName;
@@ -50,8 +58,8 @@
@ApiModelProperty("预约地址")
private String reservationAddress;
- @ApiModelProperty("预约上门时间")
- private Date time;
+ @ApiModelProperty("预约上门时间段")
+ private String time;
@ApiModelProperty("服务人员id")
private Integer serverId;
@@ -72,21 +80,28 @@
private Integer state;
@ApiModelProperty("接单时间(师傅接单或后台派单，更新该字段时间)")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date acceptTime;
@ApiModelProperty("师傅到达预约地点时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date arriveTime;
@ApiModelProperty("订单类型(0:正常订单,1:后台订单(后台订单与用户端、师傅端无联系))")
private Integer type;
@ApiModelProperty("下单用户经度")
- private Integer longitude;
+ private Double longitude;
@ApiModelProperty("下单用户纬度")
- private Integer latitude;
+ private Double latitude;
- public OrderListVO(Integer orderId) {
- this.orderId = orderId;
+ @ApiModelProperty("置顶顺序")
+ @TableField("top_sort")
+ private Integer topSort;
+
+ public String getOrderIdStr() {
+ return String.valueOf(getOrderId());
}
+
}
--
Gitblit v1.7.1