From bf2acefcf5ba801d3e4a4f507c5f064fc93625cc Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 21 八月 2025 00:25:09 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java
index 08c1e27..3cca76e 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderWarpper.java
@@ -64,8 +64,39 @@
@ApiModelProperty("服务结束事件")
private String endServiceTime;
+ private String startLon;
+
+ private String startLat;
+
@ApiModelProperty("乘车类型(1=独享，2=一口价，3=拼车)")
private Integer rideType;
+
+ @ApiModelProperty("乘车用户类型(1=个人，2=司机)")
+ private Integer rideUserType;
+
+ public Integer getRideUserType() {
+ return rideUserType;
+ }
+
+ public void setRideUserType(Integer rideUserType) {
+ this.rideUserType = rideUserType;
+ }
+
+ public String getStartLon() {
+ return startLon;
+ }
+
+ public void setStartLon(String startLon) {
+ this.startLon = startLon;
+ }
+
+ public String getStartLat() {
+ return startLat;
+ }
+
+ public void setStartLat(String startLat) {
+ this.startLat = startLat;
+ }
public Integer getRideType() {
return rideType;
@@ -319,6 +350,10 @@
orderWarpper.setArriveTimeExpect(null != map.get("arriveTimeExpect") ? String.valueOf(String.valueOf(map.get("arriveTimeExpect"))) : "");
orderWarpper.setPickUpCode(null != map.get("pickUpCode") ? String.valueOf(map.get("pickUpCode")) : "");
orderWarpper.setEndServiceTime(null != map.get("endServiceTime") ? String.valueOf(map.get("endServiceTime")) : "");
+ orderWarpper.setEndServiceTime(null != map.get("endServiceTime") ? String.valueOf(map.get("endServiceTime")) : "");
+ orderWarpper.setStartLat(null != map.get("startLat") ? String.valueOf(map.get("startLat")) : "");
+ orderWarpper.setStartLon(null != map.get("startLon") ? String.valueOf(map.get("startLon")) : "");
+ orderWarpper.setRideUserType(null != map.get("rideUserType") ? Integer.valueOf(String.valueOf(map.get("companyId"))) : 0);
list.add(orderWarpper);
}
}
--
Gitblit v1.7.1