From 2226679bda25ddf977f12367a9a37fcf4e377249 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 17 六月 2025 11:00:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java |   86 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 78 insertions(+), 8 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java b/framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java
index 0acc5ad..8e44942 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/VideoService.java
@@ -1,14 +1,15 @@
 package cn.lili.modules.lmk.service;
 
-import cn.lili.base.AbsQuery;
+import cn.lili.group.Add;
 import cn.lili.modules.lmk.domain.entity.Video;
 import cn.lili.modules.lmk.domain.form.*;
-import cn.lili.modules.lmk.domain.query.AuthorVideoQuery;
-import cn.lili.modules.lmk.domain.query.ManagerVideoQuery;
+import cn.lili.modules.lmk.domain.query.*;
 import cn.lili.modules.lmk.domain.vo.CollectTypeNumVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import cn.lili.base.Result;
-import cn.lili.modules.lmk.domain.query.VideoQuery;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+
 import java.util.List;
 
 /**
@@ -24,14 +25,14 @@
      * @param form
      * @return
      */
-    Result add(VideoForm form);
+    Result add(WxVideoForm form);
 
     /**
      * 淇敼
      * @param form
      * @return
      */
-    Result update(VideoForm form);
+    Result update(WxVideoForm form);
 
     /**
      * 鎵归噺鍒犻櫎
@@ -73,7 +74,7 @@
      * @param form
      * @return
      */
-    Result publish(VideoForm form);
+    Result publish(WxVideoForm form);
 
     /**
      * 骞冲彴绔棰戝垎椤�
@@ -119,8 +120,11 @@
      * 灏忕▼搴忕鐨勮棰戞帹鑽愭帴鍙�
      *
      * @return
+     * @param query
      */
-    Result recommendVideo(AbsQuery query);
+    Result recommendVideo(VideoQuery query);
+
+    Result healthRecommendVideo(WxHealthVideoQuery query);
 
     /**
      * 鎵归噺鏇存柊瑙嗛鏀惰棌鏁伴噺
@@ -167,4 +171,70 @@
      * @return
      */
     Result getAuthorCollectVideoPage(AuthorVideoQuery query);
+
+    /**
+     * 淇濆瓨瑙嗛涓婚〉鐨勪釜浜轰俊鎭慨鏀�
+     *
+     * @param form
+     * @return
+     */
+    Result homePageInfoEdit(VideoHomePageInfoForm form);
+
+    /**
+     * 灏忕▼搴�-瑙嗛璇︽儏
+     *
+     * @param id
+     * @return
+     */
+    Result wxDetail(String id);
+
+    /**
+     * 澶у仴搴疯棰戝彂甯�
+     *
+     * @param form
+     * @return
+     */
+    Result healthVideo(HealthVideoForm form);
+    /**
+     * 淇敼澶у仴搴疯棰�
+     *
+     * @param form
+     * @return
+     */
+    Result updateHealthVideo(HealthVideoForm form);
+    /**
+     * 澶у仴搴疯棰戝垪琛�
+     *
+     * @param query
+     * @return
+     */
+    Result healthPage(HealthVideoQuery query);
+    /**
+     * 鍒犻櫎澶у仴搴疯棰�
+
+     * @param id 涓婚敭id
+     * @return
+     */
+    Result delHealth(String id);
+
+    Result addKitchenVideo( KitchenVideoForm form);
+
+    Result updateKitchenVideo( KitchenVideoForm form);
+    /**
+     * 鍘ㄧ瑙嗛鍒楄〃
+     *
+     * @param query
+     * @return
+     */
+    Result KitchenVideoQuery(KitchenVideoQuery query);
+
+    Result delKitchen(String id);
+
+    /**
+     * 瑙嗛鍟嗗搧鏌ョ湅
+     *
+     * @param videoId
+     * @return
+     */
+    Result getGoodsDetail(String videoId);
 }

--
Gitblit v1.8.0