From aac2321d1cf5536f7ea03f30d55a4aba30fbf710 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 02 七月 2025 10:39:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/mapper/MyCollectMapper.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/mapper/MyCollectMapper.java b/framework/src/main/java/cn/lili/modules/lmk/mapper/MyCollectMapper.java
index a53ab46..acfe0a0 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/mapper/MyCollectMapper.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/mapper/MyCollectMapper.java
@@ -1,11 +1,9 @@
package cn.lili.modules.lmk.mapper;
import cn.lili.modules.lmk.domain.entity.MyCollect;
-import cn.lili.modules.lmk.domain.vo.SimpleMyCollectVO;
-import cn.lili.modules.lmk.domain.vo.CollectTypeNumVO;
+import cn.lili.modules.lmk.domain.vo.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import cn.lili.modules.lmk.domain.vo.MyCollectVO;
import cn.lili.modules.lmk.domain.query.MyCollectQuery;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
@@ -42,10 +40,36 @@
List<SimpleMyCollectVO> getCollectsByVideoIds(@Param("videoIds") List<String> videoIds, @Param("userId") String currentUserId);
/**
- * 鏍规嵁鏌愭敹钘忕被鍨媔d鍒嗙粍缁熻鏁伴噺锛屾瘮濡傦細缁熻姣忎釜瑙嗛鐨勬敹钘忔暟
+ * 鏍规嵁瑙嗛钘忕被鍨媔d鍒嗙粍缁熻鏁伴噺锛屾瘮濡傦細缁熻姣忎釜瑙嗛鐨勬敹钘忔暟
*
- * @param type
* @return
*/
- List<CollectTypeNumVO> countNumGroupByType(@Param("type") String type);
+ List<CollectTypeNumVO> countNumGroupByVideo();
+
+
+ /**
+ * 鑾峰緱鎴戠殑鏀惰棌 娲诲姩
+ * @param page
+ * @param userId
+ * @return
+ */
+ IPage getActivityCollectPage(IPage page,@Param("userId")String userId);
+
+ /**
+ * 鑾峰緱鎴戠殑鏀惰棌 搴楅摵
+ * @param page
+ * @param userId
+ * @return
+ */
+ IPage getStoreCollectPage(IPage page,@Param("userId")String userId);
+
+ /**
+ * 鑾峰緱鎴戠殑鏀惰棌 瑙嗛
+ * @param page
+ * @param userId
+ * @return
+ */
+ IPage getVideoCollectPage(IPage page,@Param("userId")String userId);
+
+ IPage getGoodsCollectPage(IPage page,@Param("userId")String type);
}
--
Gitblit v1.8.0