From b83b070dc8cc823c877aa3a2ade134272ec0641a Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 07 七月 2025 17:02:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java |   63 +++++++++++++++++++++++++------
 1 files changed, 51 insertions(+), 12 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 9ae68b3..32fc3b6 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,23 +1,22 @@
 package cn.lili.controller.lmk;
 
-import cn.lili.group.Update;
+import cn.lili.base.Result;
 import cn.lili.group.Add;
+import cn.lili.group.Update;
+import cn.lili.modules.lmk.domain.form.ThumbsUpRecordForm;
 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.lmk.domain.query.HealthVideoQuery;
-import cn.lili.modules.lmk.domain.query.WxHealthVideoQuery;
-import org.springframework.validation.annotation.Validated;
-import lombok.RequiredArgsConstructor;
-import java.util.List;
-import javax.validation.constraints.NotEmpty;
+import cn.lili.modules.lmk.domain.query.*;
+import cn.lili.modules.lmk.service.VideoService;
 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.query.VideoQuery;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
 
 /**
  * 瑙嗛鍐呭 鍓嶇鎺у埗鍣�
@@ -41,7 +40,7 @@
     }
 
     @PutMapping
-    @ApiOperation(value = "淇敼", notes = "淇敼")
+    @ApiOperation(value = "淇敼瑙嗛", notes = "淇敼瑙嗛")
     public Result update(@RequestBody @Validated(Update.class) WxVideoForm form) {
         return videoService.updatePublish(form);
     }
@@ -80,7 +79,17 @@
     public Result healthRecommendVideo(WxHealthVideoQuery query) {
         return videoService.healthRecommendVideo(query);
     }
+    @GetMapping("/kitchen/type")
+    @ApiOperation(value = "鍘ㄧ瑙嗛绫诲瀷鍒楄〃", notes = "鍘ㄧ瑙嗛绫诲瀷鍒楄〃")
+    public Result kitchenTypeList() {
+        return videoService.kitchenTypeList();
+    }
 
+    @GetMapping("/kitchen/recommend")
+    @ApiOperation(value = "鍘ㄧ瑙嗛鎺ㄨ崘", notes = "鍘ㄧ瑙嗛鎺ㄨ崘")
+    public Result kitchenRecommendVideo(WxKitchenVideoQuery query) {
+        return videoService.kitchenRecommendVideo(query);
+    }
     @GetMapping("/goods/detail/{videoId}")
     @ApiOperation(value = "瑙嗛鍟嗗搧鏌ョ湅", notes = "瑙嗛鍟嗗搧鏌ョ湅")
     public Result getGoodsDetail(@PathVariable("videoId") String videoId) {
@@ -111,6 +120,12 @@
         return videoService.getAuthorCollectVideoPage(query);
     }
 
+    @GetMapping("/author-like-video-page")
+    @ApiOperation(value = "鑾峰彇瑙嗛涓婚〉浣滆�呯偣璧炵殑瑙嗛鍒嗛〉", notes = "鑾峰彇瑙嗛涓婚〉浣滆�呯偣璧炵殑瑙嗛鍒嗛〉")
+    public Result getAuthorLikeVideoPage(AuthorVideoQuery query) {
+        return videoService.getAuthorLikeVideoPage(query);
+    }
+
     @PostMapping("/home-page-info-edit")
     @ApiOperation(value = "淇濆瓨瑙嗛涓婚〉鐨勪釜浜轰俊鎭慨鏀�", notes = "淇濆瓨瑙嗛涓婚〉鐨勪釜浜轰俊鎭慨鏀�")
     public Result homePageInfoEdit(@RequestBody @Validated VideoHomePageInfoForm form) {
@@ -122,4 +137,28 @@
     public Result wxDetail(@PathVariable("id") String id) {
         return videoService.wxDetail(id);
     }
+
+    @PostMapping("/change/thumbs-up")
+    @ApiOperation(value = "鐐硅禐/鍙栨秷鐐硅禐瑙嗛", notes = "鐐硅禐/鍙栨秷鐐硅禐瑙嗛")
+    public Result changeThumbsUp(@RequestBody @Validated(Add.class) ThumbsUpRecordForm form) {
+        return videoService.changeThumbsUp(form);
+    }
+
+    @GetMapping("/es/search")
+    @ApiOperation(value = "瑙嗛鎼滅储", notes = "瑙嗛鎼滅储")
+    public Result esSearch(VideoEsQuery query) {
+        return videoService.esSearch(query);
+    }
+
+    @PostMapping("/goods/similarly")
+    @ApiOperation(value = "鎸傜浉鍚屽晢鍝佺殑瑙嗛", notes = "鎸傜浉鍚屽晢鍝佺殑瑙嗛")
+    public Result goodsSimilarly(@RequestBody VideoQuery query) {
+        return videoService.recommendVideo(query);
+    }
+
+    @GetMapping("/history")
+    @ApiOperation(value = "鑾峰彇鍘嗗彶鎾斁璁板綍")
+    public Result getHistoryPage(VideoHistoryQuery query) {
+        return videoService.getHistoryPage(query);
+    }
 }

--
Gitblit v1.8.0