From 8cdadf81127b9d34a54d250a3abc878a8d5339c5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 06 十二月 2024 19:31:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 91ea840..dd5e8c5 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
+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;
@@ -35,9 +36,9 @@
*/
@GetMapping("/goodsList")
@ApiOperation(value = "商品列表", tags = {"小程序-商城-首页-热门商品列表", "首页热门商品-小程序"})
- public R<List<GoodsVO>> goodsList(Goods goods){
+ public R<TableDataInfo> goodsList(Goods goods){
startPage();
- return R.ok(goodsService.goodsList(goods));
+ return R.ok(getDataTable(goodsService.goodsList(goods)));
}
@@ -46,9 +47,9 @@
*/
@GetMapping("/getGoodsListByShopId")
@ApiOperation(value = "商品列表", tags = {"小程序-首页-门店详情-商品购买列表"})
- public R<List<Goods>> getGoodsListByShopId(@ApiParam("门店id") @RequestParam Integer shopId) {
+ public R<TableDataInfo> getGoodsListByShopId(@ApiParam("门店id") @RequestParam Integer shopId) {
startPage();
- return R.ok(goodsService.getGoodsListByShopId(shopId));
+ return R.ok(getDataTable(goodsService.getGoodsListByShopId(shopId)));
}
@@ -86,6 +87,7 @@
Goods goods = goodsService.getById(id);
return R.ok(goods);
}
-
+
+
}
--
Gitblit v1.7.1