From f08b7e95bc941a72d4a7b7bc64c2086ed53f1565 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 21 十月 2024 15:48:27 +0800
Subject: [PATCH] 修改2.0 bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java | 133 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 117 insertions(+), 16 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
index e21686a..1c4ca41 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -40,6 +41,11 @@
*/
@TableField("carId")
private Integer carId;
+ /**
+ * 服务车型id
+ */
+ @TableField("serverCarModelId")
+ private Integer serverCarModelId;
/**
* 订单号
*/
@@ -181,15 +187,60 @@
@TableField("orderMoney")
private Double orderMoney;
/**
- * 行程费
+ * 起步价
*/
- @TableField("travelMoney")
- private Double travelMoney;
+ @TableField("startMoney")
+ private Double startMoney;
/**
- * 小费
+ * 里程公里
*/
- @TableField("tipMoney")
- private Double tipMoney;
+ @TableField("mileageKilometers")
+ private Double mileageKilometers;
+ /**
+ * 里程费
+ */
+ @TableField("mileageMoney")
+ private Double mileageMoney;
+ /**
+ * 时长分钟
+ */
+ @TableField("duration")
+ private Double duration;
+ /**
+ * 时长费
+ */
+ @TableField("durationMoney")
+ private Double durationMoney;
+ /**
+ * 等待分钟
+ */
+ @TableField("wait")
+ private Double wait;
+ /**
+ * 等待费
+ */
+ @TableField("waitMoney")
+ private Double waitMoney;
+ /**
+ * 远途公里
+ */
+ @TableField("longDistance")
+ private Double longDistance;
+ /**
+ * 远途费
+ */
+ @TableField("longDistanceMoney")
+ private Double longDistanceMoney;
+ /**
+ * 停车费
+ */
+ @TableField("parkMoney")
+ private Double parkMoney;
+ /**
+ * 过路费
+ */
+ @TableField("roadTollMoney")
+ private Double roadTollMoney;
/**
* 红包抵扣金额
*/
@@ -204,7 +255,7 @@
* 红包id
*/
@TableField("redPacketId")
- private Integer redPacketId;
+ private String redPacketId;
/**
* 优惠券id
*/
@@ -236,7 +287,7 @@
@TableField("payMoney")
private Double payMoney;
/**
- * 状态(1=待接单，2=待出发，3=待到达预约地点，4=待取货，5=送货中，6=已送达，7=待支付，8=需补差价，9=已取货，10=已取消，11=改派中，12=已支付差价)
+ * 状态(1=待接单，2=待出发，3=待到达预约地点，4=待取货，5=送货中，6=已送达，7=待支付，8=需补差价，9=已取货，10=已取消，11=改派中，12=已支付差价，13=取消待支付)
*/
@TableField("state")
private Integer state;
@@ -297,12 +348,6 @@
@TableField("isDelete")
private Integer isDelete;
/**
- * 该派前的订单状态
- * @return
- */
- @TableField("oldState")
- private Integer oldState;
- /**
* 移动小号
* @return
*/
@@ -338,6 +383,12 @@
@TableField("driverPay")
private Integer driverPay;
/**
+ * 改派之前的订单状态
+ * @return
+ */
+ @TableField("oldState")
+ private Integer oldState;
+ /**
* 修改目的地经度
*/
@TableField("destinationLon")
@@ -352,6 +403,56 @@
*/
@TableField("destination")
private String destination;
-
-
+ private Integer isplatPay;
+ private BigDecimal freeMoney;
+ /**
+ * 补差价金额
+ */
+ @TableField("priceDifference")
+ private Double priceDifference;
+ /**
+ * 起步里程
+ */
+ @TableField("startMileage")
+ private Double startMileage;
+ /**
+ * 中途取消（0=否，1=是）
+ */
+ @TableField("cancelMidway")
+ private Integer cancelMidway;
+ /**
+ * google行程id
+ */
+ @TableField("tripId")
+ private String tripId;
+ /**
+ * 司机预估到达预约单时间
+ */
+ @TableField("estimateArriveTime")
+ private Date estimateArriveTime;
+ /**
+ * 司机预估距离预约点距离（米）
+ */
+ @TableField("estimateArriveMileage")
+ private Long estimateArriveMileage;
+ /**
+ * 去往起点的路程数（米）
+ */
+ @TableField("toStartPointMileage")
+ private Double toStartPointMileage;
+ /**
+ * 起步分钟
+ */
+ @TableField("startDuration")
+ private Integer startDuration;
+ /**
+ * 预估里程
+ */
+ @TableField("estimatedMileage")
+ private Double estimatedMileage;
+ /**
+ * 争议订单（0=否，1=是）
+ */
+ @TableField("isDispute")
+ private Integer isDispute;
}
--
Gitblit v1.7.1