From 8da101629c47cec91d68f785b0f5e829d4a9bab1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 24 一月 2024 15:18:46 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 1.1
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java
index 9672a85..60cce7b 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java
@@ -4,7 +4,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.poji.shop.Shop;
-import com.ruoyi.system.api.domain.poji.shop.ShopProportionVo;
+import com.ruoyi.system.api.domain.vo.ShopProportionVo;
import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.factory.RemoteShopFallbackFactory;
import com.ruoyi.system.api.model.QwH5LoginVo;
@@ -23,6 +23,12 @@
@PostMapping("/shop/getShopSubMchId")
public R<String> getShopSubMchId(@RequestBody Long shopId);
+
+ @PostMapping("/shop/getShopIdsByUserIds")
+ public R<List<Long>> getShopIdsByUserIds(@RequestBody List<Long> userIds);
+
+ @PostMapping("/shop/getShopHFTXSubMchId")
+ public R<ShopAuthenticationHftxVo> getShopHFTXSubMchId(@RequestBody Long shopId);
@PostMapping("/shop/getShopByUserId")
@@ -79,7 +85,7 @@
* @date 2023/6/18 16:45
*/
@PostMapping("/shop/boardShopTotal")
- public R<MgtBulletinBoardVo> boardShopTotal();
+ public R<MgtBulletinBoardVo> boardShopTotal(@RequestBody List<Long> userIds);
/**
* @description 获取平台统计shopId
@@ -175,4 +181,31 @@
*/
@PostMapping("/shop/getTaskMsgList")
R<List<MgtUserTaskMsgVo>> getTaskMsgList();
+
+
+ /**
+ * 根据城市code获取店铺
+ * @param cityCodes
+ * @return
+ */
+ @PostMapping("/shop/listShopByCityCode")
+ R<List<Shop>> listShopByCityCode(@RequestBody List<String> cityCodes);
+
+
+ /**
+ * 根据ids获取店铺
+ * @param ids
+ * @return
+ */
+ @PostMapping("/shop/listShopByIds")
+ R<List<Shop>> listShopByIds(@RequestBody List<String> ids);
+
+
+ /**
+ * 根据员工id获取关联到门店
+ * @param userIds
+ * @return
+ */
+ @PostMapping("/shop/getShopBySysUserIds")
+ List<Shop> getShopBySysUserIds(@RequestBody List<Long> userIds);
}
--
Gitblit v1.7.1