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/controller/console/ShopController.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java
index 6dba6d8..0c2d32d 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java
@@ -1,6 +1,7 @@
package com.ruoyi.shop.controller.console;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
@@ -14,6 +15,7 @@
import com.ruoyi.shop.service.task.ShopTaskService;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.*;
+import com.ruoyi.system.api.domain.poji.config.OneClinkSyncing;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.poji.sys.SysUser;
import com.ruoyi.system.api.domain.vo.*;
@@ -445,4 +447,32 @@
public List<Shop> getShopBySysUserIds(@RequestBody BoardMemberTotalDto boardMemberTotalDto){
return shopService.getShopBySysUserIds(boardMemberTotalDto.getUserIds());
}
+
+ /**
+ * 根据经销商id查询加盟商ids
+ * @param shopId
+ * @return
+ */
+ @PostMapping("/getFranchiseeIdsBYDealerId")
+ List<Shop> getFranchiseeIdsBYDealerId(@RequestBody Long shopId){
+ return shopService.getFranchiseeIdsBYDealerId(shopId);
+ }
+
+ /**
+ * 根据shopIds分页查看
+ * @param dto
+ * @return
+ */
+ @PostMapping("/getMgtShopPageVoByShopIds")
+ Page<MgtOneClinkSyncingShopPageVo> getMgtShopPageVoByShopIds(@RequestBody MGtOneClinkSyncingShopPageDTO dto){
+ return shopService.getMgtShopPageVoByShopIds(dto);
+ }
+
+ /**
+ * 一键同步商户信息
+ */
+ @PostMapping("/updateShopByOneClinkSyncing")
+ R updateShopByOneClinkSyncing(@RequestBody OneClinkSyncing oneClinkSyncing){
+ return shopService.updateShopByOneClinkSyncing(oneClinkSyncing);
+ }
}
--
Gitblit v1.7.1