Merge remote-tracking branch 'origin/dev' into dev

xiangpei

2025-06-04 4e502853119c6d8e7ff686191e19bb0a19a4f875

 framework/src/main/resources/mapper/lmk/VideoMapper.xml

@@ -37,6 +37,7 @@
        <result column="title" property="title" />
        <result column="collect_num" property="collectNum" />
        <result column="comment_num" property="commentNum" />
        <result column="status" property="status" />
    </resultMap>


@@ -253,7 +254,11 @@
            lmk_video LV
                LEFT JOIN li_member LM ON LV.author_id = LM.id
        WHERE
            LV.delete_flag = 0 AND LV.status = '1' AND LV.author_id = #{query.authorId}
            LV.delete_flag = 0
            <if test="!query.authorSelf">
                AND LV.status = '1'
            </if>
            AND LV.author_id = #{query.authorId}
        ORDER BY
            LV.collect_num DESC
    </select>
@@ -290,4 +295,42 @@
            LMC.create_time DESC
    </select>


    <!-- 微信视频编辑详情 -->
    <resultMap id="WxEditResultMap" type="cn.lili.modules.lmk.domain.vo.WxEditVideoVO">
        <id column="id" property="id"/>
        <result column="cover_url" property="coverFileKey" />
        <result column="video_file_key" property="videoFileKey" />
        <result column="video_fit" property="videoFit" />
        <result column="title" property="title" />
        <result column="video_duration" property="videoDuration" />
        <result column="goods_id" property="goodsId" />
    </resultMap>

    <select id="wxDetail" resultMap="WxEditResultMap">
        SELECT
            LV.author_id,
            LV.cover_url,
            LV.video_fit,
            LV.video_duration,
            LV.video_file_key,
            LV.title,
            LV.goods_id,
            LV.goods_view_num,
            LV.goods_order_num,
            LV.recommend,
            LV.status,
            LV.play_num,
            LV.comment_num,
            LV.collect_num,
            LV.weight,
            LV.audit_pass_time,
            LV.update_time,
            LV.id
        FROM
            lmk_video LV
        WHERE
            LV.delete_flag = 0 AND LV.id = #{id}
    </select>

</mapper>