From 7085ba24d8decee4b13c86a55b93a3bcc4ea0d03 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 23 八月 2024 09:27:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/OtherFallbackFactory.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/OtherFallbackFactory.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/OtherFallbackFactory.java
index 4d8eb24..044ac01 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/OtherFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/factory/OtherFallbackFactory.java
@@ -1,12 +1,14 @@
package com.ruoyi.other.api.factory;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.account.api.dto.TagListQueryDto;
-import com.ruoyi.account.api.dto.UnitListQueryDto;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.TCompany;
+import com.ruoyi.other.api.domain.TCoupon;
import com.ruoyi.other.api.domain.TUserTag;
+import com.ruoyi.other.api.dto.TagListQueryDto;
+import com.ruoyi.other.api.dto.UnitListQueryDto;
import com.ruoyi.other.api.feignClient.OtherClient;
+import com.ruoyi.other.api.vo.CouponListVOVO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
@@ -27,7 +29,7 @@
@Override
public OtherClient create(Throwable throwable) {
- log.error("商品调用失败:{}", throwable.getMessage());
+ log.error("单位用失败:{}", throwable.getMessage());
return new OtherClient() {
@Override
@@ -79,6 +81,16 @@
public R<Map<Integer, String>> getVipMap(List<Integer> ids) {
return R.fail("获取会员map:" + throwable.getMessage());
}
+
+ @Override
+ public R<List<CouponListVOVO>> getCouponInfoByCouponIds(List<CouponListVOVO> list) {
+ return R.fail("我的优惠券列表获取信息:"+throwable.getMessage());
+ }
+
+ @Override
+ public R<TCoupon> getCouponById(Integer id) {
+ return R.fail("查询优惠卷:"+throwable.getMessage());
+ }
};
}
}
--
Gitblit v1.7.1