Merge remote-tracking branch 'origin/dev' into dev

peng

16 小时以前 4372e6406222ce6b33f8c1c0703b460d39b5814e

 buyer-api/src/main/java/cn/lili/controller/lmk/VideoController.java

@@ -5,9 +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.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 +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.*;

/**
@@ -43,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")
@@ -74,7 +77,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) {