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 | 125 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 117 insertions(+), 8 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 5891323..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 @@ -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=已支付差价,13=取消待支付) + * 状态(1=待接单,2=待出发,3=待到达预约地点,4=待乘客上车,5=服务中,6=完成服务,7=待支付,8=待评价,9=已完成,10=已取消,11=改派中,12=取消待支付,13=补差价) */ @TableField("state") private Integer state; @@ -352,4 +403,62 @@ */ @TableField("destination") private String destination; + private Integer isplatPay; + @TableField(exist = false) + 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("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