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-order/src/main/java/com/ruoyi/order/entity/Order.java |   53 +++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java
index 2918b8e..9d46a23 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java
@@ -34,7 +34,9 @@
     @ApiModelProperty("下单城市")
     @TableField("city")
     private String city;
-
+    @ApiModelProperty("师傅填写备注")
+    @TableField("remark")
+    private String remark;
     @TableField("province_code")
     private String provinceCode;
 
@@ -61,7 +63,9 @@
     @ApiModelProperty("站点名称")
     @TableField("site_name")
     private String siteName;
-
+    @ApiModelProperty("拉起确认收款页面参数")
+    @TableField("package_info")
+    private String packageInfo;
     @ApiModelProperty("回收服务id")
     @TableField("serve_id")
     private Integer serveId;
@@ -115,7 +119,7 @@
     @TableField("reservation_remark")
     private String reservationRemark;
 
-    @ApiModelProperty("订单状态(0:待派单;1:待上门;2:待完工;3:已完结;4:已取消;5:已改派,6:待改派)")
+    @ApiModelProperty("订单状态(0:待派单;1:待上门;2:待完工;3:已完结;4:已取消;5:已改派,6:待改派,7:待预约)")
     @TableField("state")
     private Integer state;
 
@@ -145,7 +149,7 @@
     @TableField("subsidy")
     private BigDecimal subsidy;
 
-    @ApiModelProperty("是否已提现(0:未提现,1:已提现)")
+    @ApiModelProperty("是否已提现(0:未提现,1:审核中 2审核通过 3:已确认收款)")
     @TableField("is_withdrawal")
     private Integer isWithdrawal;
 
@@ -177,6 +181,28 @@
     @TableField(exist = false)
     private String applyReason;
 
+    @ApiModelProperty("代派单")
+    @TableField(exist = false)
+    private Integer toBeDispatched=0;
+    @ApiModelProperty("待上门")
+    @TableField(exist = false)
+    private Integer stayDoorstep=0;
+    @ApiModelProperty("带完工")
+    @TableField(exist = false)
+    private Integer toBeCompleted=0;
+    @ApiModelProperty("已完结")
+    @TableField(exist = false)
+    private Integer completed=0;
+    @ApiModelProperty("已取消")
+    @TableField(exist = false)
+    private Integer canceled =0;
+    @ApiModelProperty("再投数量")
+    @TableField(exist = false)
+    private Integer reInvestment=0;
+    @ApiModelProperty("待预约数量")
+    @TableField(exist = false)
+    private Integer pending=0;
+
     @ApiModelProperty("是否为再投单")
     @TableField("is_reinvest")
     private Integer isReinvest;
@@ -190,4 +216,23 @@
     @TableField("msg_count")
     private Integer msgCount;
 
+    @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