From 48effdca685a209c19dd2a0ccd456470a895784b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 十月 2024 18:01:18 +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/specialTrain/model/OrderPrivateCar.java | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
index 46acfc7..c21e85c 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
@@ -147,6 +147,11 @@
@TableField("getoffTime")
private Date getoffTime;
/**
+ * 去往起点的路程数（米）
+ */
+ @TableField("toStartPointMileage")
+ private Double toStartPointMileage;
+ /**
* 行驶里程数（米）
*/
@TableField("mileage")
@@ -240,7 +245,7 @@
* 红包id
*/
@TableField("redPacketId")
- private Integer redPacketId;
+ private String redPacketId;
/**
* 优惠券id
*/
@@ -405,5 +410,39 @@
*/
@TableField("destination")
private String destination;
-
+ /**
+ * 中途取消（0=否，1=是）
+ */
+ @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;
+ /**
+ * 是否冻结(1=否，2=是)
+ */
+ @TableField("isFrozen")
+ private Integer isFrozen;
+ /**
+ * 争议订单（0=否，1=是）
+ */
+ @TableField("isDispute")
+ private Integer isDispute;
}
--
Gitblit v1.7.1