From 7f55c18d7db36c9cad2ac96e481680bc1107e51c Mon Sep 17 00:00:00 2001 From: Hentua <wangdoubleone@gmail.com> Date: Thu, 15 Jun 2023 11:16:11 +0800 Subject: [PATCH] Merge branch 'meiye_mall' of http://120.27.238.55:7000/r/xc-mall into meiye_mall --- src/main/java/cc/mrbird/febs/mall/service/impl/MallShopServiceImpl.java | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 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 7d1d72d..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 @@ -1,15 +1,22 @@ package cc.mrbird.febs.mall.service.impl; import cc.mrbird.febs.common.entity.QueryRequest; +import cc.mrbird.febs.mall.dto.ApiShopDto; 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; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; + +import java.util.List; @Slf4j @Service @@ -20,4 +27,15 @@ Page<MallShop> page = new Page<>(request.getPageNum(), request.getPageSize()); return this.baseMapper.selectShopListInPage(mallShop, page); } + + @Override + 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); + List<MallShop> list = this.baseMapper.selectShopDistanceList(mallShop, page); + + return BeanUtil.copyToList(list, ApiShopVo.class); + } } -- Gitblit v1.9.1