From be0fc5c20dde87d7abb53f6537ba64743cd4cf52 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 23 六月 2025 21:03:34 +0800
Subject: [PATCH] Merge branch 'dev' of http://42.193.1.25:9521/r/lmk-shop-java into dev
---
framework/src/main/resources/mapper/lmk/VideoMapper.xml | 51 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/framework/src/main/resources/mapper/lmk/VideoMapper.xml b/framework/src/main/resources/mapper/lmk/VideoMapper.xml
index aa28b05..d4ce727 100644
--- a/framework/src/main/resources/mapper/lmk/VideoMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/VideoMapper.xml
@@ -85,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" />
@@ -262,6 +263,41 @@
AND LV.video_content_type = 'video'
</select>
+ <select id="wxKitchenVideoQuery" 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
+ <if test="query.kitchenTypeId !=null and query.kitchenTypeId !=''">
+ JOIN (SELECT DISTINCT video_id FROM lmk_kitchen_video_type_ref WHERE kitchen_type_id = #{query.kitchenTypeId}) VT ON VT.video_id = LV.id
+ </if>
+ WHERE
+ LV.delete_flag = 0 AND LV.status = '1' AND LV.video_type = #{query.videoType}
+ AND LV.video_content_type = 'video'
+ </select>
+
<update id="updateCollectNumBatch">
UPDATE lmk_video
@@ -403,28 +439,19 @@
<result column="video_fit" property="videoFit" />
<result column="title" property="title" />
<result column="video_duration" property="videoDuration" />
+ <result column="video_imgs" property="videoImgs" />
+ <result column="video_content_type" property="videoContentType" />
+ <collection property="goodsList" column="id" select="getVideoGoods" ofType="cn.lili.modules.lmk.domain.vo.VideoGoodsDetailVO"/>
</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_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
FROM
--
Gitblit v1.8.0