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/controller/console/ShopController.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 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 a1502ea..892640a 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,8 @@
package com.ruoyi.shop.controller.console;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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 +16,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.*;
@@ -451,8 +454,34 @@
* @param shopId
* @return
*/
- @PostMapping("/shop/getFranchiseeIdsBYDealerId")
+ @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);
+ }
+
+ /**
+ * 根据shopName模糊查询门店集合
+ */
+ @PostMapping("/getShopListByShopName")
+ List<Shop> getShopListByShopName(@RequestBody String content){
+ return shopService.getBaseMapper().selectList(new LambdaQueryWrapper<Shop>().like(Shop::getShopName, content));
+ }
}
--
Gitblit v1.7.1