From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/PromotionFallbackFactory.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/PromotionFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/PromotionFallbackFactory.java
index 095a45d..142e401 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/PromotionFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/PromotionFallbackFactory.java
@@ -1,17 +1,12 @@
package com.ruoyi.system.api.factory;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.system.api.domain.GoodsSku;
+import com.ruoyi.system.api.domain.CouponMember;
import com.ruoyi.system.api.domain.PromotionVideo;
-import com.ruoyi.system.api.domain.SysUser;
-import com.ruoyi.system.api.feignClient.GoodsSkuClient;
+import com.ruoyi.system.api.domain.dto.CouponMemberDTO;
import com.ruoyi.system.api.feignClient.PromotionClient;
-import com.ruoyi.system.api.model.CompanySysUserReq;
-import com.ruoyi.system.api.model.CompanyUserListVo;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.web.bind.annotation.PathVariable;
-
import java.util.List;
+import org.springframework.cloud.openfeign.FallbackFactory;
/**
* @author mitao
@@ -23,14 +18,23 @@
public PromotionClient create(Throwable cause) {
return new PromotionClient(){
@Override
- public R<List<PromotionVideo>> getPromotionVideoList() {
+ public R<List<PromotionVideo>> getPromotionVideoList(String source) {
return R.fail("通过视频集合查询用户失败:" + cause.getMessage());
}
@Override
- public R<PromotionVideo> getPromotionVideoOne(Integer promotionVideoId) {
+ public R<PromotionVideo> getPromotionVideoOne(Long promotionVideoId, String source) {
return R.fail("获取视频信息失败:" + cause.getMessage());
}
+ @Override
+ public R<CouponMember> getCouponMember(CouponMemberDTO couponMemberDTO, String source) {
+ return R.fail("获取会员优惠券信息失败:" + cause.getMessage());
+ }
+
+ @Override
+ public R<?> updCouponMember(CouponMemberDTO couponMemberDTO, String source) {
+ return R.fail("修改会员优惠券信息失败:" + cause.getMessage());
+ }
};
--
Gitblit v1.7.1