From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/CouponFallbackFactory.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/CouponFallbackFactory.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/CouponFallbackFactory.java
index f5821e7..71f33d3 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/CouponFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/CouponFallbackFactory.java
@@ -2,13 +2,13 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.TCoupon;
-import com.ruoyi.other.api.domain.TGoods;
import com.ruoyi.other.api.feignClient.CouponClient;
-import com.ruoyi.other.api.feignClient.GoodsClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
+
+import java.util.List;
/**
* @author zhibing.pu
@@ -25,9 +25,19 @@
return new CouponClient() {
@Override
- public R<TCoupon> getCouponById(Integer id) {
+ public R<TCoupon> getCouponById1(Integer id) {
return R.fail("根据id获取优惠券信息失败：" + throwable.getMessage());
}
+
+ @Override
+ public R<List<Integer>> getCouponIdsByName(String name) {
+ return R.fail("根据名称查询优惠券ids：" + throwable.getMessage());
+ }
+
+ @Override
+ public R updateCoupon(TCoupon coupon) {
+ return R.fail("修改优惠券失败");
+ }
};
}
--
Gitblit v1.7.1