From aac2321d1cf5536f7ea03f30d55a4aba30fbf710 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 02 七月 2025 10:39:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 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 9792dd0..a8f665f 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
@@ -2,12 +2,11 @@
import cn.lili.group.Update;
import cn.lili.group.Add;
+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 cn.lili.modules.lmk.domain.query.*;
import org.springframework.validation.annotation.Validated;
import lombok.RequiredArgsConstructor;
import java.util.List;
@@ -16,7 +15,6 @@
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 org.springframework.web.bind.annotation.*;
/**
@@ -41,15 +39,21 @@
}
@PutMapping
- @ApiOperation(value = "淇敼", notes = "淇敼")
+ @ApiOperation(value = "淇敼瑙嗛", notes = "淇敼瑙嗛")
public Result update(@RequestBody @Validated(Update.class) WxVideoForm form) {
- return videoService.update(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")
@@ -73,6 +77,22 @@
@ApiOperation(value = "澶у仴搴疯棰戞帹鑽�", notes = "澶у仴搴疯棰戞帹鑽�")
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) {
+ return videoService.getGoodsDetail(videoId);
}
@PostMapping("/view/record")
@@ -99,6 +119,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) {
@@ -110,4 +136,10 @@
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);
+ }
}
--
Gitblit v1.8.0