From 88bd75d93f86d3cf4f12e652d459da8bae71e545 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 15:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 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 a1fba30..19e4379 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
@@ -5,7 +5,7 @@
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.*;
import org.springframework.validation.annotation.Validated;
import lombok.RequiredArgsConstructor;
import java.util.List;
@@ -14,7 +14,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,13 +40,19 @@
@PutMapping
@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")
@@ -67,6 +72,27 @@
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("/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")
@ApiOperation(value = "淇濆瓨瑙傜湅璁板綍", notes = "淇濆瓨瑙傜湅璁板綍")
--
Gitblit v1.8.0