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/OrderInfoWarpper.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 ac567c2..549f90a 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
@@ -17,7 +17,7 @@
private Integer orderType;
@ApiModelProperty("订单类型（1=普通订单，2=摆渡车）")
private Integer type;
- @ApiModelProperty("订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付）")
+ @ApiModelProperty("订单状态（1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付，13=补差价）")
private Integer state;
@ApiModelProperty("下单时间")
private String insertTime;
@@ -103,6 +103,8 @@
private Double discount;
@ApiModelProperty("折扣优惠金额")
private Double discountMoney;
+ @ApiModelProperty("补差价金额")
+ private Double priceDifference;
@ApiModelProperty("订单支付金额")
private Double payMoney;
@ApiModelProperty("订单支付方式（1=手机支付，2=银行卡支付，3=余额支付，4=现金支付）")
@@ -140,8 +142,13 @@
private String receipt;
@ApiModelProperty("是否冻结（1=否，2=是）")
private Integer isFrozen;
+ @ApiModelProperty("司机接单时间")
+ private String snatchOrderTime;
+ @ApiModelProperty("司机超时时间")
+ private Long driverTimeOut;
@ApiModelProperty("超时取消时间")
- private Integer timeOutCancel;
+ private Long timeOutCancel;
+ private String tripId;
private List<OrderPosition> orderPositionList;
public static OrderInfoWarpper getOrderInfoWarpper(Map<String, Object> map){
@@ -212,7 +219,11 @@
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") ? Integer.valueOf(map.get("timeOutCancel").toString()) : 0);
+ 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.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() : "");
}
if(orderInfoWarpper.getState()==7){
orderInfoWarpper.setOrderMoney(orderInfoWarpper.getOrderMoney()-orderInfoWarpper.getDiscountMoney());
--
Gitblit v1.7.1