From 67f416634f95c81e618123b826e18a57ae08220d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 17:55:30 +0800
Subject: [PATCH] 11.6
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 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 b4116ba..16a2b7e 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,16 @@
@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;
-
+ @TableField("province_code")
+ private String provinceCode;
+ @TableField("are_code")
+ private String areaCode;
@ApiModelProperty("订单编号")
@TableField("order_number")
private String orderNumber;
@@ -54,6 +57,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")
@@ -85,7 +95,7 @@
@ApiModelProperty("接单时间(师傅接单或后台派单，更新该字段时间)")
@TableField("accept_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date acceptTime;
@ApiModelProperty("服务人员id")
@@ -110,7 +120,7 @@
@ApiModelProperty("师傅到达预约地点时间")
@TableField("arrive_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date arriveTime;
@ApiModelProperty("订单类型(0:正常订单,1:后台订单(后台订单与用户端、师傅端无联系))")
@@ -127,7 +137,7 @@
@ApiModelProperty("订单完成时间")
@TableField("complete_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date completeTime;
@ApiModelProperty("订单补贴金额")
@@ -149,10 +159,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 +185,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