From 274673c7c81c639c1edb038281445f076c824dc1 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期二, 18 三月 2025 09:08:17 +0800
Subject: [PATCH] 迭代版本:2.28

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/OrderClient.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/OrderClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/OrderClient.java
index aad932d..2aeda43 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/OrderClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/OrderClient.java
@@ -5,7 +5,9 @@
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.order.factory.OrderClientFallbackFactory;
 import com.ruoyi.order.model.Order;
+import com.ruoyi.order.vo.OrderSaleNum;
 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;
@@ -40,6 +42,9 @@
     @PostMapping("/order/getShopSaleNum")
     R<Integer> getShopSaleNum(@RequestParam("shopId") Integer shopId, @RequestParam("type") Integer type);
 
+    @PostMapping("/order/getShopSaleNumByShopIds")
+    R<Integer> getShopSaleNumByShopIds(@RequestBody OrderSaleNum orderSaleNum);
+
 
     /**
      * 获取所有在指定门店消费的用户id
@@ -48,6 +53,14 @@
      */
     @PostMapping("/order/getAppUserByShoppingShop")
     R<Set<Long>> getAppUserByShoppingShop(@RequestParam("shopId") Integer shopId);
+
+    /**
+     * 获取指定门店的核销订单
+     */
+    @GetMapping("/order/getRedeemedOrdersByShop")
+    R<List<Order>> getRedeemedOrdersByShop(@RequestParam("shopId") Integer shopId);
+
+
 
 
     /**
@@ -66,8 +79,8 @@
      */
     @PostMapping("/order/editOrder")
     R editOrder(@RequestBody Order order);
-    
-    
+
+
     /**
      * 获取用户订单数量
      * @param appUserId

--
Gitblit v1.7.1