From 61b5f9863f14ab4fc9da504ca2b553a778eb2e2c Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 24 一月 2024 15:10:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopMapper.java |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 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 99c367f..58b1459 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
@@ -39,7 +39,7 @@
      * @param mgtShopPageDto
      * @return
      */
-    List<MgtShopPageVo> pageMgtShop(Page page, @Param("param") MgtShopPageDto mgtShopPageDto);
+    List<MgtShopPageVo> pageMgtShop(Page page, @Param("param") MgtShopPageDto mgtShopPageDto,@Param("list") List<Long> scope);
 
 
     /**
@@ -101,7 +101,8 @@
      * @param mgtShopListDto
      * @return  List<MgtShopListSimpleVo>
      */
-    List<MgtShopListSimpleVo> listMgtShopSimpleVo(@Param("param")MgtShopListDto mgtShopListDto);
+    List<MgtShopListSimpleVo> listMgtShopSimpleVo(@Param("param")MgtShopListDto mgtShopListDto,
+                                                  @Param("list")List<Long> list);
 
     /**
      * @description  通过id获取商户列表
@@ -130,7 +131,8 @@
      * @author jqs34
      * @date 2023/6/15 0:05
      */
-    List<MgtShopAuthPageVo> pageMgtShopAuth(Page page, @Param("param")MgtShopAuthPageDto mgtShopAuthPageDto);
+    List<MgtShopAuthPageVo> pageMgtShopAuth(Page page, @Param("param")MgtShopAuthPageDto mgtShopAuthPageDto,
+                                            @Param("list")List<Long> scope);
 
 
     /**
@@ -139,7 +141,8 @@
      * @param mgtShopAuthPageDto
      * @return
      */
-    List<MgtShopHFTXAuthPageVo> pageMgtShopHFTXAuth(Page page, @Param("param") MgtShopHFTXAuthPageDto mgtShopAuthPageDto);
+    List<MgtShopHFTXAuthPageVo> pageMgtShopHFTXAuth(Page page, @Param("param") MgtShopHFTXAuthPageDto mgtShopAuthPageDto,
+                                                    @Param("list")List<Long> scope);
 
 
 
@@ -277,4 +280,17 @@
      * @return  List<MgtUserTaskMsgVo>
      */
     List<MgtUserTaskMsgVo> getTaskMsgList();
+
+
+
+
+
+    /**
+     * @description
+     * @author  jqs
+     * @date    2023/8/10 22:54
+     * @param cityCodes
+     * @return  List<Long>
+     */
+    List<Shop> listShopByCityCode(@Param("cityCodes")List<String> cityCodes);
 }

--
Gitblit v1.7.1