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 | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 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 a49ac62..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
@@ -1,18 +1,27 @@
package com.ruoyi.other.api.feignClient;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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;
import org.springframework.web.bind.annotation.PostMapping;
+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;
/**
* @author zhibing.pu
* @Date 2024/11/29 10:28
*/
-@FeignClient(contextId = "ShopClient", value = ServiceNameConstants.ORDER_SERVICE, fallbackFactory = ShopClientFallbackFactory.class)
+@FeignClient(contextId = "ShopClient", value = ServiceNameConstants.OTHER_SERVICE, fallbackFactory = ShopClientFallbackFactory.class)
public interface ShopClient {
@@ -23,7 +32,9 @@
*/
@PostMapping("/shop/getShopById")
R<Shop> getShopById(@RequestParam("id") Integer id);
-
+
+ @PostMapping("/shop/getShopByUserId")
+ R<List<Shop>> getShopByUserId(@RequestParam("id") Long id);
/**
* 根据店铺管理员电话获取门店数据
@@ -32,4 +43,32 @@
*/
@PostMapping("/shop/getShopByPhone")
R<Shop> getShopByPhone(@RequestParam("phone") String phone);
+
+ @PostMapping("/shop/getShopByUserIds")
+ R<List<Shop>> getShopByUserIds(@RequestBody List<Long> userIds);
+
+ @PostMapping("/shop/getShopIdByName")
+ R<Set<Integer>> getShopIdByName(@RequestParam("shopName") String shopName);
+
+ @PostMapping("/shop-balance-statement/getList")
+ R<List<ShopBalanceStatement>> getShopBalanceStatementList(@RequestBody ShopBalanceStatement shopBalanceStatement);
+
+ /**
+ * 编辑门店
+ * @param shop
+ */
+ @PostMapping("/shop/updateShop")
+ void updateShop(Shop shop);
+
+
+ /**
+ * 获取所有门店
+ * @return
+ */
+ @PostMapping("/shop/getAllShop")
+ R<List<Shop>> getAllShop();
+
+
+ @GetMapping("/shop/getShopStatistics")
+ public R<Map<String, BigDecimal>> getShopStatistics();
}
--
Gitblit v1.7.1