From be053a794115fc5fd4a21b13b387402f41705f1f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 12 十二月 2024 16:18:11 +0800
Subject: [PATCH] 修改bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 caf4c2e..bf81f07 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
@@ -96,7 +96,7 @@
@ApiModelProperty("是否冻结（1=否，2=是）")
private Integer isFrozen;
@ApiModelProperty("超时取消时间")
- private Integer timeOutCancel;
+ private Long timeOutCancel;
@ApiModelProperty("超时语音文件地址")
private String audioUrl;
@ApiModelProperty("接单时间")
@@ -104,6 +104,8 @@
private String tripId;
@ApiModelProperty("中途取消（0=否，1=是）")
private Integer cancelMidway;
+ @ApiModelProperty("争议订单（0=否，1=是）")
+ private Integer isDispute;
public Integer getStartDuration() {
return startDuration;
@@ -433,11 +435,11 @@
this.isFrozen = isFrozen;
}
- public Integer getTimeOutCancel() {
+ public Long getTimeOutCancel() {
return timeOutCancel;
}
- public void setTimeOutCancel(Integer timeOutCancel) {
+ public void setTimeOutCancel(Long timeOutCancel) {
this.timeOutCancel = timeOutCancel;
}
@@ -487,6 +489,14 @@
public void setPriceDifference(Double priceDifference) {
this.priceDifference = priceDifference;
+ }
+
+ public Integer getIsDispute() {
+ return isDispute;
+ }
+
+ public void setIsDispute(Integer isDispute) {
+ this.isDispute = isDispute;
}
@Override
@@ -574,13 +584,14 @@
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.setTimeOutCancel(null != map.get("timeOutCancel") ? Long.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() : "");
orderInfoWarpper.setCancelMidway(null != map.get("cancelMidway") ? Integer.valueOf(map.get("cancelMidway").toString()) : 0);
orderInfoWarpper.setAudioUrl(null != map.get("audioUrl") ? map.get("audioUrl").toString() : "");
orderInfoWarpper.setPriceDifference(null != map.get("priceDifference") ? Double.valueOf(map.get("priceDifference").toString()) : 0);
+ orderInfoWarpper.setIsDispute(null != map.get("isDispute") ? Integer.valueOf(map.get("isDispute").toString()) : 0);
}
return orderInfoWarpper;
}
--
Gitblit v1.7.1