From 26079aa3c34f47e952a9538a93d6f8a3bab9a0fc Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 23 八月 2024 09:12:44 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 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 6eb9aa7..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
@@ -58,10 +58,11 @@
private Integer cancelMidway;
@ApiModelProperty("备注")
private String remark;
- @ApiModelProperty("超时取消时间")
- private Long timeOutCancel;
@ApiModelProperty("司机超时时间")
- private Long driverTimeOut;
+ private Integer driverTimeOutTime;
+
+ @ApiModelProperty("司机是否超时（0=否，1=是）")
+ private Integer driverTimeOut;
private String tripId;
@@ -217,19 +218,19 @@
this.receipt = receipt;
}
- public Long getTimeOutCancel() {
- return timeOutCancel;
+ public Integer getDriverTimeOutTime() {
+ return driverTimeOutTime;
}
- public void setTimeOutCancel(Long timeOutCancel) {
- this.timeOutCancel = timeOutCancel;
+ public void setDriverTimeOutTime(Integer driverTimeOutTime) {
+ this.driverTimeOutTime = driverTimeOutTime;
}
- public Long getDriverTimeOut() {
+ public Integer getDriverTimeOut() {
return driverTimeOut;
}
- public void setDriverTimeOut(Long driverTimeOut) {
+ public void setDriverTimeOut(Integer driverTimeOut) {
this.driverTimeOut = driverTimeOut;
}
@@ -283,8 +284,8 @@
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.setTimeOutCancel(null != map.get("timeOutCancel") ? Long.valueOf(String.valueOf(map.get("timeOutCancel"))) : 0);
- orderWarpper.setDriverTimeOut(null != map.get("driverTimeOut") ? Long.valueOf(String.valueOf(map.get("driverTimeOut"))) : 0);
+ 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);
}
}
--
Gitblit v1.7.1