diff --git a/buyer-api/src/main/java/cn/lili/controller/promotion/CouponBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/promotion/CouponBuyerController.java index 88574374..3fb6dae5 100644 --- a/buyer-api/src/main/java/cn/lili/controller/promotion/CouponBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/promotion/CouponBuyerController.java @@ -67,13 +67,19 @@ public class CouponBuyerController { if (UserContext.getCurrentUser() == null) { return ResultUtil.success(); } - return ResultUtil.data(couponActivityService.trigger( + List memberCouponList = couponActivityService.trigger( CouponActivityTrigger.builder() .couponActivityTypeEnum(CouponActivityTypeEnum.AUTO_COUPON) .nickName(UserContext.getCurrentUser().getNickName()) .userId(UserContext.getCurrentUser().getId()) - .build()) - ); + .build()); + memberCouponList.addAll(couponActivityService.trigger( + CouponActivityTrigger.builder() + .couponActivityTypeEnum(CouponActivityTypeEnum.SPECIFY) + .nickName(UserContext.getCurrentUser().getNickName()) + .userId(UserContext.getCurrentUser().getId()) + .build())); + return ResultUtil.data(memberCouponList); } @GetMapping