From 89422b2736f54353a31c8d5b68f663686daf7700 Mon Sep 17 00:00:00 2001
From: misworga831 <paulgao0831@gmail.com>
Date: Fri, 14 Jun 2024 09:54:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E5=8A=A8=E9=A2=86=E5=8F=96?=
 =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E5=88=A4=E5=AE=9A=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=B0=86=E7=B2=BE=E5=87=86=E5=8F=91=E5=88=B8=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=90=8C=E6=97=B6=E5=88=A4=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/CouponActivityServiceImpl.java        | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java
index b49b6be03..385cb38e0 100644
--- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java
@@ -231,11 +231,20 @@ public class CouponActivityServiceImpl extends AbstractPromotionsServiceImpl<Cou
             couponActivities = memberCouponSignService.receiveCoupon(couponActivities);
         }
 
+        /**
+         * 自动领取优惠券判定同时，将精准发券功能同时判定
+         */
+        if (couponActivityTrigger.getCouponActivityTypeEnum().equals(CouponActivityTypeEnum.SPECIFY)) {
+
+            couponActivities.addAll(memberCouponSignService.receiveCoupon(currentCouponActivity(CouponActivityTypeEnum.SPECIFY.name())));
+        }
+
+
         //优惠券发放列表
         List<CouponActivityItemVO> couponActivityItemVOS = new ArrayList<>();
 
         //准备发放优惠券活动的列表
-        couponActivities.stream().forEach(item -> couponActivityItemVOS.addAll(item.getCouponActivityItems()));
+        couponActivities.forEach(item -> couponActivityItemVOS.addAll(item.getCouponActivityItems()));
 
         AuthUser authUser = new AuthUser();
         authUser.setId(couponActivityTrigger.getUserId());