From b4b44f2021dbf083b7057fb7e192b72d08b4bf17 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 十月 2024 09:23:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppCouponFallbackFactory.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppCouponFallbackFactory.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppCouponFallbackFactory.java
index cec1394..9d3b023 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppCouponFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppCouponFallbackFactory.java
@@ -1,7 +1,9 @@
package com.ruoyi.account.api.factory;
+import com.ruoyi.account.api.dto.GrantCouponDto;
import com.ruoyi.account.api.feignClient.AppCouponClient;
import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.model.TAppCoupon;
import com.ruoyi.account.api.query.ExchangeRecordGoodsQuery;
import com.ruoyi.account.api.vo.ExchangeRecordVO;
import com.ruoyi.common.core.domain.R;
@@ -39,9 +41,24 @@
}
@Override
- public R<PageInfo<ExchangeRecordVO>> getExchangeRecordByCouponId(ExchangeRecordGoodsQuery couponId) {
+ public R<List<ExchangeRecordVO>> getExchangeRecordByCouponId(ExchangeRecordGoodsQuery couponId) {
return R.fail("根据优惠券id查询领取记录:"+throwable.getMessage());
}
+
+ @Override
+ public R grantCoupon(GrantCouponDto dto) {
+ return R.fail("给用户发放优惠券:"+throwable.getMessage());
+ }
+
+ @Override
+ public R refund(String id) {
+ return R.fail("后台退款 退回优惠券失败:"+throwable.getMessage());
+ }
+
+ @Override
+ public R<TAppCoupon> getAppCouponById(Long id) {
+ return R.fail("根据id获取优惠券领取记录失败：" + throwable.getMessage());
+ }
};
}
}
--
Gitblit v1.7.1