From 287cbb376dea7b3972e5f38a38fad043aa4d3b68 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 01 八月 2024 16:05:33 +0800
Subject: [PATCH] 修改2.0 bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
index ffbc64e..aa488f1 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
@@ -287,7 +287,7 @@
@TableField("payMoney")
private Double payMoney;
/**
- * 状态(1=待接单，2=待出发，3=待到达预约地点，4=待取货，5=送货中，6=已送达，7=待支付，8=需补差价，9=已取货，10=已取消，11=改派中，12=已支付差价，13=取消待支付)
+ * 状态(1=待接单，2=待出发，3=待到达预约地点，4=待乘客上车，5=服务中，6=完成服务，7=待支付，8=待评价，9=已完成，10=已取消，11=改派中，12=取消待支付，13=补差价)
*/
@TableField("state")
private Integer state;
@@ -404,6 +404,7 @@
@TableField("destination")
private String destination;
private Integer isplatPay;
+ @TableField(exist = false)
private BigDecimal freeMoney;
/**
* 补差价金额
@@ -420,4 +421,34 @@
*/
@TableField("cancelMidway")
private Integer cancelMidway;
+ /**
+ * google行程id
+ */
+ @TableField("tripId")
+ private String tripId;
+ /**
+ * 预估里程
+ */
+ @TableField("estimatedMileage")
+ private Double estimatedMileage;
+ /**
+ * 司机预估到达预约单时间
+ */
+ @TableField("estimateArriveTime")
+ private Date estimateArriveTime;
+ /**
+ * 司机预估距离预约点距离（米）
+ */
+ @TableField("estimateArriveMileage")
+ private Long estimateArriveMileage;
+ /**
+ * 去往起点的路程数（米）
+ */
+ @TableField("toStartPointMileage")
+ private Double toStartPointMileage;
+ /**
+ * 起步分钟
+ */
+ @TableField("startDuration")
+ private Integer startDuration;
}
--
Gitblit v1.7.1