From beeda8df0023376dbb2021148a021731dc4aedb0 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 06 八月 2023 11:29:10 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteShopService.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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 9891828..f849c0f 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,6 +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.*;
import com.ruoyi.system.api.factory.RemoteShopFallbackFactory;
import com.ruoyi.system.api.model.QwH5LoginVo;
@@ -19,6 +20,10 @@
@PostMapping("/shop/getShop")
public R<Shop> getShop(@RequestBody Long shopId);
+
+ @PostMapping("/shop/getShopSubMchId")
+ public R<String> getShopSubMchId(@RequestBody Long shopId);
+
@PostMapping("/shop/getShopByUserId")
public R<ShopRelUserVo> getShopByUserId(@RequestBody Long userId);
@@ -149,4 +154,12 @@
*/
@PostMapping("/shop/editMgtShopStaff")
public R editMgtShopStaff(@RequestBody MgtShopStaffEditDto mgtShopStaffEditDto);
+
+ /**
+ * 获取商户分成
+ * @param shopId
+ * @return
+ */
+ @PostMapping("/shop/getShopProportion")
+ R<ShopProportionVo> getShopProportion(@RequestBody Long shopId);
}
--
Gitblit v1.7.1