From 17efd8f0d5008e2f0958df31042ed769776074d9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 15 一月 2025 15:57:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/UserCouponClientFallbackFactory.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/UserCouponClientFallbackFactory.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/UserCouponClientFallbackFactory.java
index 2e8b2dc..977d931 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/UserCouponClientFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/UserCouponClientFallbackFactory.java
@@ -1,8 +1,10 @@
package com.ruoyi.account.api.factory;
import com.ruoyi.account.api.feignClient.UserCouponClient;
+import com.ruoyi.account.api.model.UserCoupon;
import com.ruoyi.account.api.vo.CouponInfoVo;
import com.ruoyi.account.api.vo.PaymentUserCoupon;
+import com.ruoyi.account.api.vo.PaymentUserCouponVo;
import com.ruoyi.common.core.domain.R;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -18,9 +20,34 @@
return new UserCouponClient() {
@Override
- public R<List<CouponInfoVo>> getPaymentUserCoupon(PaymentUserCoupon paymentUserCoupon) {
+ public R<List<PaymentUserCouponVo>> getPaymentUserCoupon(PaymentUserCoupon paymentUserCoupon) {
return R.fail("根据id获取优惠券数据失败：" + cause.getMessage());
}
+
+ @Override
+ public R<CouponInfoVo> getCouponInfo(Long userCouponId) {
+ return R.fail("根据用户优惠券id获取优惠券详情失败：" + cause.getMessage());
+ }
+
+ @Override
+ public R<Long> getCouponCount(Integer couponId) {
+ return R.fail("根据优惠券id获取优惠券数量失败：" + cause.getMessage());
+ }
+
+ @Override
+ public R<UserCoupon> getUserCoupon(Long id) {
+ return R.fail("获取用户优惠券失败：" + cause.getMessage());
+ }
+
+ @Override
+ public R editUserCoupon(UserCoupon userCoupon) {
+ return R.fail("编辑用户优惠券失败：" + cause.getMessage());
+ }
+
+ @Override
+ public R editReturnUse(UserCoupon userCoupon) {
+ return R.fail("编辑用户优惠券使用时间失败：" + cause.getMessage());
+ }
};
}
}
--
Gitblit v1.7.1