From 85193ef9fceaac85f57dc531f80fcfdc204bfc23 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 02 四月 2025 18:22:44 +0800
Subject: [PATCH] 商城

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java |   13 +++++--------
 1 files changed, 5 insertions(+), 8 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 5951435..44b508c 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
@@ -162,9 +162,9 @@
      */
     @GetMapping("/getGoodsListByShopId")
     @ApiOperation(value = "商品购买列表", tags = {"小程序-首页-门店详情"})
-    public R<PageInfo<Goods>> getGoodsListByShopId(@ApiParam("门店id") Integer shopId, Integer pageCurr, Integer pageSize) {
-        PageInfo<Goods> pageInfo = new PageInfo(pageCurr, pageSize);
-        List<Goods> goodsList = goodsService.getGoodsListByShopId(pageInfo, shopId);
+    public R<PageInfo<GoodsVO>> getGoodsListByShopId(@ApiParam("门店id") Integer shopId, Integer pageCurr, Integer pageSize) {
+        PageInfo<GoodsVO> pageInfo = new PageInfo(pageCurr, pageSize);
+        List<GoodsVO> goodsList = goodsService.getGoodsListByShopId(pageInfo, shopId);
         return R.ok(pageInfo.setRecords(goodsList));
     }
 
@@ -174,11 +174,8 @@
      */
     @GetMapping("/goodsDetail/{goodsId}")
     @ApiOperation(value = "商品详情", tags = {"小程序-商城-首页"})
-    public R<GoodsVO> goodsDetail(@PathVariable("goodsId") Long goodsId,
-                                  Integer shopId,
-                                  String longitude,
-                                  String latitude) {
-        return R.ok(goodsService.goodsDetail(goodsId, shopId, longitude, latitude));
+    public R<GoodsVO> goodsDetail(@PathVariable("goodsId") Long goodsId) {
+        return R.ok(goodsService.goodsDetail(goodsId));
     }
 
 

--
Gitblit v1.7.1