From 212d4cd9160f5c6f2247c87d252d6f97834299b4 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期三, 11 十二月 2024 10:52:54 +0800
Subject: [PATCH] 1.后台管理-商品管理

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
index 59105e6..314a5cc 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java
@@ -2,6 +2,7 @@
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ruoyi.account.api.feignClient.AppUserClient;
 import com.ruoyi.account.api.model.AppUser;
 import com.ruoyi.account.api.model.AppUserShop;
@@ -83,7 +84,7 @@
     }
 
 
-    @PostMapping("/getDetailById")
+    @GetMapping("/getDetailById")
     @ApiOperation(value = "门店详情", tags = {"后台管理-门店管理-门店详情"})
     public R<Shop> getDetailById(@RequestParam("id") Long id){
         Shop byId = shopService.getById(id);
@@ -106,8 +107,9 @@
 
     @GetMapping("/list")
     @ApiOperation(value = "门店列表", tags = {"后台管理-门店管理-门店列表"})
-    public R<List<Shop>> list(@ApiParam("页码") @RequestParam Integer PageNum,@ApiParam("每一页数据大小") Integer pageSize,Shop shop){
-        List<Shop> list = shopService.list();
+    public R<IPage<Shop>> list(@ApiParam("页码") @RequestParam Integer PageNum,@ApiParam("每一页数据大小") Integer pageSize,Shop shop){
+        IPage<Shop> shopIPage = shopService.getShopList(PageNum, pageSize, shop);
+        return R.ok(shopIPage);
     }
 
 

--
Gitblit v1.7.1