From caf38fb12050d677052087f3391adcc64a6959c9 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 18:04:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/OrderClient.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 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 a70a745..603b525 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
@@ -4,8 +4,10 @@
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.order.factory.OrderClientFallbackFactory;
+import com.ruoyi.order.model.Order;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -46,4 +48,22 @@
*/
@PostMapping("/order/getAppUserByShoppingShop")
R<Set<Long>> getAppUserByShoppingShop(@RequestParam("shopId") Integer shopId);
+
+
+ /**
+ * 根据id获取订单详情
+ * @param id
+ * @return
+ */
+ @PostMapping("/order/getOrderById")
+ R<Order> getOrderById(@RequestParam("id") Long id);
+
+
+ /**
+ * 编辑订单详情
+ * @param order
+ * @return
+ */
+ @PostMapping("/order/editOrder")
+ R editOrder(@RequestBody Order order);
}
--
Gitblit v1.7.1