From 9411a5a1eec19f3460eca9a6c82ebb46dc4e2f0d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 26 六月 2025 20:06:58 +0800
Subject: [PATCH] 大屏接口bug修改
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Order.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Order.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Order.java
index 21dec73..4f82687 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Order.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Order.java
@@ -10,7 +10,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
-import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
@@ -80,11 +79,9 @@
@TableField("reservation_address")
private String reservationAddress;
- @ApiModelProperty("上门时间")
+ @ApiModelProperty("上门时间段")
@TableField("time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date time;
+ private String time;
@ApiModelProperty("接单时间(师傅接单或后台派单，更新该字段时间)")
@TableField("accept_time")
@@ -110,6 +107,11 @@
@TableField("state")
private Integer state;
+ @ApiModelProperty("师傅到达预约地点时间")
+ @TableField("arrive_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date arriveTime;
+
@ApiModelProperty("订单类型(0:正常订单,1:后台订单(后台订单与用户端、师傅端无联系))")
@TableField("type")
private Integer type;
@@ -130,10 +132,18 @@
@TableField("subsidy")
private BigDecimal subsidy;
- @ApiModelProperty("是否已提现(0:未提现，1:已提现)")
+ @ApiModelProperty("是否已提现(0:未提现，1:审核中 2审核通过 3:已确认收款)")
@TableField("is_withdrawal")
private Integer isWithdrawal;
+ @ApiModelProperty("详细地址")
+ @TableField("address")
+ private String address;
+
+ @ApiModelProperty("订单取消原因")
+ @TableField("cancel_reason")
+ private String cancelReason;
+
@ApiModelProperty("再投原因")
@TableField(exist = false)
private String applyReason;
--
Gitblit v1.7.1