From 3e7932d378b607f75379b463ae4ae2f4f1ccfe12 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 10:31:30 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopMapper.java | 13 +++++++++----
1 files changed, 9 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 31c3d28..54001ca 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, @Param("belongUserIds") List<Long> belongUserIds);
+ List<MgtShopPageVo> pageMgtShop(Page page, @Param("param") MgtShopPageDto mgtShopPageDto,@Param("list") List<Long> scope, @Param("associatedAccount")List<Integer> associatedAccount);
/**
@@ -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);
@@ -290,4 +293,6 @@
* @return List<Long>
*/
List<Shop> listShopByCityCode(@Param("cityCodes")List<String> cityCodes);
+
+ List<Shop> getFranchiseeIdsBYDealerId(@Param("shopId")Long shopId);
}
--
Gitblit v1.7.1