From 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 12:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCouponFallbackFactory.java |   24 +++++++++++++++++++++++-
 1 files changed, 23 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 70b3465..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
@@ -1,6 +1,8 @@
 package com.ruoyi.system.api.factory;
 
 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;
@@ -30,7 +32,7 @@
 
 
             @Override
-            public R<List<AppMemberCouponVo>> listVoMemberCouponByUserId(Long userId) {
+            public R<List<AppMemberCouponVo>> listVoMemberCouponByUserId(MerBaseDto merBaseDto) {
                 return R.fail("获取优惠券列表失败:" + throwable.getMessage());
             }
 
@@ -39,6 +41,26 @@
                 return R.fail("获取核销优惠券失败:" + throwable.getMessage());
             }
 
+            @Override
+            public R sendCouponGift(List<BirthdayGiftSendDto> giftSendDtoList) {
+                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