From 736ab0090700c75af37b8a3456b01609e4e2d329 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 17 七月 2024 11:09:40 +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 | 68 ++++++++++++++++++++++++++++-----
1 files changed, 57 insertions(+), 11 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 7589abb..e299a92 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
@@ -1,12 +1,9 @@
package com.stylefeng.guns.modular.system.warpper;
-import com.stylefeng.guns.modular.system.model.OrderPosition;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
@ApiModel("订单详情22")
@@ -14,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;
@@ -51,12 +47,10 @@
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;
-
-
@ApiModelProperty("是否是改派单（1=否，2=是）")
private Integer isReassign;
@ApiModelProperty("高德猎鹰轨迹id(订单开始后需要上传坐标到指定轨迹中)")
@@ -89,13 +83,20 @@
private Integer urgent;
@ApiModelProperty("下单用户姓名")
private String userName;
+ @ApiModelProperty("下单用户电话")
+ private String userPhone;
@ApiModelProperty("司机支付状态【现金支付需要司机代支付】（1=待支付，2=已支付）")
private Integer driverPay;
-
@ApiModelProperty("轨迹")
private String orderPositionList;
-
private Integer startDuration;
+ @ApiModelProperty("是否冻结（1=否，2=是）")
+ private Integer isFrozen;
+ @ApiModelProperty("超时取消时间")
+ private Integer timeOutCancel;
+ @ApiModelProperty("接单时间")
+ private String snatchOrderTime;
+ private String tripId;
public Integer getStartDuration() {
return startDuration;
@@ -416,7 +417,47 @@
public void setDriverPay(Integer driverPay) {
this.driverPay = driverPay;
}
-
+
+ public Integer getIsFrozen() {
+ return isFrozen;
+ }
+
+ public void setIsFrozen(Integer isFrozen) {
+ 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;
+ }
+
+ public String getTripId() {
+ return tripId;
+ }
+
+ public void setTripId(String tripId) {
+ this.tripId = tripId;
+ }
+
@Override
public String toString() {
return "OrderInfoWarpper{" +
@@ -501,6 +542,11 @@
orderInfoWarpper.setUrgent(null != map.get("urgent") ? Integer.valueOf(map.get("urgent").toString()) : 0);
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() : "");
+ orderInfoWarpper.setTripId(null != map.get("tripId") ? map.get("tripId").toString() : "");
}
return orderInfoWarpper;
}
--
Gitblit v1.7.1