From 1205db4e3dc20905a7e52aa05c2670f98cb51a38 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 14 一月 2025 15:19:38 +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 | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 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 b7841e6..e5a5a73 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 @@ -12,7 +12,9 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; +import java.math.BigDecimal; import java.util.List; +import java.util.Map; import java.util.Set; /** @@ -45,8 +47,8 @@ @PostMapping("/shop/getShopByUserIds") R<List<Shop>> getShopByUserIds(@RequestBody List<Long> userIds); - @GetMapping("/shop/getShopIdByName") - R<Set<Integer>> getShopIdByName(String shopName); + @PostMapping("/shop/getShopIdByName") + R<Set<Integer>> getShopIdByName(@RequestParam("shopName") String shopName); @PostMapping("/shop-balance-statement/getList") R<List<ShopBalanceStatement>> getShopBalanceStatementList(@RequestBody ShopBalanceStatement shopBalanceStatement); @@ -65,4 +67,8 @@ */ @PostMapping("/shop/getAllShop") R<List<Shop>> getAllShop(); + + + @GetMapping("/shop/getShopStatistics") + public R<Map<String, BigDecimal>> getShopStatistics(); } -- Gitblit v1.7.1