From ed79668a9a0d49f0f532c6e603a821eb508085bf Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 23 三月 2023 09:20:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java | 6 ++++++
1 files changed, 6 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..389091e 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,6 +41,8 @@
private String endLat;
@ApiModelProperty("终点经度")
private String endLng;
+ @ApiModelProperty("预估费用")
+ private Double estimatedPrice;
@ApiModelProperty("预估里程")
private Double estimatedMileage;
@ApiModelProperty("起步价")
--
Gitblit v1.7.1