From 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 13:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/mapper/shop/ShopMapper.java | 25 +++++++++++++++++++++----
1 files changed, 21 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 54001ca..4f6f949 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;
@@ -295,4 +294,22 @@
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);
+
}
--
Gitblit v1.7.1