From 1442f149019ee0590389abd7a88a79c4d9b59034 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 五月 2025 18:23:34 +0800
Subject: [PATCH] bug修改
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java
index 14d39c0..314e5c4 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java
@@ -28,13 +28,19 @@
@ApiModel(value = "Order对象", description = "订单管理")
public class Order extends BaseEntity {
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
@ApiModelProperty("下单城市")
@TableField("city")
private String city;
-
+ @ApiModelProperty("师傅填写备注")
+ @TableField("remark")
+ private String remark;
+ @TableField("province_code")
+ private String provinceCode;
+ @TableField("are_code")
+ private String areaCode;
@ApiModelProperty("订单编号")
@TableField("order_number")
private String orderNumber;
@@ -54,6 +60,13 @@
@ApiModelProperty("回收服务id")
@TableField("serve_id")
private Integer serveId;
+
+ @ApiModelProperty("打印次数")
+ @TableField("print_count")
+ private Integer printCount;
+ @TableField("msg_count")
+ private Integer msgCount;
+
@ApiModelProperty("回收服务名称")
@TableField("serve_name")
@@ -104,7 +117,7 @@
@TableField("reservation_remark")
private String reservationRemark;
- @ApiModelProperty("订单状态(0:待派单；1:待上门；2:待完工；3:已完结；4:已取消；5:已改派，6:待改派)")
+ @ApiModelProperty("订单状态(0:待派单；1:待上门；2:待完工；3:已完结；4:已取消；5:已改派，7：待预约)")
@TableField("state")
private Integer state;
@@ -149,10 +162,24 @@
@ApiModelProperty("置顶顺序")
@TableField("top_sort")
private Integer topSort;
+ @ApiModelProperty("虚假订单")
+ @TableField("fake")
+ private Integer fake;
+
+ @ApiModelProperty("是否评价(0:未评价,1:已评价)")
+ @TableField("is_evaluate")
+ private Integer isEvaluate;
+
+ @ApiModelProperty("城市code")
+ @TableField("city_code")
+ private String cityCode;
@ApiModelProperty("回收服务封面图")
@TableField(exist = false)
private String cover;
+ @ApiModelProperty("师傅头像")
+ @TableField(exist = false)
+ private String WorkPic;
@ApiModelProperty("再投原因")
@TableField(exist = false)
@@ -161,5 +188,15 @@
@ApiModelProperty("是否为再投单")
@TableField("is_reinvest")
private Integer isReinvest;
-
+ @ApiModelProperty("铭牌图片(多张照片 ','隔开)")
+ @TableField("card_pic")
+ private String cardPic;
+ @ApiModelProperty("机型图片(多张照片 ','隔开)")
+ @TableField("machine_pic")
+ private String machinePic;
+ @ApiModelProperty("回收单凭证(多张照片 ','隔开)")
+ @TableField("paper_pic")
+ private String paperPic;
+ @ApiModelProperty("拉起确认收款页面参数")
+ private String packageInfo;
}
--
Gitblit v1.7.1