From 134f5b1aedeb90b9f7a71dc41e8f08e96bcb3f85 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期二, 29 七月 2025 11:46:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/lmk/mapper/MyCollectMapper.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 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 c6e6eb1..23ac9b9 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.*;
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.form.MyCollectForm;
import cn.lili.modules.lmk.domain.query.MyCollectQuery;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
@@ -40,4 +38,30 @@
* @return
*/
List<SimpleMyCollectVO> getCollectsByVideoIds(@Param("videoIds") List<String> videoIds, @Param("userId") String currentUserId);
+
+ /**
+ * 鏍规嵁瑙嗛钘忕被鍨媔d鍒嗙粍缁熻鏁伴噺锛屾瘮濡傦細缁熻姣忎釜瑙嗛鐨勬敹钘忔暟
+ *
+ * @return
+ */
+ 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);
+
+ IPage getGoodsCollectPage(IPage page,@Param("userId")String type);
}
--
Gitblit v1.8.0