From 044a57d2133b2363a6f0d3d167b3eaa587c70b91 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 31 Jul 2025 17:18:47 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml b/oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml
index 354abbc..d8db864 100644
--- a/oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml
+++ b/oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml
@@ -31,6 +31,7 @@
<result column="user_id" property="userId"/>
<result column="delivery_fee_id" property="deliveryFeeId"/>
<result column="order_time" property="orderTime"/>
+ <result column="user_name" property="userName"/>
</resultMap>
<sql id="Base_Column_List">
@@ -62,7 +63,8 @@
merchant_longitude,
merchant_latitude,
delivery_fee_id,
- order_time
+ order_time,
+ user_name
</sql>
<select id="findAll" resultMap="BaseResultMap">
select
@@ -75,10 +77,16 @@
<if test="criteria.userId != null">
and user_id = #{criteria.userId}
</if>
+ <if test="criteria.userName != null">
+ and user_name = #{criteria.userName}
+ </if>
<if test="criteria.orderId != null">
and order_id = #{criteria.orderId}
</if>
- <if test="criteria.orderNum != null">
+ <if test="criteria.phone != null">
+ and phone = #{criteria.phone}
+ </if>
+ <if test="criteria.orderNum != null">
and order_num = #{criteria.orderNum}
</if>
<if test="criteria.merchantId != null">
--
Gitblit v1.9.3