智能客服问题答案,核销订单送券bug修改

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

@@ -20,6 +20,7 @@ import shop.alien.mapper.*;
 import shop.alien.store.service.LifeDiscountCouponStoreFriendService;
 import shop.alien.util.common.constant.DiscountCouponEnum;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -223,10 +224,9 @@ public class LifeDiscountCouponStoreFriendServiceImpl extends ServiceImpl<LifeDi
         List<Integer> couponList = new ArrayList<>();
         LambdaQueryWrapper<LifeDiscountCouponFriendRule> ruleLambdaQueryWrapper = new LambdaQueryWrapper<>();
         ruleLambdaQueryWrapper.eq(LifeDiscountCouponFriendRule::getStoreId, lifeUserOrder.getStoreId())
-                .ge(LifeDiscountCouponFriendRule::getMoneyLow, lifeUserOrder.getFinalPrice())
-                .le(LifeDiscountCouponFriendRule::getMoneyHigh, lifeUserOrder.getFinalPrice())
                 .eq(LifeDiscountCouponFriendRule::getDeleteFlag, 0);
         List<LifeDiscountCouponFriendRule> lifeDiscountCouponFriendRules = lifeDiscountCouponFriendRuleMapper.selectList(ruleLambdaQueryWrapper);
+        lifeDiscountCouponFriendRules = lifeDiscountCouponFriendRules.stream().filter(i -> i.getMoneyLow().compareTo(new BigDecimal(lifeUserOrder.getFinalPrice())) <= 0 && i.getMoneyHigh().compareTo(new BigDecimal(lifeUserOrder.getFinalPrice())) >= 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()));