From 4231cb0417322b6b974210d31ff4cbd8a842da96 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 12 八月 2025 10:42:39 +0800
Subject: [PATCH] 合并代码
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
index fa2c14a..791ad45 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java
@@ -43,6 +43,8 @@
private String nickName;
@ApiModelProperty("乘客电话")
private String phone;
+ @ApiModelProperty("联系人电话")
+ private String contactPersonPhone;
@ApiModelProperty("乘客历史乘车次数")
private Integer historyNum;
@ApiModelProperty("订单总金额")
@@ -534,6 +536,14 @@
this.rideType = rideType;
}
+ public String getContactPersonPhone() {
+ return contactPersonPhone;
+ }
+
+ public void setContactPersonPhone(String contactPersonPhone) {
+ this.contactPersonPhone = contactPersonPhone;
+ }
+
@Override
public String toString() {
return "OrderInfoWarpper{" +
@@ -598,6 +608,7 @@
orderInfoWarpper.setEndLat(null != map.get("endLat") ? String.valueOf(map.get("endLat")) : "");
orderInfoWarpper.setNickName(null != map.get("nickName") ? String.valueOf(map.get("nickName")) : "");
orderInfoWarpper.setPhone(null != map.get("telX") ? String.valueOf(map.get("telX")) : (null != map.get("phone") ? String.valueOf(map.get("phone")) : ""));
+ orderInfoWarpper.setContactPersonPhone(null != map.get("contactPersonPhone") ? String.valueOf(map.get("contactPersonPhone")) : "");
orderInfoWarpper.setHistoryNum(null != map.get("historyNum") ? Integer.valueOf(String.valueOf(map.get("historyNum"))) : 0);
orderInfoWarpper.setSpellSuccess(null != map.get("spellSuccess") ? Integer.valueOf(String.valueOf(map.get("spellSuccess"))) : 0);
orderInfoWarpper.setOrderMoney(null != map.get("orderMoney") ? Double.valueOf(String.valueOf(map.get("orderMoney"))) : 0);
--
Gitblit v1.7.1