From a966dafb8877552267a94fe8c544c5ea72cf5650 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 16 六月 2025 09:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCouponFallbackFactory.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 a05ecb1..e120368 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,8 @@
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;
@@ -31,12 +33,12 @@
@Override
- public R<List<AppMemberCouponVo>> listVoMemberCouponByUserId(Long userId) {
+ public R<List<AppMemberCouponVo>> listVoMemberCouponByUserId(MerBaseDto merBaseDto) {
return R.fail("获取优惠券列表失败:" + throwable.getMessage());
}
@Override
- public R<MerVerifyCouponGetVo> getVerifyCoupon(String verifyCoupon) {
+ public R<MerVerifyCouponGetVo> getVerifyCoupon(Long verifyCoupon) {
return R.fail("获取核销优惠券失败:" + throwable.getMessage());
}
@@ -54,13 +56,21 @@
public R useMemberCoupon(String memberCouponIds) {
return R.fail("使用优惠券失败" + throwable.getMessage());
}
-
+
@Override
public R backMemberCoupon(String memberCouponIds) {
return R.fail("回退优惠券失败" + throwable.getMessage());
}
-
-
+
+ @Override
+ public R sureMemberCoupon(MerVerifyMemberCouponDto merVerifyMemberCouponDto) {
+ return R.fail("确认核销优惠券失败" + throwable.getMessage());
+ }
+
+ @Override
+ public R addMemberCoupon(String couponId, Integer number, Long userId) {
+ return R.fail("手动添加用户优惠券失败：" + throwable.getMessage());
+ }
};
}
--
Gitblit v1.7.1