From 8fd3db7778b3991810d33ac4dffd2f9031b106fc Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期六, 11 十月 2025 16:37:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/resources/mapper/lmk/MyCollectMapper.xml | 32 +++++++++-----------------------
1 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/framework/src/main/resources/mapper/lmk/MyCollectMapper.xml b/framework/src/main/resources/mapper/lmk/MyCollectMapper.xml
index 573467c..f589c1a 100644
--- a/framework/src/main/resources/mapper/lmk/MyCollectMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/MyCollectMapper.xml
@@ -54,16 +54,17 @@
AND ref_id IN <foreach collection="videoIds" open="(" item="videoId" close=")" separator=",">#{videoId}</foreach>
</select>
- <select id="countNumGroupByType" parameterType="string" resultType="cn.lili.modules.lmk.domain.vo.CollectTypeNumVO">
+ <select id="countNumGroupByVideo" parameterType="string" resultType="cn.lili.modules.lmk.domain.vo.CollectTypeNumVO">
SELECT
- ref_id as id,
- count(id) as countNum
+ LV.id as id,
+ count(LMC.ref_id) as countNum
FROM
- lmk_my_collect
+ lmk_video LV
+ LEFT JOIN lmk_my_collect LMC ON LV.id = LMC.ref_id AND LMC.collect_type = 'video' AND LMC.delete_flag = 0
WHERE
- collect_type = #{type} AND delete_flag = 0
+ LV.collect_num_job = 1 AND LV.delete_flag = 0 AND LV.status = '1'
GROUP BY
- ref_id
+ LMC.ref_id
</select>
@@ -89,8 +90,8 @@
LA.*
FROM lmk_my_collect LMC
LEFT JOIN lmk_activity LA
- ON LMC.ref_id = LA.id
- WHERE LMC.collect_type = 'activity' and LMC.user_id = #{userId}
+ ON LMC.ref_id = LA.id AND LMC.delete_flag = 0
+ WHERE LMC.collect_type = 'activity' and LMC.user_id = #{userId} AND LA.id IS NOT NULL
</select>
<resultMap id="videoBaseResult" type="cn.lili.modules.lmk.domain.vo.VideoVO">
<id column="id" property="id"/>
@@ -100,10 +101,7 @@
<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="goods_view_num" property="goodsViewNum" />
<result column="video_duration" property="videoDuration" />
- <result column="goods_order_num" property="goodsOrderNum" />
<result column="recommend" property="recommend" />
<result column="status" property="status" />
<result column="play_num" property="playNum" />
@@ -113,18 +111,6 @@
<result column="audit_pass_time" property="auditPassTime" />
<result column="update_time" property="updateTime" />
</resultMap>
-
- <select id="getVideoCollectPage" resultMap="videoBaseResult">
- SELECT
- LV.*,
- LM.nick_name as authorName
- FROM lmk_my_collect LMC
- LEFT JOIN lmk_video LV
- ON LMC.ref_id = LV.id
- LEFT JOIN li_member LM ON LV.author_id = LM.id
- WHERE LMC.collect_type = 'video' and LMC.user_id = #{userId}
- and LV.delete_flag = 0 and LM.delete_flag= 0 and LMC.delete_flag =0
- </select>
<resultMap id="storeBaseResult" type="cn.lili.modules.store.entity.vos.StoreBasicInfoVO">
<id column="id" property="storeId"/>
--
Gitblit v1.8.0