From cbad982befcf58521b224da1e8898c23c5e0d2c6 Mon Sep 17 00:00:00 2001 From: huliguo <2023611923@qq.com> Date: 星期四, 29 五月 2025 16:49:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev --- ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/factory/AppCouponFallbackFactory.java | 37 ++++++++++++++++++++++++++++++++++++- 1 files changed, 36 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 46d130d..b807425 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,8 +1,13 @@ 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; +import com.ruoyi.common.core.web.page.PageInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; @@ -27,7 +32,37 @@ @Override public R<List<Integer>> getCountByCouponIds(String couponIds) { - return null; + return R.fail("获取数据失败:" + throwable.getMessage()); + } + + @Override + public R<Integer> getUseCountByCouponId(Integer couponId) { + return R.fail("获取数据失败:" + throwable.getMessage()); + } + + @Override + 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()); + } + + @Override + public R updateAppCoupon(TAppCoupon appCoupon) { + return R.fail("修改用户优惠券失败:" + throwable.getMessage()); } }; } -- Gitblit v1.7.1