diff --git a/src/main/java/com/ycwl/basic/pricing/dto/CouponClaimResult.java b/src/main/java/com/ycwl/basic/pricing/dto/CouponClaimResult.java index d9173ede..b36c51b7 100644 --- a/src/main/java/com/ycwl/basic/pricing/dto/CouponClaimResult.java +++ b/src/main/java/com/ycwl/basic/pricing/dto/CouponClaimResult.java @@ -1,6 +1,7 @@ package com.ycwl.basic.pricing.dto; import com.ycwl.basic.pricing.entity.PriceCouponClaimRecord; +import com.ycwl.basic.pricing.entity.PriceCouponConfig; import lombok.Data; import java.util.Date; @@ -55,16 +56,18 @@ public class CouponClaimResult { * 景区ID */ private String scenicId; - + private PriceCouponConfig coupon; + /** * 创建成功结果 */ - public static CouponClaimResult success(PriceCouponClaimRecord record, String couponName) { + public static CouponClaimResult success(PriceCouponClaimRecord record, PriceCouponConfig coupon) { CouponClaimResult result = new CouponClaimResult(); + result.coupon = coupon; result.success = true; result.claimRecordId = record.getId(); result.couponId = record.getCouponId(); - result.couponName = couponName; + result.couponName = coupon.getCouponName(); result.claimTime = record.getClaimTime(); result.userId = record.getUserId(); result.scenicId = record.getScenicId(); diff --git a/src/main/java/com/ycwl/basic/pricing/service/impl/CouponServiceImpl.java b/src/main/java/com/ycwl/basic/pricing/service/impl/CouponServiceImpl.java index 72350769..6b2de38d 100644 --- a/src/main/java/com/ycwl/basic/pricing/service/impl/CouponServiceImpl.java +++ b/src/main/java/com/ycwl/basic/pricing/service/impl/CouponServiceImpl.java @@ -274,7 +274,7 @@ public class CouponServiceImpl implements ICouponService { request.getUserId(), request.getCouponId(), claimRecord.getId()); // 10. 返回成功结果 - return CouponClaimResult.success(claimRecord, coupon.getCouponName()); + return CouponClaimResult.success(claimRecord, coupon); } catch (Exception e) { log.error("领取优惠券失败: userId={}, couponId={}",