From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java
index b0ae7fe..e0883a5 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/shop/ShopService.java
@@ -8,12 +8,16 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.vo.*;
+import com.ruoyi.shop.domain.vo.MgtShopPageVo;
+import com.ruoyi.system.api.domain.dto.MGtOneClinkSyncingShopPageDTO;
import com.ruoyi.system.api.domain.dto.MerBaseDto;
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.member.Member;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.vo.*;
+import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
@@ -70,7 +74,7 @@
* @param mgtShopPageDto
* @return
*/
- List<MgtShopPageVo> pageMgtShop(Page page, MgtShopPageDto mgtShopPageDto,List<Long> scope);
+ List<MgtShopPageVo> pageMgtShop(Page page, MgtShopPageDto mgtShopPageDto, List<Long> scope);
/**
* 获取商户详情
@@ -210,7 +214,7 @@
* @author jqs34
* @date 2023/6/18 17:01
*/
- MgtBulletinBoardVo boardShopTotal();
+ MgtBulletinBoardVo boardShopTotal(List<Long> userIds);
/**
* @description 商户进件
@@ -452,4 +456,37 @@
* @return List<Long>
*/
List<Shop> listShopByCityCode(List<String> cityCodes);
+
+
+ /**
+ * 根据员工id获取对应的门店
+ * @param userIds
+ * @return
+ */
+ List<Shop> getShopBySysUserIds(List<Long> userIds);
+
+ /**
+ * 根据经销商id查询加盟商ids
+ * @param shopId
+ * @return
+ */
+ List<Shop> getFranchiseeIdsBYDealerId(Long shopId);
+ /**
+ * 修改商户类型
+ * @param shopId
+ * @return
+ */
+ R<Void> changeShopType(Long shopId);
+
+ /**
+ * 根据ids分页获取一键同步的商户信息
+ * @param dto
+ * @return
+ */
+ Page<MgtOneClinkSyncingShopPageVo> getMgtShopPageVoByShopIds(MGtOneClinkSyncingShopPageDTO dto);
+
+ /**
+ * 一键同步商户信息
+ */
+ R updateShopByOneClinkSyncing(OneClinkSyncing oneClinkSyncing);
}
--
Gitblit v1.7.1