From 79d97c39f1d118824f91467feb9f4a55717fd0c0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 26 七月 2024 14:03:41 +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 | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 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 d4faec9..932adcd 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
@@ -56,6 +56,12 @@
private Integer isFrozen;
@ApiModelProperty("中途取消（0=否，1=是）")
private Integer cancelMidway;
+ @ApiModelProperty("备注")
+ private String remark;
+ @ApiModelProperty("超时取消时间")
+ private Long timeOutCancel;
+
+ private String tripId;
public Integer getOrderId() {
return orderId;
@@ -208,7 +214,15 @@
public void setReceipt(String receipt) {
this.receipt = receipt;
}
-
+
+ public Long getTimeOutCancel() {
+ return timeOutCancel;
+ }
+
+ public void setTimeOutCancel(Long timeOutCancel) {
+ this.timeOutCancel = timeOutCancel;
+ }
+
@Override
public String toString() {
return "OrderWarpper{" +
@@ -257,6 +271,9 @@
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.setTimeOutCancel(null != map.get("timeOutCancel") ? Long.valueOf(String.valueOf(map.get("timeOutCancel"))) : 0);
list.add(orderWarpper);
}
}
@@ -280,6 +297,22 @@
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