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" + @@ -47,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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