From 132b50b690dde85c616448840cc505056de708b4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 20:07:24 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/ShopClient.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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..eef39bd 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;
@@ -42,8 +43,18 @@
R<Shop> getShopByPhone(@RequestParam("phone") String phone);
@PostMapping("/getShopByUserIds")
- public R<List<Shop>> getShopByUserIds(@RequestBody List<Long> userIds);
+ R<List<Shop>> getShopByUserIds(@RequestBody List<Long> userIds);
@GetMapping("/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