From 8063ee7eee51bfe25a09428e6efc60f828b270c6 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 19 六月 2025 20:00:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/lmk/mapper/VideoMapper.java |   89 ++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 81 insertions(+), 8 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/lmk/mapper/VideoMapper.java b/framework/src/main/java/cn/lili/modules/lmk/mapper/VideoMapper.java
index c7b4551..a7396bd 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/mapper/VideoMapper.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/mapper/VideoMapper.java
@@ -1,16 +1,14 @@
 package cn.lili.modules.lmk.mapper;
 
 import cn.lili.modules.lmk.domain.entity.Video;
-import cn.lili.modules.lmk.domain.query.ManagerVideoQuery;
-import cn.lili.modules.lmk.domain.vo.CollectTypeNumVO;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import cn.lili.modules.lmk.domain.query.*;
+import cn.lili.modules.lmk.domain.vo.*;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import cn.lili.modules.lmk.domain.vo.VideoVO;
-import cn.lili.modules.lmk.domain.form.VideoForm;
-import cn.lili.modules.lmk.domain.query.VideoQuery;
-import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 瑙嗛鍐呭 Mapper 鎺ュ彛
@@ -46,7 +44,9 @@
      *
      * @return
      */
-    IPage recommendVideo(IPage page);
+    IPage recommendVideo(IPage page, @Param("query") VideoQuery query);
+
+    IPage recommendHealthVideo(IPage page, @Param("query") WxHealthVideoQuery query);
 
     /**
      * 鎵归噺鏇存柊瑙嗛鏀惰棌鏁伴噺
@@ -54,4 +54,77 @@
      * @param numList
      */
     void updateCollectNumBatch(@Param("list") List<CollectTypeNumVO> numList);
+
+    /**
+     * 鎵归噺鏇存柊瑙嗛璇勮鏁伴噺
+     *
+     * @param numList
+     */
+    void updateCommentNumBatch(@Param("list") List<CollectTypeNumVO> numList);
+
+    /**
+     * 瑙嗛涓婚〉浣滆�呬俊鎭�
+     *
+     * @param authorId
+     * @return
+     */
+    VideoAccountVO getAuthorInfo(@Param("authorId") String authorId, @Param("currentUserId") String currentUserId);
+
+    /**
+     * 鑾峰彇浣滆�呯殑鎵�鏈夎棰慽d
+     *
+     * @param authorId
+     * @return
+     */
+    List<String> getVideoIdsByAuthor(@Param("authorId") String authorId);
+
+    /**
+     * 鑾峰彇浣滆�呮墍鏈夎棰戠殑鏀惰棌鏁颁箣鍜�
+     *
+     * @param videoIds
+     * @return
+     */
+    Long countAuthorVideoCollectNum(@Param("videoIds") List<String> videoIds);
+
+    /**
+     * 鑾峰彇瑙嗛涓婚〉-浣滆�呰棰戠殑鍒嗛〉
+     *
+     * @param page
+     * @param query
+     */
+    IPage getAuthorVideoPage(IPage page, @Param("query") AuthorVideoQuery query);
+
+    /**
+     * 鑾峰彇瑙嗛涓婚〉浣滆�呮敹钘忕殑瑙嗛鍒嗛〉
+     *
+     * @param page
+     * @param query
+     */
+    IPage getAuthorCollectVideoPage(IPage page, @Param("query") AuthorVideoQuery query);
+
+    /**
+     * 灏忕▼搴�-瑙嗛璇︽儏
+     *
+     * @param id
+     * @return
+     */
+    WxEditVideoVO wxDetail(@Param("id") String id);
+
+    /**
+     * 澶у仴搴疯棰戝垎椤�
+     *
+     * @param page
+     * @param query
+     */
+    IPage healthPage(IPage page, @Param("query") HealthVideoQuery query);
+
+    IPage kitchenPage(IPage page, @Param("query") KitchenVideoQuery query);
+
+    /**
+     * 鑾峰彇瑙嗛鎮寕鍟嗗搧
+     *
+     * @param videoId
+     * @return
+     */
+    List<VideoGoodsDetailVO> getVideoGoods(@Param("id") String videoId);
 }

--
Gitblit v1.8.0