From b590ec96770175440b1bef58fbe5e220052eccd5 Mon Sep 17 00:00:00 2001
From: keivn <shinelonddpro@outlook.com>
Date: Thu, 30 Dec 2021 23:08:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E8=B5=B7=E6=8B=BC?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/carpool/domain/POrder.java   | 12 ++++++++++++
 .../main/resources/mapper/carpool/POrderMapper.xml   |  5 +++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/domain/POrder.java b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/domain/POrder.java
index 2240ff094..8a6a5d137 100644
--- a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/domain/POrder.java
+++ b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/domain/POrder.java
@@ -84,6 +84,9 @@ public class POrder extends BaseEntity
     @ApiModelProperty(value = "司机姓名")
     private String driverName;
 
+    @ApiModelProperty(value = "司机手机号")
+    private String driverPhone;
+
     @Excel(name = "司机微信端的openid")
     @ApiModelProperty(value = "司机微信端的openid")
     private String driverOpenId;
@@ -274,6 +277,14 @@ public class POrder extends BaseEntity
         this.orderMemberList = orderMemberList;
     }
 
+    public String getDriverPhone() {
+        return driverPhone;
+    }
+
+    public void setDriverPhone(String driverPhone) {
+        this.driverPhone = driverPhone;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -297,6 +308,7 @@ public class POrder extends BaseEntity
             .append("CreaterPhone", getCreaterPhone())
             .append("createrOpenId", getCreaterOpenId())
             .append("memberOpenId", getMemberOpenId())
+            .append("driverPhone", getDriverPhone())
             .toString();
     }
 }
diff --git a/ruiyi-carpool/src/main/resources/mapper/carpool/POrderMapper.xml b/ruiyi-carpool/src/main/resources/mapper/carpool/POrderMapper.xml
index bf6db762e..b6d44919b 100644
--- a/ruiyi-carpool/src/main/resources/mapper/carpool/POrderMapper.xml
+++ b/ruiyi-carpool/src/main/resources/mapper/carpool/POrderMapper.xml
@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createrPhone"    column="creater_phone"    />
         <result property="driverId"    column="driver_id"    />
         <result property="driverName"    column="driver_name"    />
+        <result property="driverPhone"    column="driver_phone"    />
         <result property="createUser"    column="create_user"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateUser"    column="update_user"    />
@@ -47,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectPOrderList" parameterType="POrder" resultMap="POrderResult">
-        SELECT A.* , B.name as driver_name FROM p_order  A
+        SELECT A.* , B.name as driver_name , B.phone AS driver_phone FROM p_order  A
         LEFT JOIN p_driver B ON A.driver_id = B.driver_id
         where 1=1
         <if test="orderNum != null  and orderNum != ''"> and A.order_num = #{orderNum}</if>
@@ -70,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectPOrderListContentMember" parameterType="POrder" resultMap="POrderResult">
-        SELECT A.* , B.open_id memberOpenId, C.NAME AS driver_name
+        SELECT A.* , B.open_id memberOpenId, C.NAME AS driver_name , C.phone AS driver_phone
         FROM p_order A
         LEFT JOIN p_order_member B ON A.order_num = B.order_num
         LEFT JOIN p_driver C ON A.driver_id = C.driver_id