核销后发放好友店铺赠券

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

@@ -476,27 +476,27 @@ public class LifeDiscountCouponStoreFriendServiceImpl extends ServiceImpl<LifeDi
 //        }
         UserReservationOrder userReservationOrder = userReservationOrderMapper.selectById(lifeDiscountCouponStoreFriendDto.getOrderId());
 
-
-        //送券规则
-        List<Integer> couponList = new ArrayList<>();
-        LambdaQueryWrapper<LifeDiscountCouponFriendRule> ruleLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        ruleLambdaQueryWrapper.eq(LifeDiscountCouponFriendRule::getStoreId, userReservationOrder.getStoreId())
-                .eq(LifeDiscountCouponFriendRule::getDeleteFlag, 0);
-        List<LifeDiscountCouponFriendRule> lifeDiscountCouponFriendRules = lifeDiscountCouponFriendRuleMapper.selectList(ruleLambdaQueryWrapper);
-        lifeDiscountCouponFriendRules = lifeDiscountCouponFriendRules.stream().filter(i -> i.getMoneyLow().compareTo(userReservationOrder.getDepositAmount()) <= 0 && i.getMoneyHigh().compareTo(userReservationOrder.getDepositAmount()) >= 0).collect(Collectors.toList());
-        if (ObjectUtils.isNotEmpty(lifeDiscountCouponFriendRules)) {
-            LambdaQueryWrapper<LifeDiscountCouponFriendRuleDetail> detailLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            detailLambdaQueryWrapper.in(LifeDiscountCouponFriendRuleDetail::getRuleId, lifeDiscountCouponFriendRules.stream().map(LifeDiscountCouponFriendRule::getId).collect(Collectors.toList()));
-            List<LifeDiscountCouponFriendRuleDetail> lifeDiscountCouponFriendRuleDetails = lifeDiscountCouponFriendRuleDetailMapper.selectList(detailLambdaQueryWrapper);
-            couponList = lifeDiscountCouponFriendRuleDetails.stream().map(LifeDiscountCouponFriendRuleDetail::getCouponId).collect(Collectors.toList());
-        }
+//
+//        //送券规则
+//        List<Integer> couponList = new ArrayList<>();
+//        LambdaQueryWrapper<LifeDiscountCouponFriendRule> ruleLambdaQueryWrapper = new LambdaQueryWrapper<>();
+//        ruleLambdaQueryWrapper.eq(LifeDiscountCouponFriendRule::getStoreId, userReservationOrder.getStoreId())
+//                .eq(LifeDiscountCouponFriendRule::getDeleteFlag, 0);
+//        List<LifeDiscountCouponFriendRule> lifeDiscountCouponFriendRules = lifeDiscountCouponFriendRuleMapper.selectList(ruleLambdaQueryWrapper);
+//        lifeDiscountCouponFriendRules = lifeDiscountCouponFriendRules.stream().filter(i -> i.getMoneyLow().compareTo(userReservationOrder.getDepositAmount()) <= 0 && i.getMoneyHigh().compareTo(userReservationOrder.getDepositAmount()) >= 0).collect(Collectors.toList());
+//        if (ObjectUtils.isNotEmpty(lifeDiscountCouponFriendRules)) {
+//            LambdaQueryWrapper<LifeDiscountCouponFriendRuleDetail> detailLambdaQueryWrapper = new LambdaQueryWrapper<>();
+//            detailLambdaQueryWrapper.in(LifeDiscountCouponFriendRuleDetail::getRuleId, lifeDiscountCouponFriendRules.stream().map(LifeDiscountCouponFriendRule::getId).collect(Collectors.toList()));
+//            List<LifeDiscountCouponFriendRuleDetail> lifeDiscountCouponFriendRuleDetails = lifeDiscountCouponFriendRuleDetailMapper.selectList(detailLambdaQueryWrapper);
+//            couponList = lifeDiscountCouponFriendRuleDetails.stream().map(LifeDiscountCouponFriendRuleDetail::getCouponId).collect(Collectors.toList());
+//        }
 
 
 //        lifeUserOrder.setSendDiscountCouponFlag(1);
 //        lifeUserOrderMapper.updateById(lifeUserOrder);
 
         //有符合规则的优惠券
-        if (ObjectUtils.isNotEmpty(couponList) && !couponList.isEmpty()) {
+//        if (ObjectUtils.isNotEmpty(couponList) && !couponList.isEmpty()) {
             // 获取当前消费用户的ID
             int userId = Integer.parseInt(userReservationOrder.getUserId().toString());
             LifeUser lifeUser = lifeUserMapper.selectById(userId);
@@ -512,7 +512,8 @@ public class LifeDiscountCouponStoreFriendServiceImpl extends ServiceImpl<LifeDi
                     // 使用LambdaQueryWrapper构建查询条件，筛选出店铺ID等于指定店铺ID的优惠券记录,并且发布状态为已发布
                     new LambdaQueryWrapper<LifeDiscountCouponStoreFriend>().eq(LifeDiscountCouponStoreFriend::getStoreUserId, storeId)
                             .eq(LifeDiscountCouponStoreFriend::getReleaseType, 1)
-                            .in(LifeDiscountCouponStoreFriend::getCouponId, couponList));
+   //                         .in(LifeDiscountCouponStoreFriend::getCouponId, couponList)
+            );
 
             // 获取当前日期，用于后续判断优惠券是否在有效期内
             LocalDate currentDate = LocalDate.now();
@@ -608,7 +609,7 @@ public class LifeDiscountCouponStoreFriendServiceImpl extends ServiceImpl<LifeDi
                 lifeNoticeMapper.insert(lifeNotice);
 
             }
-        }
+//        }
             // 返回成功发放的优惠券信息列表
             return result;
     }