From c8ea2d96f5b0522a09f3203ae98fe796084d2d15 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 04 一月 2025 09:34:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java
index cf409f1..e86f791 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java
@@ -4,6 +4,7 @@
 import com.ruoyi.common.core.constant.ServiceNameConstants;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.other.api.domain.Shop;
+import com.ruoyi.other.api.domain.ShopBalanceStatement;
 import com.ruoyi.other.api.factory.ShopClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -41,9 +42,19 @@
 	@PostMapping("/shop/getShopByPhone")
 	R<Shop> getShopByPhone(@RequestParam("phone") String phone);
 
-	@PostMapping("/getShopByUserIds")
-	public R<List<Shop>> getShopByUserIds(@RequestBody List<Long> userIds);
+	@PostMapping("/shop/getShopByUserIds")
+	R<List<Shop>> getShopByUserIds(@RequestBody List<Long> userIds);
 
-	@GetMapping("/getShopIdByName")
+	@GetMapping("/shop/getShopIdByName")
     R<Set<Integer>> getShopIdByName(String shopName);
+
+	@PostMapping("/shop-balance-statement/getList")
+	R<List<ShopBalanceStatement>> getShopBalanceStatementList(@RequestBody ShopBalanceStatement shopBalanceStatement);
+	
+	/**
+	 * 编辑门店
+	 * @param shop
+	 */
+	@PostMapping("/shop/updateShop")
+	void updateShop(Shop shop);
 }

--
Gitblit v1.7.1