From 79e82d188a24ad92395ac4b39c1a49266a647c3f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 04 十二月 2024 15:44:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/feignClient/RemoteOrderGoodsClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java
similarity index 65%
rename from ruoyi-api/ruoyi-api-order/src/main/java/feignClient/RemoteOrderGoodsClient.java
rename to ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java
index 95afd49..2a5b441 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/feignClient/RemoteOrderGoodsClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/feignClient/RemoteOrderGoodsClient.java
@@ -1,10 +1,11 @@
-package feignClient;
+package com.ruoyi.order.feignClient;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
-import factory.RemoteOrderGoodsFallbackFactory;
-import model.OrderGood;
+import com.ruoyi.order.factory.RemoteOrderGoodsFallbackFactory;
+import com.ruoyi.order.model.Order;
+import com.ruoyi.order.model.OrderGood;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -19,4 +20,10 @@
*/
@PostMapping("/order-good/selectGoodsOrder")
public R<List<OrderGood>> goodsOrder(@RequestBody List<Long> goodsIds);
+
+ /**
+ * 根据ids查找订单列表
+ */
+ @PostMapping("/order/getOrderListByIds")
+ public R<List<Order>> getOrderListByIds(@RequestBody List<Long> orderIds);
}
--
Gitblit v1.7.1