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

xiangpei

6 天以前 2226679bda25ddf977f12367a9a37fcf4e377249

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

@@ -11,7 +11,55 @@
        <result column="video_file_key" property="videoFileKey" />
        <result column="video_fit" property="videoFit" />
        <result column="title" property="title" />
        <result column="goods_id" property="goodsId" />
        <result column="video_duration" property="videoDuration" />
        <result column="recommend" property="recommend" />
        <result column="status" property="status" />
        <result column="play_num" property="playNum" />
        <result column="collect_num" property="collectNum" />
        <result column="comment_num" property="commentNum" />
        <result column="weight" property="weight" />
        <result column="audit_pass_time" property="auditPassTime" />
        <result column="update_time" property="updateTime" />
        <result column="video_content_type" property="videoContentType" />
        <result column="video_type" property="videoType" />
        <result column="video_imgs" property="videoImgs" />
        <collection property="goodsList" column="id" select="getVideoGoods" ofType="cn.lili.modules.lmk.domain.vo.VideoGoodsDetailVO"/>
    </resultMap>

    <resultMap id="VideoGoodsMap" type="cn.lili.modules.lmk.domain.vo.VideoGoodsDetailVO">
        <result column="goods_id" property="goodsId"/>
        <result column="goods_num" property="goodsNum"/>
        <result column="goods_name" property="goodsName"/>
        <result column="thumbnail" property="thumbnail"/>
        <result column="price" property="price"/>
    </resultMap>

    <select id="getVideoGoods" parameterType="string" resultMap="VideoGoodsMap">
        SELECT
               LVG.goods_id,
               LVG.goods_num,
               LVG.order_num,
               LG.goods_name,
               LG.thumbnail,
               LG.price
        FROM
             lmk_video_goods LVG
             INNER JOIN li_goods LG ON LVG.goods_id = LG.id AND LG.market_enable = 'UPPER' AND LG.delete_flag = 0
        WHERE
             LVG.video_id = #{id} AND LVG.delete_flag = 0
        ORDER BY
            LVG.order_num ASC
    </select>

    <!-- 通用查询映射结果 -->
    <resultMap id="KitchenVideoMap" type="cn.lili.modules.lmk.domain.vo.KitchenVideoVO">
        <id column="id" property="id"/>
        <result column="author_id" property="authorId" />
        <result column="authorName" property="authorName" />
        <result column="cover_url" property="coverUrl" />
        <result column="video_file_key" property="videoFileKey" />
        <result column="video_fit" property="videoFit" />
        <result column="title" property="title" />
        <result column="goods_view_num" property="goodsViewNum" />
        <result column="video_duration" property="videoDuration" />
        <result column="goods_order_num" property="goodsOrderNum" />
@@ -37,6 +85,7 @@
        <result column="cover_url" property="coverFileKey" />
        <result column="video_file_key" property="videoFileKey" />
        <result column="video_fit" property="videoFit" />
        <result column="video_duration" property="videoDuration" />
        <result column="title" property="title" />
        <result column="collect_num" property="collectNum" />
        <result column="comment_num" property="commentNum" />
@@ -44,6 +93,7 @@
        <result column="video_content_type" property="videoContentType" />
        <result column="video_type" property="videoType" />
        <result column="video_imgs" property="videoImgs" />
        <collection property="goodsList" column="id" select="getVideoGoods" ofType="cn.lili.modules.lmk.domain.vo.VideoGoodsDetailVO"/>
    </resultMap>


@@ -180,6 +230,37 @@
            LEFT JOIN li_member LM ON LV.author_id = LM.id
        WHERE
            LV.delete_flag = 0 AND LV.status = '1' AND LV.video_type = #{query.videoType}
    </select>
    <select id="recommendHealthVideo" resultMap="WxResultMap">
        SELECT
            LV.author_id,
            LV.cover_url,
            LV.video_fit,
            LV.video_duration,
            LV.video_file_key,
            LV.title,
            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.video_content_type,
            LV.video_type,
            LV.video_imgs,
            LV.id,
            LAU.nick_name AS authorName,
            LAU.avatar AS authorAvatar
        FROM
            lmk_video LV
            LEFT JOIN li_admin_user LAU ON LV.author_id = LAU.id
        WHERE
            LV.delete_flag = 0 AND LV.status = '1' AND LV.video_type = #{query.videoType}
        AND LV.video_content_type = 'video'
    </select>


@@ -323,7 +404,6 @@
        <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">
@@ -353,5 +433,85 @@
        WHERE
            LV.delete_flag = 0 AND LV.id = #{id}
    </select>
    <select id="healthPage" resultMap="BaseResultMap">
        SELECT
        LV.author_id,
        LV.cover_url,
        LV.video_fit,
        LV.video_duration,
        LV.video_file_key,
        LV.title,
        LV.goods_view_num,
        LV.goods_order_num,
        LV.recommend,
        LV.status,
        LV.play_num,
        LV.collect_num,
        LV.comment_num,
        LV.weight,
        LV.audit_pass_time,
        LV.update_time,
        LV.video_content_type,
        LV.video_type,
        LV.video_imgs,
        LV.id,
        LM.nick_name as authorName
        FROM
        lmk_video LV
        LEFT JOIN li_member LM ON LV.author_id = LM.id
        <if test="query.tagList != null and query.tagList.size > 0">
            INNER JOIN (
            SELECT DISTINCT video_id
            FROM lmk_video_tag_ref
            WHERE video_tag_id IN
            <foreach collection="query.tagList" open="(" item="tagId" close=")" separator=",">#{tagId}</foreach>
            ) AS LVT ON LV.id = LVT.video_id
        </if>
        WHERE
        LV.delete_flag = 0 AND LV.video_type = #{query.videoType}
        <if test="query.title != null and query.title != ''">AND LV.title LIKE CONCAT('%', #{query.title}, '%')</if>
        <if test="query.authorId != null and query.authorId != ''">AND LV.author_id = #{query.authorId}</if>
        <if test="query.status != null and query.status != ''">AND LV.status = #{query.status}</if>
    </select>

    <select id="kitchenPage" resultMap="KitchenVideoMap">
        SELECT
        LV.author_id,
        LV.cover_url,
        LV.video_fit,
        LV.video_duration,
        LV.video_file_key,
        LV.title,
        LV.goods_view_num,
        LV.goods_order_num,
        LV.recommend,
        LV.status,
        LV.play_num,
        LV.collect_num,
        LV.comment_num,
        LV.weight,
        LV.audit_pass_time,
        LV.update_time,
        LV.video_content_type,
        LV.video_type,
        LV.video_imgs,
        LV.id,
        LM.nick_name as authorName
        FROM
        lmk_video LV
        LEFT JOIN li_member LM ON LV.author_id = LM.id
        <if test="query.typeList != null and query.typeList.size > 0">
            INNER JOIN (
            SELECT DISTINCT video_id
            FROM lmk_kitchen_video_type_ref
            WHERE kitchen_type_id IN
            <foreach collection="query.typeList" open="(" item="tagId" close=")" separator=",">#{tagId}</foreach>
            ) AS LVT ON LV.id = LVT.video_id
        </if>
        WHERE
        LV.delete_flag = 0 AND LV.video_type = #{query.videoType}
        <if test="query.title != null and query.title != ''">AND LV.title LIKE CONCAT('%', #{query.title}, '%')</if>
        <if test="query.authorId != null and query.authorId != ''">AND LV.author_id = #{query.authorId}</if>
        <if test="query.status != null and query.status != ''">AND LV.status = #{query.status}</if>
    </select>
</mapper>