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/OtherFallbackFactory.java | 36 ++++++++++++++++++++++++++++++++---- 1 files changed, 32 insertions(+), 4 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 cfb52c2..a1e3ea3 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,15 @@ 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.TEnterpriseUserApplication; 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,8 +30,13 @@ @Override public OtherClient create(Throwable throwable) { - log.error("商品调用失败:{}", throwable.getMessage()); + log.error("单位用失败:{}", throwable.getMessage()); return new OtherClient() { + + @Override + public R<Integer> getAddCarIntegral() { + return R.fail("查询首次添加车辆可获积分:" + throwable.getMessage()); + } @Override public R<Page<TCompany>> queryUnitPage(UnitListQueryDto unitListQueryDto) { @@ -44,7 +52,12 @@ public R unitDelete(Integer id) { return R.fail("删除单位失败:" + throwable.getMessage()); } - + + @Override + public R<TCompany> unitDetail(Integer id) { + return R.fail("查询单位失败:" + throwable.getMessage()); + } + @Override public R<Page<TUserTag>> queryTagPage(TagListQueryDto unitListQueryDto) { return R.fail("查询标签:" + throwable.getMessage()); @@ -74,6 +87,21 @@ 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()); + } + + @Override + public R<List<TEnterpriseUserApplication>> getTnterPrise() { + return R.fail("查询:"+throwable.getMessage()); + } }; } } -- Gitblit v1.7.1