From 904812187f2fb4eafc9071458f3a91d3f7b7748a Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期日, 28 九月 2025 11:35:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into send_coupon
---
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java
index 73325fb..74dfde6 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java
@@ -116,10 +116,10 @@
@Override
@CacheEvict(key = "#memberId")
@Transactional(rollbackFor = Exception.class)
- public void receiveCoupon(String couponId, String memberId, String memberName) {
+ public MemberCoupon receiveCoupon(String couponId, String memberId, String memberName) {
Coupon coupon = couponService.getById(couponId);
if (coupon != null) {
- this.receiverCoupon(couponId, memberId, memberName, coupon);
+ return this.receiverCoupon(couponId, memberId, memberName, coupon);
} else {
throw new ServiceException(ResultCode.COUPON_NOT_EXIST);
}
@@ -491,7 +491,7 @@
return this.update(updateWrapper);
}
- private void receiverCoupon(String couponId, String memberId, String memberName, Coupon coupon) {
+ private MemberCoupon receiverCoupon(String couponId, String memberId, String memberName, Coupon coupon) {
this.checkCouponLimit(couponId, memberId);
MemberCoupon memberCoupon = new MemberCoupon(coupon);
memberCoupon.setMemberId(memberId);
@@ -500,5 +500,6 @@
memberCoupon.setPlatformFlag((PromotionTools.PLATFORM_ID).equals(coupon.getStoreId()));
this.save(memberCoupon);
couponService.receiveCoupon(couponId, 1);
+ return memberCoupon;
}
}
\ No newline at end of file
--
Gitblit v1.8.0