From 8059e9b991c15edbac508e6b658a0d9571d11b1c Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 01 八月 2025 12:46:00 +0800
Subject: [PATCH] bug修改

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopMapper.java |   41 +++++++++++++++++++++++++++++++++--------
 1 files changed, 33 insertions(+), 8 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..cd47875 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
@@ -4,13 +4,12 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.shop.domain.dto.*;
 import com.ruoyi.shop.domain.vo.*;
+import com.ruoyi.system.api.domain.dto.MGtOneClinkSyncingShopPageDTO;
 import com.ruoyi.system.api.domain.dto.MgtBasePlatformDto;
 import com.ruoyi.system.api.domain.dto.MgtShopIdByCodeDto;
+import com.ruoyi.system.api.domain.poji.config.OneClinkSyncing;
 import com.ruoyi.system.api.domain.poji.shop.Shop;
-import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
-import com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo;
-import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
-import com.ruoyi.system.api.domain.vo.MgtUserTaskMsgVo;
+import com.ruoyi.system.api.domain.vo.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -39,7 +38,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 +100,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 +130,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 +140,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 +292,27 @@
      * @return  List<Long>
      */
     List<Shop> listShopByCityCode(@Param("cityCodes")List<String> cityCodes);
+
+    List<Shop> getFranchiseeIdsBYDealerId(@Param("shopId")Long shopId);
+
+
+    /**
+     * 设置加盟商的归属经销商为null
+     * @param shopId
+     */
+    void setBelongShopIdNull(@Param("shopId")Long shopId);
+
+    /**
+     * 根据shopIds获取一键同步的店铺信息
+     * @param page
+     * @param scope
+     * @return
+     */
+    List<MgtOneClinkSyncingShopPageVo> getMgtShopPageVoByShopIds(Page page, @Param("list") List<Long> scope);
+
+    void updateShopByOneClinkSyncing(@Param("param") OneClinkSyncing oneClinkSyncing);
+
+    List<Long> getShopListBySignAreaCodes(@Param("list")List<String> areaCodes);
+
+    void updateBelongShopIdBatch(@Param("list")List<Long> shopIds, @Param("shopId")Long shopId);
 }

--
Gitblit v1.7.1