From 428519bd1056dd90cd4589dbf85b380e403ff254 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期五, 05 七月 2024 18:13:08 +0800
Subject: [PATCH] feat: 代码初始化、腾讯云短信SDK
---
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/entity/Order.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/entity/Order.java b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/entity/Order.java
index 3ed7416..dfe6c12 100644
--- a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/entity/Order.java
+++ b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/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")
@@ -72,7 +77,7 @@
@ApiModelProperty("上门时间")
@TableField("time")
- private Date time;
+ private String time;
@ApiModelProperty("服务人员id")
@TableField("server_id")
@@ -104,6 +109,7 @@
@ApiModelProperty("师傅到达预约地点时间")
@TableField("arrive_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm")
private Date arriveTime;
@ApiModelProperty("订单类型(0:正常订单,1:后台订单(后台订单与用户端、师傅端无联系))")
@@ -120,6 +126,31 @@
@ApiModelProperty("订单完成时间")
@TableField("complete_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm")
private Date completeTime;
+ @ApiModelProperty("是否已提现(0:未提现，1:已提现)")
+ @TableField("is_withdrawal")
+ private Integer isWithdrawal;
+
+ @ApiModelProperty("订单补贴金额")
+ @TableField("subsidy")
+ private BigDecimal subsidy;
+
+ @ApiModelProperty("详细地址")
+ @TableField("address")
+ private String address;
+
+ @ApiModelProperty("订单取消原因")
+ @TableField("cancel_reason")
+ private String cancelReason;
+
+ @ApiModelProperty("置顶顺序")
+ @TableField("top_sort")
+ private Integer topSort;
+
+ @ApiModelProperty("回收服务封面图")
+ @TableField(exist = false)
+ private String cover;
+
}
--
Gitblit v1.7.1