From 56f732ed7af0e82f32f809ff0797fd0b83b62306 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 05 十二月 2024 14:53:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/factory/RemoteOrderGoodsFallbackFactory.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java
similarity index 77%
rename from ruoyi-api/ruoyi-api-order/src/main/java/factory/RemoteOrderGoodsFallbackFactory.java
rename to ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java
index c18ea13..cb7c62f 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/factory/RemoteOrderGoodsFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/factory/RemoteOrderGoodsFallbackFactory.java
@@ -1,9 +1,10 @@
-package factory;
+package com.ruoyi.order.factory;
 
 import com.ruoyi.common.core.domain.R;
-import feignClient.RemoteOrderGoodsClient;
+import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
 import lombok.extern.slf4j.Slf4j;
-import model.Order;
+import com.ruoyi.order.model.Order;
+import com.ruoyi.order.model.OrderGood;
 import org.springframework.cloud.openfeign.FallbackFactory;
 
 import java.util.List;
@@ -14,7 +15,7 @@
     public RemoteOrderGoodsClient create(Throwable cause) {
         return new RemoteOrderGoodsClient(){
             @Override
-            public R<List<Order>> goodsOrder(List<Long> goodsIds) {
+            public R<List<OrderGood>> goodsOrder(List<Long> goodsIds) {
                 log.error("获取订单商品失败:{}", cause.getMessage());
                 throw new RuntimeException("获取订单商品失败");
             }

--
Gitblit v1.7.1