Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改发起拼单的逻辑

Browse Source
This commit is contained in:
keivn 2021-12-30 23:08:16 +08:00
parent fdc226d751
commit b590ec9677
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ruiyi-carpool/src/main/java/com/ruoyi/carpool/domain/POrder.java
View File

@ -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();
}
}

5
ruiyi-carpool/src/main/resources/mapper/carpool/POrderMapper.xml
View File

@ -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