From fc093b0724b0c8979c0896f2bdc4cf8c4af27a1f Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Sun, 23 Apr 2023 15:21:40 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/service/impl/MallShopServiceImpl.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MallShopServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MallShopServiceImpl.java
index 6d5d39d..1597c50 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MallShopServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MallShopServiceImpl.java
@@ -5,6 +5,7 @@
 import cc.mrbird.febs.mall.entity.MallShop;
 import cc.mrbird.febs.mall.mapper.MallShopMapper;
 import cc.mrbird.febs.mall.service.IMallShopService;
+import cc.mrbird.febs.mall.vo.ApiShopVo;
 import cc.mrbird.febs.mall.vo.ShopListVo;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
@@ -28,11 +29,13 @@
     }
 
     @Override
-    public List<ShopListVo> findShopList(ApiShopDto apiShopDto) {
-        Page<MallShop> page = new Page<>(apiShopDto.getPageNum(), apiShopDto.getPageSize());
-
+    public List<ApiShopVo> findShopList(ApiShopDto apiShopDto) {
+        QueryRequest page = new QueryRequest();
+        page.setPageNum(apiShopDto.getPageNum() - 1);
+        page.setPageSize(apiShopDto.getPageSize());
         MallShop mallShop = BeanUtil.copyProperties(apiShopDto, MallShop.class);
-        IPage<MallShop> list = this.baseMapper.selectShopListInPage(mallShop, page);
-        return BeanUtil.copyToList(list.getRecords(), ShopListVo.class);
+        List<MallShop> list = this.baseMapper.selectShopDistanceList(mallShop, page);
+
+        return BeanUtil.copyToList(list, ApiShopVo.class);
     }
 }

--
Gitblit v1.9.1