From 029af9c4503d6838bddd55a6ecd6b73705ca1522 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 26 十一月 2024 17:08:00 +0800
Subject: [PATCH] 1.完善接口的定义 2.完成部分接口的开发 3.集成基于Redisson的分布式锁

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java
index 9789b16..b414fac 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java
@@ -1,19 +1,20 @@
 package com.ruoyi.other.controller;
 
 
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.other.api.domain.Goods;
 import com.ruoyi.other.service.GoodsService;
+import com.ruoyi.other.vo.GoodsVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * <p>
@@ -25,7 +26,7 @@
  */
 @RestController
 @RequestMapping("/goods")
-@Api("商品")
+@Api(tags = "商品")
 public class GoodsController extends BaseController {
     @Resource
     private GoodsService goodsService;
@@ -40,13 +41,26 @@
         return getDataTable(goodsService.goodsList(goods));
     }
 
+
+    /**
+     * 指定门店商品
+     */
+    @GetMapping("/getGoodsListByShopId")
+    @ApiOperation(value = "商品列表", tags = {"小程序-首页-门店详情-商品购买列表"})
+    public TableDataInfo getGoodsListByShopId(@ApiParam("门店id") @RequestParam Integer shopId) {
+        startPage();
+        List<Goods> goods = goodsService.getGoodsListByShopId(shopId);
+        return getDataTable(goods);
+    }
+
+
     /**
      * 商品详情
      */
     @GetMapping("/goodsDetail/{goodsId}")
     @ApiOperation(value = "商品详情", tags = {"小程序-商城-首页-商品详情"})
-    public AjaxResult goodsDetail(@PathVariable("goodsId") Long goodsId){
-        return success(goodsService.goodsDetail(goodsId));
+    public R<GoodsVO> goodsDetail(@PathVariable("goodsId") Long goodsId){
+        return R.ok(goodsService.goodsDetail(goodsId));
     }
 
 

--
Gitblit v1.7.1