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 | 55 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 8 deletions(-)
diff --git a/oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml b/oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml
index b7d5b39..d8db864 100644
--- a/oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml
+++ b/oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml
@@ -30,13 +30,41 @@
<result column="merchant_latitude" property="merchantLatitude"/>
<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">
- record_id, order_id, order_num, merchant_id, merchant_name, merchant_address,
- receiver_address, order_status, accept_time, accept_num, finish_time, delivery_duration,
- is_overtime, order_source, order_income, create_by, create_time, update_by, update_time,
- rider_id, phone, rider_name, user_id, user_longitude, user_latitude, merchant_longitude, merchant_latitude,delivery_fee_id
+ record_id,
+ order_id,
+ order_num,
+ merchant_id,
+ merchant_name,
+ merchant_address,
+ receiver_address,
+ order_status,
+ accept_time,
+ accept_num,
+ finish_time,
+ delivery_duration,
+ is_overtime,
+ order_source,
+ order_income,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ rider_id,
+ phone,
+ rider_name,
+ user_id,
+ user_longitude,
+ user_latitude,
+ merchant_longitude,
+ merchant_latitude,
+ delivery_fee_id,
+ order_time,
+ user_name
</sql>
<select id="findAll" resultMap="BaseResultMap">
select
@@ -49,23 +77,29 @@
<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">
and merchant_id = #{criteria.merchantId}
</if>
<if test="criteria.merchantName != null">
- and merchant_name like concat('%',#{criteria.merchantName},'%')
+ and merchant_name like concat('%', #{criteria.merchantName}, '%')
</if>
<if test="criteria.merchantAddress != null">
- and merchant_address like concat('%',#{criteria.merchantAddress},'%')
+ and merchant_address like concat('%', #{criteria.merchantAddress}, '%')
</if>
<if test="criteria.receiverAddress != null">
- and receiver_address like concat('%',#{criteria.receiverAddress},'%')
+ and receiver_address like concat('%', #{criteria.receiverAddress}, '%')
</if>
<if test="criteria.orderStatus != null">
and order_status = #{criteria.orderStatus}
@@ -85,4 +119,9 @@
</where>
order by create_time desc
</select>
+
+ <select id="selectRiderInfo" resultType="com.oying.modules.rider.domain.RiderOrderRecord">
+ select record_id recordId ,accept_time as acceptTime, order_time as orderTime
+ from qs_rider_order_record where order_num = #{orderNum}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3