From 09c1e21cad0b474babb1d2f67f481b582adf0b0f Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 29 七月 2025 14:43:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/resources/mapper/lmk/VideoCommentMapper.xml | 63 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 17 deletions(-)
diff --git a/framework/src/main/resources/mapper/lmk/VideoCommentMapper.xml b/framework/src/main/resources/mapper/lmk/VideoCommentMapper.xml
index bfe9329..672c021 100644
--- a/framework/src/main/resources/mapper/lmk/VideoCommentMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/VideoCommentMapper.xml
@@ -13,11 +13,13 @@
<result column="reply_user_avatar" property="replyUserAvatar" />
<result column="master_comment_id" property="masterCommentId" />
<result column="status" property="status" />
- <result column="create_by" property="userId" />
+ <result column="thumbs_up_num" property="thumbsUpNum" />
+ <result column="user_id" property="userId" />
<result column="user_nickname" property="userNickname" />
<result column="user_avatar" property="userAvatar" />
<result column="create_time" property="createTime" />
<result column="replyTotalCount" property="replyTotalCount" />
+ <result column="has_thumbs_up" property="hasThumbsUp" />
</resultMap>
@@ -35,8 +37,9 @@
LVC.reply_user_nickname,
LVC.master_comment_id,
LVC.status,
+ LVC.thumbs_up_num,
LVC.id,
- LVC.create_by,
+ LVC.user_id,
LVC.user_nickname,
LVC.user_avatar,
LVC.create_time
@@ -56,8 +59,9 @@
LVC.reply_user_nickname,
LVC.master_comment_id,
LVC.status,
+ LVC.thumbs_up_num,
LVC.id,
- LVC.create_by,
+ LVC.user_id,
LVC.user_nickname,
LVC.user_avatar,
LVC.create_time
@@ -78,18 +82,21 @@
LVC.reply_user_avatar,
LVC.master_comment_id,
LVC.status,
+ LVC.thumbs_up_num,
LVC.id,
- LVC.create_by,
+ LVC.user_id,
LVC.user_nickname,
LVC.user_avatar,
LVC.create_time,
- COUNT(replies.id) as replyTotalCount
+ COUNT(replies.id) as replyTotalCount,
+ CASE
+ WHEN TUC.id IS NOT NULL THEN 1
+ ELSE 0
+ END AS has_thumbs_up
FROM
lmk_video_comment LVC
- LEFT JOIN
- lmk_video_comment replies ON replies.master_comment_id = LVC.id
- AND replies.status = 'normal'
- AND replies.delete_flag = 0
+ LEFT JOIN lmk_video_comment replies ON replies.master_comment_id = LVC.id AND replies.status = 'normal' AND replies.delete_flag = 0
+ LEFT JOIN lmk_thumbs_up_record TUC ON LVC.id = TUC.ref_id AND TUC.thumbs_up_type = 'video_comment' AND TUC.user_id = #{query.userId} AND TUC.delete_flag = 0
WHERE
LVC.master_comment_id IS NULL
AND LVC.video_id = #{query.videoId}
@@ -98,7 +105,7 @@
GROUP BY
LVC.id, LVC.video_id, LVC.comment_content, LVC.reply_id,
LVC.reply_user_id, LVC.reply_user_nickname, LVC.master_comment_id,
- LVC.status, LVC.create_by, LVC.user_nickname, LVC.user_avatar, LVC.create_time
+ LVC.status, LVC.user_id, LVC.user_nickname, LVC.user_avatar, LVC.create_time
ORDER BY
LVC.create_time DESC
</select>
@@ -113,14 +120,20 @@
LVC.reply_user_avatar,
LVC.master_comment_id,
LVC.status,
+ LVC.thumbs_up_num,
LVC.id,
- LVC.create_by,
+ LVC.user_id,
LVC.user_nickname,
LVC.user_avatar,
LVC.create_time,
- 0 as replyTotalCount
+ 0 as replyTotalCount,
+ CASE
+ WHEN TUC.id IS NOT NULL THEN 1
+ ELSE 0
+ END AS has_thumbs_up
FROM
lmk_video_comment LVC
+ LEFT JOIN lmk_thumbs_up_record TUC ON LVC.id = TUC.ref_id AND TUC.thumbs_up_type = 'video_comment' AND TUC.user_id = #{query.userId} AND TUC.delete_flag = 0
WHERE
LVC.video_id = #{query.videoId}
AND LVC.master_comment_id = #{query.masterCommentId}
@@ -132,14 +145,30 @@
<select id="countNumGroupByVideo" resultType="cn.lili.modules.lmk.domain.vo.CollectTypeNumVO">
SELECT
- video_id as id,
- COUNT(*) as countNum
+ LV.id as id,
+ COUNT(LVC.video_id) as countNum
FROM
- lmk_video_comment
+ lmk_video LV
+ LEFT JOIN lmk_video_comment LVC ON LVC.video_id = LV.id AND LVC.delete_flag = 0 AND LVC.status = 'normal'
WHERE
- delete_flag = 0 AND status = 'normal'
+ LV.comment_num_job = 1 AND LV.delete_flag = 0 AND LV.status = '1'
GROUP BY
- video_id
+ LVC.video_id
</select>
+
+ <update id="updateCommentThumbsUpNumBatch">
+ UPDATE lmk_video_comment
+ SET thumbs_up_num = CASE id
+ <foreach collection="list" item="comment">
+ WHEN #{comment.id} THEN #{comment.countNum}
+ </foreach>
+ ELSE thumbs_up_num
+ END
+ WHERE id IN
+ <foreach collection="list" item="comment" open="(" separator="," close=")">
+ #{comment.id}
+ </foreach>
+ </update>
+
</mapper>
--
Gitblit v1.8.0