From 13d2bd6a27f941cfd8f096a7ae2def858a565363 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 04 九月 2024 11:01:34 +0800
Subject: [PATCH] 修改2.0 bug

---
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java |   48 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 47 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 9c3c386..1d2b96a 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;
     /**
      * 补差价金额
@@ -415,4 +416,49 @@
      */
     @TableField("startMileage")
     private Double startMileage;
+    /**
+     * 中途取消(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;
+    /**
+     * 去往起点的路程数(米)
+     */
+    @TableField("toStartPointMileage")
+    private Double toStartPointMileage;
+    /**
+     * 起步分钟
+     */
+    @TableField("startDuration")
+    private Integer startDuration;
+    /**
+     * 是否冻结(1=否,2=是)
+     */
+    @TableField("isFrozen")
+    private Integer isFrozen;
+    /**
+     * 争议订单(0=否,1=是)
+     */
+    @TableField("isDispute")
+    private Integer isDispute;
 }

--
Gitblit v1.7.1