From bcd4bf4ff14672fd4bd2cad9e8221f74b0b2493f Mon Sep 17 00:00:00 2001 From: Chopper711 Date: Wed, 12 Jun 2024 18:07:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E9=A2=86=E5=8F=96?= =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E6=97=B6=EF=BC=8C=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E7=B2=BE=E5=87=86=E8=B5=A0=E9=80=81=E7=9A=84?= =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/promotion/CouponBuyerController.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) 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