From 30ddf6570494f77a3dde98e5cd85c07cb340f51a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 25 十一月 2024 14:42:43 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 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..9789b16 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,33 @@
*/
@RestController
@RequestMapping("/goods")
-public class GoodsController {
+@Api("商品")
+public class GoodsController extends BaseController {
+ @Resource
+ private GoodsService goodsService;
+ /**
+ * 商品列表
+ */
+ @GetMapping("/goodsList")
+ @ApiOperation(value = "商品列表", tags = {"小程序-商城-首页-热门商品列表", "首页热门商品-小程序"})
+ public TableDataInfo goodsList(Goods goods){
+ startPage();
+ return getDataTable(goodsService.goodsList(goods));
+ }
+
+ /**
+ * 商品详情
+ */
+ @GetMapping("/goodsDetail/{goodsId}")
+ @ApiOperation(value = "商品详情", tags = {"小程序-商城-首页-商品详情"})
+ public AjaxResult goodsDetail(@PathVariable("goodsId") Long goodsId){
+ return success(goodsService.goodsDetail(goodsId));
+ }
+
+
+
+
+
}
--
Gitblit v1.7.1