From d7b3c61e01aadf99ce6a1d8ebf18c4e6dd81cc2b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 12 十二月 2024 18:05:34 +0800
Subject: [PATCH] 12.12

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 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..5df2096 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;
@@ -31,13 +32,24 @@
     private GoodsService goodsService;
 
     /**
+     * 添加商品
+     */
+    @PostMapping("/addGoods")
+    @ApiOperation(value = "添加商品", tags = {"管理后台-发布商品"})
+    public R<Void> addGoods(@RequestBody Goods goods) {
+        return R.ok();
+    }
+
+
+
+    /**
      * 商品列表
      */
     @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 +58,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 +98,13 @@
         Goods goods = goodsService.getById(id);
         return R.ok(goods);
     }
-    
+
+    @ResponseBody
+    @PostMapping("/getGoodsByIds")
+    public R<List<Goods>> getGoodsByIds(@RequestParam("ids") String [] ids){
+        List<Goods> goods = goodsService.lambdaQuery().in(Goods::getId, ids).list();
+        return R.ok(goods);
+    }
+
 }
 

--
Gitblit v1.7.1