From 9acb17a6871d84a85c373eb90b980f98894e30e0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 18 二月 2025 17:58:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 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 cdda0c2..6f5d07f 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
@@ -35,6 +35,12 @@
@TableField("city")
private String city;
+ @TableField("province_code")
+ private String provinceCode;
+
+ @TableField("area_code")
+ private String areaCode;
+
@ApiModelProperty("订单编号")
@TableField("order_number")
private String orderNumber;
@@ -42,6 +48,11 @@
@ApiModelProperty("下单用户id")
@TableField("user_id")
private Integer userId;
+
+
+ @ApiModelProperty("下单用户id")
+ @TableField("print_count")
+ private Integer printCount;
@ApiModelProperty("站点id")
@TableField("site_id")
@@ -85,7 +96,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 +121,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 +138,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("订单补贴金额")
@@ -150,6 +161,10 @@
@TableField("top_sort")
private Integer topSort;
+ @ApiModelProperty("城市code")
+ @TableField("city_code")
+ private String cityCode;
+
@ApiModelProperty("是否评价(0:未评价,1:已评价)")
@TableField("is_evaluate")
private Integer isEvaluate;
@@ -162,8 +177,42 @@
@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("is_reinvest")
private Integer isReinvest;
+
+ @ApiModelProperty("1虚假订单0正常订单")
+ @TableField("fake")
+ private Integer fake;
+
+ @ApiModelProperty("短信发送次数")
+ @TableField("msg_count")
+ private Integer msgCount;
+
}
--
Gitblit v1.7.1