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/VideoMapper.java |   81 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 70 insertions(+), 11 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 0839f17..252babb 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,19 +1,15 @@
 package cn.lili.modules.lmk.mapper;
 
 import cn.lili.modules.lmk.domain.entity.Video;
-import cn.lili.modules.lmk.domain.query.AuthorVideoQuery;
-import cn.lili.modules.lmk.domain.query.ManagerVideoQuery;
-import cn.lili.modules.lmk.domain.vo.CollectTypeNumVO;
-import cn.lili.modules.lmk.domain.vo.VideoAccountVO;
-import cn.lili.modules.lmk.domain.vo.WxVideoVO;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import cn.lili.modules.lmk.domain.es.VideoIndex;
+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 鎺ュ彛
@@ -49,7 +45,12 @@
      *
      * @return
      */
-    IPage recommendVideo(IPage page);
+    IPage recommendVideo(IPage page, @Param("query") VideoQuery query);
+
+    IPage recommendHealthVideo(IPage page, @Param("query") WxHealthVideoQuery query);
+
+
+    IPage wxKitchenVideoQuery(IPage page, @Param("query") WxKitchenVideoQuery query);
 
     /**
      * 鎵归噺鏇存柊瑙嗛鏀惰棌鏁伴噺
@@ -64,6 +65,13 @@
      * @param numList
      */
     void updateCommentNumBatch(@Param("list") List<CollectTypeNumVO> numList);
+
+    /**
+     * 鎵归噺鏇存柊瑙嗛鐐硅禐鏁�
+     *
+     * @param numList
+     */
+    void updateThumbsUpNumBatch(@Param("list") List<CollectTypeNumVO> numList);
 
     /**
      * 瑙嗛涓婚〉浣滆�呬俊鎭�
@@ -96,4 +104,55 @@
      * @param query
      */
     IPage getAuthorVideoPage(IPage page, @Param("query") AuthorVideoQuery query);
+
+    /**
+     * 鑾峰彇瑙嗛涓婚〉浣滆�呮敹钘忕殑瑙嗛鍒嗛〉
+     *
+     * @param page
+     * @param query
+     */
+    IPage getAuthorCollectVideoPage(IPage page, @Param("query") AuthorVideoQuery query);
+
+    /**
+     * 鑾峰彇瑙嗛涓婚〉浣滆�呯偣璧炵殑瑙嗛鍒嗛〉
+     *
+     * @param page
+     * @param query
+     */
+    IPage getAuthorLikeVideoPage(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);
+
+    /**
+     * es鍚屾鏌ヨ瑙嗛鏁版嵁
+     *
+     * @param start 寮�濮嬩綅缃�
+     * @param pageSize 姣忛〉鏉℃暟
+     * @return
+     */
+    List<VideoIndex> getEsPage(@Param("start") int start, @Param("pageSize") int pageSize);
 }

--
Gitblit v1.8.0