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/OrderInfoWarpper.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
index 021b764..3d8b3bc 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
@@ -145,11 +145,13 @@
@ApiModelProperty("司机接单时间")
private String snatchOrderTime;
@ApiModelProperty("司机超时时间")
- private Long driverTimeOut;
- @ApiModelProperty("超时取消时间")
- private Long timeOutCancel;
+ private Integer driverTimeOutTime;
+ @ApiModelProperty("司机是否超时（0=否，1=是）")
+ private Integer driverTimeOut;
private String tripId;
private List<OrderPosition> orderPositionList;
+ @ApiModelProperty("争议订单（0=否，1=是）")
+ private Integer isDispute;
public static OrderInfoWarpper getOrderInfoWarpper(Map<String, Object> map){
OrderInfoWarpper orderInfoWarpper = new OrderInfoWarpper();
@@ -219,11 +221,12 @@
orderInfoWarpper.setPayType(null != map.get("payType") ? Integer.valueOf(map.get("payType").toString()) : 4);
orderInfoWarpper.setReceipt(null != map.get("receipt") ? map.get("receipt").toString() : "");
orderInfoWarpper.setIsFrozen(null != map.get("isFrozen") ? Integer.valueOf(map.get("isFrozen").toString()) : 1);
- orderInfoWarpper.setTimeOutCancel(null != map.get("timeOutCancel") ? Long.valueOf(map.get("timeOutCancel").toString()) : 0L);
- orderInfoWarpper.setDriverTimeOut(null != map.get("driverTimeOut") ? Long.valueOf(map.get("driverTimeOut").toString()) : 0L);
+ orderInfoWarpper.setDriverTimeOutTime(null != map.get("driverTimeOutTime") ? Integer.valueOf(map.get("driverTimeOutTime").toString()) : 0);
+ orderInfoWarpper.setDriverTimeOut(null != map.get("driverTimeOut") ? Integer.valueOf(map.get("driverTimeOut").toString()) : 0);
orderInfoWarpper.setSnatchOrderTime(null != map.get("snatchOrderTime") ? map.get("snatchOrderTime").toString() : "");
orderInfoWarpper.setPriceDifference(null != map.get("priceDifference") ? Double.valueOf(map.get("priceDifference").toString()) : 0);
orderInfoWarpper.setTripId(null != map.get("tripId") ? map.get("tripId").toString() : "");
+ orderInfoWarpper.setIsDispute(null != map.get("isDispute") ? Integer.valueOf(map.get("isDispute").toString()) : 0);
}
if(orderInfoWarpper.getState()==7){
orderInfoWarpper.setOrderMoney(orderInfoWarpper.getOrderMoney()-orderInfoWarpper.getDiscountMoney());
--
Gitblit v1.7.1