From bfb5cdc6634e08f0b99646aa3d0a117246476a3d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 21 五月 2024 19:39:13 +0800
Subject: [PATCH] 解决冲突
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java
index 8721568..af97846 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/OrderFallbackFactory.java
@@ -1,14 +1,7 @@
package com.ruoyi.system.api.factory;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.PromotionVideo;
-import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO;
-import com.ruoyi.system.api.domain.dto.OrderDTO;
import com.ruoyi.system.api.feignClient.OrderClient;
-import com.ruoyi.system.api.feignClient.PromotionClient;
import org.springframework.cloud.openfeign.FallbackFactory;
-
-import java.util.List;
/**
* @author mitao
@@ -30,6 +23,11 @@
public R<Boolean> getOrderAuctionBond(OrderAuctionBondDTO orderAuctionBondDTO) {
return R.fail("通过视频集合查询用户失败:" + cause.getMessage());
}
+ @Override
+ public R<Integer> getSeckillMembers(Long id) {
+ return R.fail("获取秒杀商品已购会员数失败:" + cause.getMessage());
+ }
};
+
}
}
--
Gitblit v1.7.1