From de7852d41c07078299ecc45b42c58c4538c497b7 Mon Sep 17 00:00:00 2001
From: keivn <shinelonddpro@outlook.com>
Date: Sun, 26 Dec 2021 22:31:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/ruoyi/carpool/mapper/PCommonMapper.java | 2 +-
.../com/ruoyi/carpool/mapper/PDriverMapper.java | 2 +-
.../resources/mapper/carpool/PDriverMapper.xml | 4 ----
.../main/resources/mapper/carpool/POrderMapper.xml | 14 --------------
4 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/mapper/PCommonMapper.java b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/mapper/PCommonMapper.java
index 978be83ed..edda14e5a 100644
--- a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/mapper/PCommonMapper.java
+++ b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/mapper/PCommonMapper.java
@@ -66,7 +66,7 @@ public interface PCommonMapper {
/**
* 添加一条拼单记录
- * @param orderNum
+ * @param
* @return
*/
public int insertOrderMemberInfo(Map<String,Object> orderMember);
diff --git a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/mapper/PDriverMapper.java b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/mapper/PDriverMapper.java
index a90caebef..e9b11449d 100644
--- a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/mapper/PDriverMapper.java
+++ b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/mapper/PDriverMapper.java
@@ -81,6 +81,6 @@ public interface PDriverMapper
* @param pDriver 司机信息
* @return 结果
*/
- public PDriver getDriverInfoByOpenId(String openid);
+ public PDriver getDriverInfoByOpenId(String openId);
}
diff --git a/ruiyi-carpool/src/main/resources/mapper/carpool/PDriverMapper.xml b/ruiyi-carpool/src/main/resources/mapper/carpool/PDriverMapper.xml
index bdbb5cc55..8e8897278 100644
--- a/ruiyi-carpool/src/main/resources/mapper/carpool/PDriverMapper.xml
+++ b/ruiyi-carpool/src/main/resources/mapper/carpool/PDriverMapper.xml
@@ -122,7 +122,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
-
<select id="getDriverInfo" parameterType="PDriver" resultMap="PDriverResult">
<include refid="selectPDriverVo"/>
<where>
@@ -142,9 +141,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
-
-
-
<update id="agreePDriver" parameterType="PDriver">
update p_driver SET state = 1 where driver_id = #{driverId}
</update>
diff --git a/ruiyi-carpool/src/main/resources/mapper/carpool/POrderMapper.xml b/ruiyi-carpool/src/main/resources/mapper/carpool/POrderMapper.xml
index f6de1ad57..e7f34c562 100644
--- a/ruiyi-carpool/src/main/resources/mapper/carpool/POrderMapper.xml
+++ b/ruiyi-carpool/src/main/resources/mapper/carpool/POrderMapper.xml
@@ -80,19 +80,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createrName != null and createrName != ''"> and A.creater_name = #{createrName}</if>
</select>
-
-
-
-
- SELECT A.* , B.open_id memberOpenId, C.NAME AS driver_name 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
-
-
-
-
-
-
<select id="selectPOrderById" parameterType="Long" resultMap="POrderResult">
<include refid="selectPOrderVo"/>
where id = #{id}
@@ -165,7 +152,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
-
<update id="takeOrderById" parameterType="POrder">
update p_order
<trim prefix="SET" suffixOverrides=",">