From 67bfacb03541ef2ee4c1496f4cc7600014cd1005 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 18 四月 2023 17:37:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 1825292..216bb49 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
@@ -15,12 +15,16 @@
private String userName;
@ApiModelProperty("用户电话")
private String userPhone;
+ @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,8 +41,12 @@
private String endLat;
@ApiModelProperty("终点经度")
private String endLng;
+ @ApiModelProperty("预估费用")
+ private Double estimatedPrice;
@ApiModelProperty("预估里程")
private Double estimatedMileage;
+ @ApiModelProperty("预估时间")
+ private Double estimatedTime;
@ApiModelProperty("起步价")
private Double startPrice;
@ApiModelProperty("等待时长")
--
Gitblit v1.7.1