From 1730a7fc4bb96f258d9dc8dec2e629cadbfdefc0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 13:47:42 +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 | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 c115acf..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
@@ -38,7 +38,7 @@
}
@Override
- public R<MerVerifyCouponGetVo> getVerifyCoupon(String verifyCoupon) {
+ public R<MerVerifyCouponGetVo> getVerifyCoupon(Long verifyCoupon) {
return R.fail("获取核销优惠券失败:" + throwable.getMessage());
}
@@ -56,16 +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