fix

Hentua

2024-01-28 17cdd53716cf013794433bc5ccc6015f7bcf6a39

 src/main/java/cc/mrbird/febs/vip/service/impl/VipCommonServiceImpl.java

@@ -18,6 +18,7 @@
import cc.mrbird.febs.vip.service.IVipCommonService;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -85,57 +86,61 @@
            return;
        }

        LambdaQueryWrapper<MallVipConfig> configQuery = new LambdaQueryWrapper<>();
        configQuery.gt(MallVipConfig::getLevel, config.getLevel())
                .orderByAsc(MallVipConfig::getLevel)
                .last("limit 1");
        MallVipConfig nextLevel = mallVipConfigMapper.selectOne(configQuery);
//        LambdaQueryWrapper<MallVipConfig> configQuery = new LambdaQueryWrapper<>();
//        configQuery.gt(MallVipConfig::getLevel, config.getLevel())
//                .orderByAsc(MallVipConfig::getLevel)
//                .last("limit 1");
//        MallVipConfig nextLevel = mallVipConfigMapper.selectOne(configQuery);

        // 指定商品
        if (nextLevel.getType() == 1) {
            boolean hasMatch = mallOrderInfo.getItems().stream().anyMatch(item -> {
                return item.getGoodsId().equals(nextLevel.getTargetId());
            });
        List<MallVipConfig> configs = mallVipConfigMapper.selectVipConfigList();

            if (!hasMatch) {
                log.info("未购买指定商品");
                return;
        String nextLevelCode = "";
        for (MallVipConfig nextLevel : configs) {
            if (config.getLevel() >= nextLevel.getLevel()) {
                continue;
            }

            MallMember update = new MallMember();
            update.setId(member.getId());
            update.setLevel(nextLevel.getCode());
            mallMemberMapper.updateById(update);
            return;
            // 指定商品
            if (nextLevel.getType() == 1) {
                boolean hasMatch = mallOrderInfo.getItems().stream().anyMatch(item -> {
                    return item.getGoodsId().equals(nextLevel.getTargetId());
                });

                if (hasMatch) {
                    nextLevelCode = nextLevel.getCode();
                    continue;
                }
            }

            // 时间区间内金额
            if (nextLevel.getType() == 2) {
                Date endTime = DateUtil.endOfDay(new Date());
                Date startTime = getStartTime(nextLevel.getValidType());

                LambdaQueryWrapper<MallOrderInfo> query = new LambdaQueryWrapper<>();
                query.ge(MallOrderInfo::getReceivingTime, startTime)
                        .le(MallOrderInfo::getReceivingTime, endTime)
                        .eq(MallOrderInfo::getStatus, 4)
                        .eq(MallOrderInfo::getMemberId, member.getId());
                List<MallOrderInfo> orderList = mallOrderInfoMapper.selectList(query);
                if (CollUtil.isEmpty(orderList)) {
                    continue;
                }

                double totalAmount = orderList.stream().mapToDouble(item -> {
                    return item.getAmount().doubleValue();
                }).sum();

                if (nextLevel.getAmount().compareTo(BigDecimal.valueOf(totalAmount)) <= 0) {
                    nextLevelCode = nextLevel.getCode();
                }
            }
        }

        //
        if (nextLevel.getType() == 2) {
            Date endTime = DateUtil.endOfDay(new Date());
            Date startTime = getStartTime(nextLevel.getValidType());

            LambdaQueryWrapper<MallOrderInfo> query = new LambdaQueryWrapper<>();
            query.ge(MallOrderInfo::getReceivingTime, startTime)
                   .le(MallOrderInfo::getReceivingTime, endTime)
                   .eq(MallOrderInfo::getStatus, 4)
                    .eq(MallOrderInfo::getMemberId, member.getId());
            List<MallOrderInfo> orderList = mallOrderInfoMapper.selectList(query);
            if (CollUtil.isEmpty(orderList)) {
                return;
            }

            double totalAmount = orderList.stream().mapToDouble(item -> {
                return item.getAmount().doubleValue();
            }).sum();

            if (nextLevel.getAmount().compareTo(BigDecimal.valueOf(totalAmount)) > 0) {
                log.info("未达到指定金额:{}, {}", nextLevel.getAmount(), totalAmount);
                return;
            }

        if (StrUtil.isNotBlank(nextLevelCode)) {
            MallMember update = new MallMember();
            update.setId(member.getId());
            update.setLevel(nextLevel.getCode());
            update.setLevel(nextLevelCode);
            mallMemberMapper.updateById(update);
        }
    }