From f615ec5c9239327740948501627545f8e78e2a9e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 18 三月 2025 09:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/OrderClient.java | 13 +++++++++++--
1 files changed, 11 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 b6bcfa4..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
@@ -7,6 +7,7 @@
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;
@@ -53,6 +54,14 @@
@PostMapping("/order/getAppUserByShoppingShop")
R<Set<Long>> getAppUserByShoppingShop(@RequestParam("shopId") Integer shopId);
+ /**
+ * 获取指定门店的核销订单
+ */
+ @GetMapping("/order/getRedeemedOrdersByShop")
+ R<List<Order>> getRedeemedOrdersByShop(@RequestParam("shopId") Integer shopId);
+
+
+
/**
* 根据id获取订单详情
@@ -70,8 +79,8 @@
*/
@PostMapping("/order/editOrder")
R editOrder(@RequestBody Order order);
-
-
+
+
/**
* 获取用户订单数量
* @param appUserId
--
Gitblit v1.7.1