From d8c97392354a6b6d14efbdd4a73ee0148609bef8 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 22 Sep 2021 10:04:06 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

---
 src/main/java/cc/mrbird/febs/mall/controller/ApiMallGoodsController.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallGoodsController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallGoodsController.java
index 2f4e723..860e466 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallGoodsController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallGoodsController.java
@@ -3,6 +3,7 @@
 import cc.mrbird.febs.common.entity.FebsResponse;
 import cc.mrbird.febs.mall.dto.MallGoodsQueryDto;
 import cc.mrbird.febs.mall.service.IApiMallGoodsService;
+import cc.mrbird.febs.mall.vo.MallGoodsDetailsVo;
 import cc.mrbird.febs.mall.vo.MallGoodsListVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -11,10 +12,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * @author wzy
@@ -29,7 +27,7 @@
 public class ApiMallGoodsController {
     private final IApiMallGoodsService mallGoodsService;
 
-    @ApiOperation(value = "findMallGoodsList", notes = "获取商城商品列表")
+    @ApiOperation(value = "获取商城商品列表", notes = "获取商城商品列表")
     @ApiResponses({
             @ApiResponse(code = 200, message = "success", response = MallGoodsListVo.class)
     })
@@ -38,4 +36,13 @@
         return new FebsResponse().success().data(mallGoodsService.findMallGoodsListInPage(queryDto));
     }
 
+    @ApiOperation(value = "获取商品详情", notes = "获取商品详情")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "success", response = MallGoodsDetailsVo.class)
+    })
+    @GetMapping(value = "/findMallGoodsDetailsById/{id}")
+    public FebsResponse findMallGoodsDetailsById(@PathVariable("id") Long id) {
+        return new FebsResponse().success().data(mallGoodsService.findMallGoodsDetailsById(id));
+    }
+
 }

--
Gitblit v1.9.1