From 0b956579c125f41f27d1e09ecae5853926ef19fe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 三月 2024 15:48:57 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCouponFallbackFactory.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 ea2c7dd..15b0547 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
@@ -3,6 +3,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.dto.MerVerifyMemberCouponDto;
import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
import com.ruoyi.system.api.domain.vo.MerVerifyCouponGetVo;
import com.ruoyi.system.api.service.RemoteCouponService;
@@ -37,7 +38,7 @@
}
@Override
- public R<MerVerifyCouponGetVo> getVerifyCoupon(String verifyCoupon) {
+ public R<MerVerifyCouponGetVo> getVerifyCoupon(Long verifyCoupon) {
return R.fail("获取核销优惠券失败:" + throwable.getMessage());
}
@@ -61,7 +62,10 @@
return R.fail("回退优惠券失败" + throwable.getMessage());
}
-
+ @Override
+ public R sureMemberCoupon(MerVerifyMemberCouponDto merVerifyMemberCouponDto) {
+ return R.fail("确认核销优惠券失败" + throwable.getMessage());
+ }
};
}
--
Gitblit v1.7.1