fix

Hentua

2024-01-26 90c31b4e2be82bd9a47115e939a9ad103271fbfa

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

@@ -85,11 +85,19 @@
            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);

        List<MallVipConfig> configs = mallVipConfigMapper.selectVipConfigList();

        String nextLevelCode = "";
        for (MallVipConfig nextLevel : configs) {
            if (config.getLevel() >= nextLevel.getLevel()) {
                continue;
            }

        // 指定商品
        if (nextLevel.getType() == 1) {
@@ -97,19 +105,13 @@
                return item.getGoodsId().equals(nextLevel.getTargetId());
            });

            if (!hasMatch) {
                log.info("未购买指定商品");
                return;
                if (hasMatch) {
                    nextLevelCode = nextLevel.getCode();
                    continue;
                }
            }

            MallMember update = new MallMember();
            update.setId(member.getId());
            update.setLevel(nextLevel.getCode());
            mallMemberMapper.updateById(update);
            return;
        }

        //
            // 时间区间内金额
        if (nextLevel.getType() == 2) {
            Date endTime = DateUtil.endOfDay(new Date());
            Date startTime = getStartTime(nextLevel.getValidType());
@@ -121,23 +123,23 @@
                    .eq(MallOrderInfo::getMemberId, member.getId());
            List<MallOrderInfo> orderList = mallOrderInfoMapper.selectList(query);
            if (CollUtil.isEmpty(orderList)) {
                return;
                    continue;
            }

            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 (nextLevel.getAmount().compareTo(BigDecimal.valueOf(totalAmount)) <= 0) {
                    nextLevelCode = nextLevel.getCode();
                }
            }
            }

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

    private Date getStartTime(String type) {