From b3b7d3ae4789eb3d4d4bbadccd03d79adb28cb1a Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 25 七月 2024 18:21:09 +0800
Subject: [PATCH] 修改2.0 bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 58 insertions(+), 3 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 7d384bd..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
@@ -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;
@@ -52,6 +52,16 @@
private Long insertTime;
@ApiModelProperty("收据链接")
private String receipt;
+ @ApiModelProperty("是否冻结（1=否，2=是）")
+ 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;
@@ -204,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{" +
@@ -251,13 +269,50 @@
orderWarpper.setServerCarModel(null != map.get("serverCarModel") ? String.valueOf(map.get("serverCarModel")) : "");
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.setTimeOutCancel(null != map.get("timeOutCancel") ? Long.valueOf(String.valueOf(map.get("timeOutCancel"))) : 0);
list.add(orderWarpper);
}
}
Collections.sort(list);
return list;
}
-
+
+ public Integer getIsFrozen() {
+ return isFrozen;
+ }
+
+ public void setIsFrozen(Integer isFrozen) {
+ 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