Merge branch 'sit' of http://8.152.195.41:3000/alien/alien_cloud into store-plantform

alien-store/src/main/java/shop/alien/store/service/impl/ActivityInviteConfigServiceImpl.java

@@ -19,6 +19,7 @@ import shop.alien.mapper.ActivityInviteConfigMapper;
 import shop.alien.mapper.ActivityInviteLogMapper;
 import shop.alien.mapper.LifeUserMapper;
 import shop.alien.store.service.ActivityInviteConfigService;
+import shop.alien.store.service.LifeDiscountCouponService;
 import shop.alien.store.service.UserPointService;
 import shop.alien.util.common.RandomCreateUtil;
 
@@ -26,6 +27,7 @@ import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -42,6 +44,8 @@ public class ActivityInviteConfigServiceImpl extends ServiceImpl<ActivityInviteC
 
    private final ActivityInviteLogMapper activityInviteLogMapper;
 
+   private final LifeDiscountCouponService lifeDiscountCouponService;
+
     @Override
     public ActivityInviteConfigVo createOrUpdateInviteActivity(ActivityInviteConfigVo activityInviteConfigVo) {
 
@@ -283,9 +287,13 @@ public class ActivityInviteConfigServiceImpl extends ServiceImpl<ActivityInviteC
 
                    if(activityInviteConfig.getInviteRewardType() == 2){
                        userPointService.addPoint(inviteUserId, activityInviteConfig.getInviteRewardPoint());
+                   } else if(activityInviteConfig.getInviteRewardType() == 1 && activityInviteConfig.getInviteRewardCoupon() > 0){
+                       lifeDiscountCouponService.issuePlatformCoupon(Collections.singletonList(inviteUserId), activityInviteConfig.getInviteRewardCoupon());
                    }
                    if(activityInviteConfig.getInvitedRewardType() == 2){
                        userPointService.addPoint(invitedUserId, activityInviteConfig.getInvitedRewardPoint());
+                   } else if (activityInviteConfig.getInvitedRewardType() == 1 && activityInviteConfig.getInvitedRewardCoupon() > 0) {
+                       lifeDiscountCouponService.issuePlatformCoupon(Collections.singletonList(invitedUserId), activityInviteConfig.getInvitedRewardCoupon());
                    }
 
                    LifeUser updateLifeUser = new LifeUser();

alien-store/src/main/java/shop/alien/store/service/impl/LifeDiscountCouponServiceImpl.java

@@ -1128,6 +1128,10 @@ public class LifeDiscountCouponServiceImpl extends ServiceImpl<LifeDiscountCoupo
     @Override
     public boolean issuePlatformCoupon(List<Integer> userIds, Integer couponId) {
         LifeDiscountCoupon lifeDiscountCoupon = this.getById(couponId);
+        if(lifeDiscountCoupon == null){
+            //如果优惠券为空，则返回失败
+            return false;
+        }
         List<LifeDiscountCouponUser> lifeDiscountCouponUsers = new ArrayList<>();
         for (Integer userId : userIds) {
             LifeDiscountCouponUser lifeDiscountCouponUser = new LifeDiscountCouponUser();