From 1edcf19be5f339219210894c45a77d9d507b2586 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 三月 2023 18:19:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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..714b667 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,6 +15,8 @@
private String userName;
@ApiModelProperty("用户电话")
private String userPhone;
+ @ApiModelProperty("用户余额")
+ private Double balance;
@ApiModelProperty("下单次数")
private Integer orderTimes;
@ApiModelProperty("取消次数")
@@ -37,12 +39,16 @@
private String endLat;
@ApiModelProperty("终点经度")
private String endLng;
- @ApiModelProperty("预估费")
- private Double estimatedPrice;
@ApiModelProperty("预估里程")
private Double estimatedMileage;
@ApiModelProperty("起步价")
private Double startPrice;
- @ApiModelProperty("订单状态（101=待接单，102=已接单，103=前往预约点，104=到达预约点，105=开始服务，106=到达目的地，107=待评价，108=已完成，201=转单中，301=已取消）")
+ @ApiModelProperty("等待时长")
+ private Integer 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