From f9b9131367d9ba6fe852130b12083c0f5ea68bbb Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 27 五月 2024 17:26:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
index 5cc1be0..3dbb46f 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
@@ -11,8 +11,7 @@
public class OrderInfoWarpper {
@ApiModelProperty("订单id")
private Integer orderId;
- @ApiModelProperty("1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中)<br/>" +
- "小件物流订单状态（状态(1=待接单，2=待出发，3=待到达预约地点，4=待取货，5=送货中，6=已送达，7=待支付，8=需补差价，9=已取货，10=已取消，11=已支付差价)）")
+ @ApiModelProperty("状态(1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付，13=补差价)")
private Integer orderState;
@ApiModelProperty("订单名称")
private String orderName;
@@ -48,7 +47,7 @@
private Integer historyNum;
@ApiModelProperty("订单总金额")
private Double orderMoney;
- @ApiModelProperty(value = "支付方式（1=OK平台支付（线上支付），2=其他方式支付（线下支付））11111", example = "1")
+ @ApiModelProperty(value = "支付方式（1=OK平台支付（线上支付），2=其他方式支付（线下支付））", example = "1")
private Integer payManner;
@ApiModelProperty("支付金额")
private Double payMoney;
@@ -84,6 +83,8 @@
private Integer urgent;
@ApiModelProperty("下单用户姓名")
private String userName;
+ @ApiModelProperty("下单用户电话")
+ private String userPhone;
@ApiModelProperty("司机支付状态【现金支付需要司机代支付】（1=待支付，2=已支付）")
private Integer driverPay;
@ApiModelProperty("轨迹")
@@ -91,6 +92,10 @@
private Integer startDuration;
@ApiModelProperty("是否冻结（1=否，2=是）")
private Integer isFrozen;
+ @ApiModelProperty("超时取消时间")
+ private Integer timeOutCancel;
+ @ApiModelProperty("接单时间")
+ private String snatchOrderTime;
public Integer getStartDuration() {
return startDuration;
@@ -420,6 +425,30 @@
this.isFrozen = isFrozen;
}
+ public Integer getTimeOutCancel() {
+ return timeOutCancel;
+ }
+
+ public void setTimeOutCancel(Integer timeOutCancel) {
+ this.timeOutCancel = timeOutCancel;
+ }
+
+ public String getSnatchOrderTime() {
+ return snatchOrderTime;
+ }
+
+ public void setSnatchOrderTime(String snatchOrderTime) {
+ this.snatchOrderTime = snatchOrderTime;
+ }
+
+ public String getUserPhone() {
+ return userPhone;
+ }
+
+ public void setUserPhone(String userPhone) {
+ this.userPhone = userPhone;
+ }
+
@Override
public String toString() {
return "OrderInfoWarpper{" +
@@ -505,6 +534,9 @@
orderInfoWarpper.setUserName(null != map.get("userName") ? String.valueOf(map.get("userName")) : "");
orderInfoWarpper.setDriverPay(null != map.get("driverPay") ? Integer.valueOf(map.get("driverPay").toString()) : 0);
orderInfoWarpper.setIsFrozen(null != map.get("isFrozen") ? Integer.valueOf(map.get("isFrozen").toString()) : 1);
+ orderInfoWarpper.setTimeOutCancel(null != map.get("timeOutCancel") ? Integer.valueOf(map.get("timeOutCancel").toString()) : 0);
+ orderInfoWarpper.setSnatchOrderTime(null != map.get("snatchOrderTime") ? map.get("snatchOrderTime").toString() : "");
+ orderInfoWarpper.setUserPhone(null != map.get("userPhone") ? map.get("userPhone").toString() : "");
}
return orderInfoWarpper;
}
--
Gitblit v1.7.1