From 7a49bcc5e561df7a9b65266a57a9c0896c0fd3d0 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 10 五月 2023 13:48:56 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopMapper.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopMapper.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopMapper.java
index 78aa46c..e22248c 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopMapper.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopMapper.java
@@ -1,10 +1,15 @@
package com.ruoyi.shop.mapper.shop;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.shop.domain.dto.AppNearbyShopDto;
+import com.ruoyi.shop.domain.dto.MerAgencyPageDto;
+import com.ruoyi.shop.domain.vo.AppNearShopVo;
+import com.ruoyi.shop.domain.vo.MerAgencyPageVo;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.shop.domain.dto.MgtShopPageDto;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.shop.domain.vo.MgtShopPageVo;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -23,6 +28,21 @@
* @param mgtShopPageDto
* @return
*/
- List<MgtShopPageVo> pageShop(Page page, MgtShopPageDto mgtShopPageDto);
+ List<MgtShopPageVo> pageShop(Page page, @Param("param") MgtShopPageDto mgtShopPageDto);
+
+ /**
+ *
+ * @param page
+ * @param merAgencyPageDto
+ * @return
+ */
+ List<MerAgencyPageVo> pageMerAgencyVo (Page page, @Param("param")MerAgencyPageDto merAgencyPageDto);
+
+ /**
+ *
+ * @param appNearbyShopDto
+ * @return
+ */
+ AppNearShopVo getNearbyShop(@Param("param")AppNearbyShopDto appNearbyShopDto);
}
--
Gitblit v1.7.1