From beeda8df0023376dbb2021148a021731dc4aedb0 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 06 八月 2023 11:29:10 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCouponFallbackFactory.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCouponFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCouponFallbackFactory.java
index 2faa3d3..ea2c7dd 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCouponFallbackFactory.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCouponFallbackFactory.java
@@ -2,6 +2,7 @@
 
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.system.api.domain.dto.BirthdayGiftSendDto;
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
 import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
 import com.ruoyi.system.api.domain.vo.MerVerifyCouponGetVo;
 import com.ruoyi.system.api.service.RemoteCouponService;
@@ -31,7 +32,7 @@
 
 
             @Override
-            public R<List<AppMemberCouponVo>> listVoMemberCouponByUserId(Long userId) {
+            public R<List<AppMemberCouponVo>> listVoMemberCouponByUserId(MerBaseDto merBaseDto) {
                 return R.fail("获取优惠券列表失败:" + throwable.getMessage());
             }
 
@@ -45,6 +46,21 @@
                 return null;
             }
 
+            @Override
+            public R autoTimeSendCoupon(String couponId) {
+                return R.fail("定时发送"+couponId+"优惠券失败:" + throwable.getMessage());
+            }
+
+            @Override
+            public R useMemberCoupon(String memberCouponIds) {
+                return R.fail("使用优惠券失败" + throwable.getMessage());
+            }
+
+            @Override
+            public R backMemberCoupon(String memberCouponIds) {
+                return R.fail("回退优惠券失败" + throwable.getMessage());
+            }
+
 
         };
     }

--
Gitblit v1.7.1