Merge branch 'master' into xin

xin

5 days ago 982313135d1c239fe3b20e4c5664781f92d40aca

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

@@ -18,10 +18,17 @@
        <result column="create_time" property="createTime"/>
        <result column="update_by" property="updateBy"/>
        <result column="update_time" property="updateTime"/>
        <result column="phone" property="phone"/>
        <result column="card_name" property="cardName"/>
        <result column="card_num" property="cardNum"/>
    </resultMap>

    <sql id="Base_Column_List">
        wallet_id, rider_id, amount, available_balance, purchasing_electricity_amount, withdraw_total, income_total, frozen_amount, run_total, cash_withdrawal_total, purchasing_electricity_total, status, create_by, create_time, update_by, update_time
        wallet_id, rider_id, amount, available_balance,
        purchasing_electricity_amount, withdraw_total,
        income_total, frozen_amount, run_total, cash_withdrawal_total,
        purchasing_electricity_total, status, create_by, create_time,
        update_by, update_time, phone, card_name, card_num
    </sql>

    <select id="findAll" resultMap="BaseResultMap">
@@ -31,6 +38,15 @@
        <where>
            <if test="criteria.riderId != null">
                and rider_id = #{criteria.riderId}
            </if>
             <if test="criteria.phone != null">
                and phone = #{criteria.phone}
            </if>
             <if test="criteria.cardName != null">
                and card_name = #{criteria.cardName}
            </if>
             <if test="criteria.cardNum != null">
                and card_num = #{criteria.cardNum}
            </if>
            <if test="criteria.status != null">
                and status = #{criteria.status}
@@ -42,6 +58,6 @@
                AND create_time BETWEEN #{criteria.createTime[0]} AND #{criteria.createTime[1]}
            </if>
        </where>
        order by wallet_id desc
        order by create_time desc
    </select>
</mapper>