From 18f7360b6d8a02a8ff49e22e1b568a227811beff Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 21 十月 2025 18:04:51 +0800
Subject: [PATCH] 是否启用虚拟号
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Order.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 49 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..92bb71a 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,43 @@
@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;
+
+ @ApiModelProperty("绑定关系id")
+ @TableField("subscription_id")
+ private String subscriptionId;
+ @ApiModelProperty("虚拟号码")
+ @TableField("virtual_number")
+ private String virtualNumber;
+ @ApiModelProperty("电话录音")
+ @TableField("phone_recording")
+ private String phoneRecording;
+ @ApiModelProperty("录音文件存储的服务器域名")
+ @TableField("record_domain")
+ private String recordDomain;
+ @ApiModelProperty("录音文件名")
+ @TableField("record_object_name")
+ private String recordObjectName;
+ @ApiModelProperty("是否启用虚拟号 1=是 0=否")
+ @TableField("is_open_virtual_number")
+ private Integer isOpenVirtualNumber;
+
}
--
Gitblit v1.7.1