From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 三月 2025 19:57:56 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java
index 19ae6a8..0c27af2 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java
@@ -29,7 +29,7 @@
@ApiModelProperty("司机id")
private Integer driverId;
@ApiModelProperty("订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付）<br/>" +
- "小件物流订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待取货，5=送货中，6=已送达，7=待支付，8=需补差价，9=已取货，10=已取消，11=已支付差价")
+ "小件物流订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付，13=补差价")
private Integer state;
@ApiModelProperty("货物类型（小件物流）")
private String cargoType;
@@ -54,6 +54,17 @@
private String receipt;
@ApiModelProperty("是否冻结（1=否，2=是）")
private Integer isFrozen;
+ @ApiModelProperty("中途取消（0=否，1=是）")
+ private Integer cancelMidway;
+ @ApiModelProperty("备注")
+ private String remark;
+ @ApiModelProperty("司机超时时间")
+ private Integer driverTimeOutTime;
+
+ @ApiModelProperty("司机是否超时（0=否，1=是）")
+ private Integer driverTimeOut;
+
+ private String tripId;
public Integer getOrderId() {
return orderId;
@@ -206,7 +217,23 @@
public void setReceipt(String receipt) {
this.receipt = receipt;
}
-
+
+ public Integer getDriverTimeOutTime() {
+ return driverTimeOutTime;
+ }
+
+ public void setDriverTimeOutTime(Integer driverTimeOutTime) {
+ this.driverTimeOutTime = driverTimeOutTime;
+ }
+
+ public Integer getDriverTimeOut() {
+ return driverTimeOut;
+ }
+
+ public void setDriverTimeOut(Integer driverTimeOut) {
+ this.driverTimeOut = driverTimeOut;
+ }
+
@Override
public String toString() {
return "OrderWarpper{" +
@@ -254,6 +281,11 @@
orderWarpper.setDifferenceMoney(null != map.get("differenceMoney") ? Double.valueOf(map.get("differenceMoney").toString()) : 0D);
orderWarpper.setReceipt(null != map.get("receipt") ? String.valueOf(map.get("receipt")) : "");
orderWarpper.setIsFrozen(null != map.get("isFrozen") ? Integer.valueOf(String.valueOf(map.get("isFrozen"))) : 1);
+ orderWarpper.setCancelMidway(null != map.get("cancelMidway") ? Integer.valueOf(String.valueOf(map.get("cancelMidway"))) : 0);
+ orderWarpper.setTripId(null != map.get("tripId") ? String.valueOf(map.get("tripId")) : "");
+ orderWarpper.setRemark(null != map.get("remark") ? String.valueOf(map.get("remark")) : "");
+ orderWarpper.setDriverTimeOutTime(null != map.get("driverTimeOutTime") ? Integer.valueOf(String.valueOf(map.get("driverTimeOutTime"))) : 0);
+ orderWarpper.setDriverTimeOut(null != map.get("driverTimeOut") ? Integer.valueOf(String.valueOf(map.get("driverTimeOut"))) : 0);
list.add(orderWarpper);
}
}
@@ -269,6 +301,30 @@
this.isFrozen = isFrozen;
}
+ public Integer getCancelMidway() {
+ return cancelMidway;
+ }
+
+ public void setCancelMidway(Integer cancelMidway) {
+ this.cancelMidway = cancelMidway;
+ }
+
+ public String getTripId() {
+ return tripId;
+ }
+
+ public void setTripId(String tripId) {
+ this.tripId = tripId;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
@Override
public int compareTo(Object o) {
if (o instanceof OrderWarpper) {
--
Gitblit v1.7.1