From c7d752e4c2dab7aa8e3873a331861cf0ee25976a Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期五, 22 十一月 2024 19:22:59 +0800
Subject: [PATCH] 1.

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java |   36 ++++++++++++++++++++++++++++++++++--
 1 files changed, 34 insertions(+), 2 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 4e421e8..b1e5697 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,9 +1,19 @@
 package com.ruoyi.other.controller;
 
 
+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 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 javax.annotation.Resource;
 
 /**
  * <p>
@@ -15,7 +25,29 @@
  */
 @RestController
 @RequestMapping("/goods")
-public class GoodsController {
+@Api("商品")
+public class GoodsController extends BaseController {
+    @Resource
+    private GoodsService goodsService;
+
+    /**
+     * 商品列表
+     */
+    @GetMapping("/goodsList")
+    @ApiOperation(value = "商品列表")
+    public TableDataInfo goodsList(Goods goods){
+        startPage();
+        return getDataTable(goodsService.goodsList(goods));
+    }
+
+    /**
+     * 商品详情
+     */
+    @GetMapping("/goodsDetail/{goodsId}")
+    public AjaxResult goodsDetail(@PathVariable("goodsId") Integer goodsId){
+        return success(goodsService.getById(goodsId));
+    }
+
 
 }
 

--
Gitblit v1.7.1