From 4c99ee7028c3fe58a2cd4b8273b22c75c45574fc Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期五, 16 五月 2025 10:27:41 +0800 Subject: [PATCH] 修改文档bug --- DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/model/OrderLogistics.java | 67 +++++++++++++++++++++++---------- 1 files changed, 46 insertions(+), 21 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 3c65c27..c00d49f 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 @@ -187,11 +187,6 @@ @TableField("orderMoney") private Double orderMoney; /** - * 起步里程 - */ - @TableField("startMileage") - private Double startMileage; - /** * 起步价 */ @TableField("startMoney") @@ -292,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; @@ -409,30 +404,60 @@ @TableField("destination") private String destination; private Integer isplatPay; - /** - * 是否首单免费1否,2是 - * @return - */ - @TableField("isFree") - private Integer isFree; 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; + /** + * google行程结束标识-是否结束(0=否,1=是) + */ + @TableField("isover") + private Integer isover; + /** + * 司机预估到达预约单时间 + */ + @TableField("estimateArriveTime") + private Date estimateArriveTime; + /** + * 司机预估距离预约点距离(米) + */ + @TableField("estimateArriveMileage") + private Long estimateArriveMileage; + /** + * 去往起点的路程数(米) + */ + @TableField("toStartPointMileage") + private Double toStartPointMileage; + /** + * 起步分钟 + */ + @TableField("startDuration") private Integer startDuration; /** - * 收费方式(1=普通,2=夜间,3=高峰) + * 预估里程 */ - private Integer moneyType; + @TableField("estimatedMileage") + private Double estimatedMileage; /** - * 收费方式时间段 + * 争议订单(0=否,1=是) */ - private String moneyTime; - - private Date smsTime; - - private Integer smsNumber; - + @TableField("isDispute") + private Integer isDispute; } -- Gitblit v1.7.1