From 4e502853119c6d8e7ff686191e19bb0a19a4f875 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 六月 2025 16:35:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java |   41 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 40 insertions(+), 1 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 ec8ab0d..1841afb 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
@@ -3,6 +3,10 @@
 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.query.AuthorVideoQuery;
+import cn.lili.modules.member.entity.dos.FootPrint;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.security.access.prepost.PreAuthorize;
 import lombok.RequiredArgsConstructor;
@@ -66,8 +70,43 @@
 
     @GetMapping("/recommend")
     @ApiOperation(value = "瑙嗛鎺ㄨ崘", notes = "瑙嗛鎺ㄨ崘")
-    public Result recommendVideo(AbsQuery query) {
+    public Result recommendVideo(VideoQuery query) {
         return videoService.recommendVideo(query);
     }
 
+    @PostMapping("/view/record")
+    @ApiOperation(value = "淇濆瓨瑙傜湅璁板綍", notes = "淇濆瓨瑙傜湅璁板綍")
+    public Result saveViewRecord(@RequestBody VideoFootPrintForm form) {
+        return videoService.saveViewRecord(form);
+    }
+
+    @GetMapping("/author-info/{authorId}")
+    @ApiOperation(value = "鑾峰彇瑙嗛涓婚〉浣滆�呬俊鎭�", notes = "鑾峰彇瑙嗛涓婚〉浣滆�呬俊鎭�")
+    public Result getAuthorInfo(@PathVariable("authorId") String authorId) {
+        return videoService.getAuthorInfo(authorId);
+    }
+
+    @GetMapping("/author-video-page")
+    @ApiOperation(value = "鑾峰彇瑙嗛涓婚〉浣滆�呰棰戝垎椤�", notes = "鑾峰彇瑙嗛涓婚〉浣滆�呰棰戝垎椤�")
+    public Result getAuthorVideoPage(AuthorVideoQuery query) {
+        return videoService.getAuthorVideoPage(query);
+    }
+
+    @GetMapping("/author-collect-video-page")
+    @ApiOperation(value = "鑾峰彇瑙嗛涓婚〉浣滆�呮敹钘忕殑瑙嗛鍒嗛〉", notes = "鑾峰彇瑙嗛涓婚〉浣滆�呮敹钘忕殑瑙嗛鍒嗛〉")
+    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