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 |   29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 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 4b2675f..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,13 +1,8 @@
 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.query.VideoQuery;
-import cn.lili.modules.lmk.domain.vo.CollectTypeNumVO;
-import cn.lili.modules.lmk.domain.vo.VideoAccountVO;
-import cn.lili.modules.lmk.domain.vo.VideoVO;
-import cn.lili.modules.lmk.domain.vo.WxEditVideoVO;
+import cn.lili.modules.lmk.domain.query.*;
+import cn.lili.modules.lmk.domain.vo.*;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
@@ -50,6 +45,8 @@
      * @return
      */
     IPage recommendVideo(IPage page, @Param("query") VideoQuery query);
+
+    IPage recommendHealthVideo(IPage page, @Param("query") WxHealthVideoQuery query);
 
     /**
      * 鎵归噺鏇存柊瑙嗛鏀惰棌鏁伴噺
@@ -112,4 +109,22 @@
      * @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