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

---
 buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java |   48 +++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java b/buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java
index 68671ba..9ae68b3 100644
--- a/buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java
@@ -1,26 +1,23 @@
 package cn.lili.controller.lmk;
 
-import cn.lili.base.AbsQuery;
 import cn.lili.group.Update;
 import cn.lili.group.Add;
 import cn.lili.modules.lmk.domain.form.VideoFootPrintForm;
+import cn.lili.modules.lmk.domain.form.VideoHomePageInfoForm;
+import cn.lili.modules.lmk.domain.form.WxVideoForm;
 import cn.lili.modules.lmk.domain.query.AuthorVideoQuery;
-import cn.lili.modules.member.entity.dos.FootPrint;
+import cn.lili.modules.lmk.domain.query.HealthVideoQuery;
+import cn.lili.modules.lmk.domain.query.WxHealthVideoQuery;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
 import lombok.RequiredArgsConstructor;
 import java.util.List;
-import org.springframework.validation.annotation.Validated;
 import javax.validation.constraints.NotEmpty;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import cn.lili.modules.lmk.service.VideoService;
 import cn.lili.base.Result;
-import cn.lili.modules.lmk.domain.form.VideoForm;
 import cn.lili.modules.lmk.domain.query.VideoQuery;
-import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 瑙嗛鍐呭 鍓嶇鎺у埗鍣�
@@ -39,20 +36,26 @@
 
     @PostMapping("/publish")
     @ApiOperation(value = "鍙戝竷瑙嗛", notes = "鍙戝竷瑙嗛")
-    public Result publish(@RequestBody @Validated({Add.class}) VideoForm form) {
+    public Result publish(@RequestBody @Validated({Add.class}) WxVideoForm form) {
         return videoService.publish(form);
     }
 
     @PutMapping
     @ApiOperation(value = "淇敼", notes = "淇敼")
-    public Result update(@RequestBody @Validated(Update.class) VideoForm form) {
-        return videoService.update(form);
+    public Result update(@RequestBody @Validated(Update.class) WxVideoForm form) {
+        return videoService.updatePublish(form);
     }
 
     @DeleteMapping("/{id}")
     @ApiOperation(value = "ID鍒犻櫎", notes = "ID鍒犻櫎")
     public Result removeById(@PathVariable("id") String id) {
         return videoService.removeById(id);
+    }
+
+    @PostMapping("/down/{id}")
+    @ApiOperation(value = "鐢ㄦ埛涓嬫灦瑙嗛", notes = "鐢ㄦ埛涓嬫灦瑙嗛")
+    public Result downVideo(@PathVariable("id") String id) {
+        return videoService.buyerDownVideo(id);
     }
 
     @DeleteMapping("/batch")
@@ -69,8 +72,19 @@
 
     @GetMapping("/recommend")
     @ApiOperation(value = "瑙嗛鎺ㄨ崘", notes = "瑙嗛鎺ㄨ崘")
-    public Result recommendVideo(AbsQuery query) {
+    public Result recommendVideo(VideoQuery query) {
         return videoService.recommendVideo(query);
+    }
+    @GetMapping("/health/recommend")
+    @ApiOperation(value = "澶у仴搴疯棰戞帹鑽�", notes = "澶у仴搴疯棰戞帹鑽�")
+    public Result healthRecommendVideo(WxHealthVideoQuery query) {
+        return videoService.healthRecommendVideo(query);
+    }
+
+    @GetMapping("/goods/detail/{videoId}")
+    @ApiOperation(value = "瑙嗛鍟嗗搧鏌ョ湅", notes = "瑙嗛鍟嗗搧鏌ョ湅")
+    public Result getGoodsDetail(@PathVariable("videoId") String videoId) {
+        return videoService.getGoodsDetail(videoId);
     }
 
     @PostMapping("/view/record")
@@ -96,4 +110,16 @@
     public Result getAuthorCollectVideoPage(AuthorVideoQuery query) {
         return videoService.getAuthorCollectVideoPage(query);
     }
+
+    @PostMapping("/home-page-info-edit")
+    @ApiOperation(value = "淇濆瓨瑙嗛涓婚〉鐨勪釜浜轰俊鎭慨鏀�", notes = "淇濆瓨瑙嗛涓婚〉鐨勪釜浜轰俊鎭慨鏀�")
+    public Result homePageInfoEdit(@RequestBody @Validated VideoHomePageInfoForm form) {
+        return videoService.homePageInfoEdit(form);
+    }
+
+    @GetMapping("/wx/detail/{id}")
+    @ApiOperation(value = "灏忕▼搴�-鑾峰彇瑙嗛璇︽儏", notes = "灏忕▼搴�-鑾峰彇瑙嗛璇︽儏")
+    public Result wxDetail(@PathVariable("id") String id) {
+        return videoService.wxDetail(id);
+    }
 }

--
Gitblit v1.8.0