Merge remote-tracking branch 'origin/master' into xin

xin

2025-07-16 6269dc7a50d5028fa616b339cfe790b6e0d5d16e

 oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml

@@ -29,13 +29,40 @@
        <result column="merchant_longitude" property="merchantLongitude"/>
        <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"/>
    </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
        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
    </sql>
    <select id="findAll" resultMap="BaseResultMap">
        select
@@ -58,13 +85,13 @@
                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}
@@ -84,4 +111,9 @@
        </where>
        order by create_time desc
    </select>

    <select id="selectRiderInfo" resultMap="BaseResultMap">
        select record_id recordId ,accept_time as acceptTime, order_time as orderTime
        from qs_rider_order_record where order_num = #{orderNum}
    </select>
</mapper>