Merge remote-tracking branch 'origin/master'

xuhy

2023-03-22 1edcf19be5f339219210894c45a77d9d507b2586

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/YouTuiDriverMapper.xml

@@ -8,7 +8,58 @@
        <result column="driverId" property="driverId" />
        <result column="youTuiId" property="youTuiId" />
        <result column="integral" property="integral" />
        <result column="type" property="type"/>
        <result column="surplusQuantity" property="surplusQuantity"/>
        <result column="endTime" property="endTime"/>
        <result column="state" property="state"/>
        <result column="failureTime" property="failureTime" />
        <result column="createTime" property="createTime" />
    </resultMap>


    <select id="queryRedemptionDate" resultType="map">
        select DATE_FORMAT(aa.createTime, '%Y年%m月') as createTime from (select createTime from t_you_tui_driver where driverId = #{driverId} order by createTime desc) as aa group by DATE_FORMAT(aa.createTime, '%Y年%m月')
    </select>


    <select id="queryYouTuiDriverList" resultType="com.supersavedriving.driver.modular.system.warpper.DriverYouTuiWarpper">
        select
        b.`name`,
        b.integral,
        UNIX_TIMESTAMP(a.createTime) * 1000 as createTime
        from t_you_tui_driver a
        left join t_you_tui b on (a.youTuiId  = b.id)
        where a.driverId = #{driverId} and DATE_FORMAT(a.createTime, '%Y年%m月') = #{createTime} order by a.createTime desc
    </select>


    <select id="queryDriverYouTui" resultType="com.supersavedriving.driver.modular.system.warpper.DriverYouTuiWarpper">
        select
        a.id,
        b.`name`,
        b.type,
        b.number,
        b.img,
        b.integral,
        b.content,
        UNIX_TIMESTAMP(a.createTime) * 1000 as createTime,
        a.state
        from t_you_tui_driver a
        left join t_you_tui b on (a.youTuiId  = b.id)
        where a.driverId = #{driverId} order by a.createTime desc limit #{pageNum}, #{pageSize}
    </select>



    <select id="queryAllYouTui" resultType="com.supersavedriving.driver.modular.system.warpper.DriverYouTuiWarpper">
        select
        id,
        `name`,
        type,
        number,
        img,
        integral,
        content
        from t_you_tui where status = 1 order by createTime desc limit #{pageNum}, #{pageSize}
    </select>
</mapper>