From db7fa6a91b9534ac90e219b6f554c54c43c83a5a Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:28:15 +0800
Subject: [PATCH] update
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java
index f3fc7a3..13c7880 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java
@@ -9,18 +9,26 @@
public class OrderInfoWarpper {
@ApiModelProperty("订单id")
private Long id;
+ @ApiModelProperty("用户id")
+ private Integer userId;
@ApiModelProperty("用户头像")
private String avatar;
@ApiModelProperty("用户名称")
private String userName;
@ApiModelProperty("用户电话")
private String userPhone;
+ @ApiModelProperty("司机id")
+ private Integer driverId;
+ @ApiModelProperty("用户余额")
+ private Double balance;
@ApiModelProperty("下单次数")
private Integer orderTimes;
@ApiModelProperty("取消次数")
private Integer cancelTimes;
@ApiModelProperty("与用户距离")
private Double currentDistance;
+ @ApiModelProperty("预估接驾时间")
+ private Integer pickUpTime;
@ApiModelProperty("订单来源（1=用户创建，2=司机创建）")
private Integer source;
@ApiModelProperty("下单时间")
@@ -37,12 +45,20 @@
private String endLat;
@ApiModelProperty("终点经度")
private String endLng;
- @ApiModelProperty("预估费")
+ @ApiModelProperty("预估费用")
private Double estimatedPrice;
@ApiModelProperty("预估里程")
private Double estimatedMileage;
+ @ApiModelProperty("预估时间")
+ private Double estimatedTime;
@ApiModelProperty("起步价")
private Double startPrice;
- @ApiModelProperty("订单状态（101=待接单，102=已接单，103=前往预约点，104=到达预约点，105=开始服务，106=到达目的地，107=待评价，108=已完成，201=转单中，301=已取消）")
+ @ApiModelProperty("等待时长")
+ private String waitTime;
+ @ApiModelProperty("行驶里程")
+ private Double actualMileage;
+ @ApiModelProperty("行驶时间")
+ private Integer travelTime;
+ @ApiModelProperty("订单状态（101=待接单，102=已接单，103=前往预约点，104=到达预约点，105=开始服务，106=到达目的地，107=待支付，108=待评价，109=已完成，201=转单中，301=已取消，401=等待中）")
private Integer state;
}
--
Gitblit v1.7.1