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

xin

2025-07-02 2116b5b5802c0de0f126f85cf2ac56a732639e82

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

New file
@@ -0,0 +1,61 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.oying.modules.rider.mapper.RiderIncomeDetailMapper">
    <resultMap id="BaseResultMap" type="com.oying.modules.rider.domain.RiderIncomeDetail">
        <id column="income_id" property="incomeId"/>
        <result column="rider_id" property="riderId"/>
        <result column="rider_name" property="riderName"/>
        <result column="rider_phone" property="riderPhone"/>
        <result column="order_id" property="orderId"/>
        <result column="order_num" property="orderNum"/>
        <result column="income_amount" property="incomeAmount"/>
        <result column="income_type" property="incomeType"/>
        <result column="income_date" property="incomeDate"/>
        <result column="income_month" property="incomeMonth"/>
        <result column="order_status" property="orderStatus"/>
        <result column="create_by" property="createBy"/>
        <result column="create_time" property="createTime"/>
        <result column="update_by" property="updateBy"/>
        <result column="update_time" property="updateTime"/>
        <result column="start_address" property="startAddress"/>
        <result column="end_address" property="endAddress"/>
        <result column="delivery_time" property="deliveryTime"/>
    </resultMap>

    <sql id="Base_Column_List">
        income_id, rider_id, rider_name, rider_phone, order_id, order_num, income_amount, income_type, income_date, income_month, order_status, create_by, create_time, update_by, update_time, start_address, end_address, delivery_time
    </sql>

    <select id="findAll" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"/>
        from qs_rider_income_detail
        <where>
            <if test="criteria.riderName != null">
                and rider_name = #{criteria.riderName}
            </if>
            <if test="criteria.riderPhone != null">
                and rider_phone = #{criteria.riderPhone}
            </if>
            <if test="criteria.orderNum != null">
                and order_num = #{criteria.orderNum}
            </if>
            <if test="criteria.incomeType != null">
                and income_type = #{criteria.incomeType}
            </if>
            <if test="criteria.incomeDate != null">
                and income_date = #{criteria.incomeDate}
            </if>
            <if test="criteria.incomeMonth != null">
                and income_month = #{criteria.incomeMonth}
            </if>
            <if test="criteria.orderStatus != null">
                and order_status = #{criteria.orderStatus}
            </if>
            <if test="criteria.createTime != null and criteria.createTime.size() > 0">
                AND create_time BETWEEN #{criteria.createTime[0]} AND #{criteria.createTime[1]}
            </if>
        </where>
        order by create_time desc
    </select>
</mapper>