caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!347 fix & improve

Browse Source 
Merge pull request !347 from OceansDeep/pg
This commit is contained in:
OceansDeep 2024-06-14 01:55:33 +00:00 committed by Gitee
commit 22ecf48168
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java
View File

@ -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());