From f83fcb269a11e4f0051bc44397e68772f69ba56f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 01 七月 2025 14:34:39 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Order.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 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 3c2ea31..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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -27,8 +28,12 @@
@ApiModel(value = "Order对象", description = "订单管理")
public class Order extends BaseEntity {
- @TableId(value = "id",type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Integer id;
+
+ @ApiModelProperty("下单城市")
+ @TableField("city")
+ private String city;
@ApiModelProperty("订单编号")
@TableField("order_number")
@@ -74,9 +79,9 @@
@TableField("reservation_address")
private String reservationAddress;
- @ApiModelProperty("上门时间")
+ @ApiModelProperty("上门时间段")
@TableField("time")
- private Date time;
+ private String time;
@ApiModelProperty("接单时间(师傅接单或后台派单，更新该字段时间)")
@TableField("accept_time")
@@ -102,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;
@@ -118,8 +128,24 @@
@TableField("complete_time")
private Date completeTime;
- @ApiModelProperty("是否已提现(0:未提现，1:已提现)")
+ @ApiModelProperty("订单补贴金额")
+ @TableField("subsidy")
+ private BigDecimal subsidy;
+
+ @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