fix(mall): 修复跑级计算错误

KKSU

2025-01-03 11e160c6ac65cba824596b0f4b718d766878ed82

 src/main/java/cc/mrbird/febs/mall/service/impl/RunVipServiceImpl.java

@@ -493,7 +493,7 @@
        if(runVipNext == null){
            throw new FebsException("无法升级会员权益");
        }
        if(runVip.getOrderNumber() < runVipNext.getOrderNumber()){
        if(runVip.getOrderNumber() >= runVipNext.getOrderNumber()){
            throw new FebsException("用户无法升级");
        }

@@ -546,16 +546,21 @@
            runVipGrow.setAmount(amount);
            runVipGrowMapper.updateById(runVipGrow);
        }else{

            BigDecimal presentPrice = runVip.getPresentPrice();
            BigDecimal add = presentPrice.add(amount);

            BigDecimal presentPriceNext = runVipNext.getPresentPrice();
            runVipGrow = new RunVipGrow();
            runVipGrow.setMemberId(memberId);
            runVipGrow.setLevelNow(memberLevel);
            runVipGrow.setLevelNext(runVipNext.getVipCode());
            runVipGrow.setAmountAll(runVipNext.getPresentPrice());
            runVipGrow.setAmount(amount);
            runVipGrow.setAmountNow(amount);
            runVipGrow.setAmountAll(presentPriceNext);
            runVipGrow.setAmount(add);
            runVipGrow.setAmountNow(add);
            runVipGrowMapper.insert(runVipGrow);

            if(runVipGrow.getAmountAll().compareTo(amount) <= 0){
            if(presentPriceNext.compareTo(add) <= 0){
                mallCharge.setVipCode(runVipGrow.getLevelNext());
            }
        }
@@ -563,12 +568,14 @@

        agentProducer.sendBuyVipSuccessMsg(mallCharge.getId());

        return new FebsResponse().success().data("操作成功");
        return new FebsResponse().success().message("操作成功");
    }

    @Override
    public FebsResponse growCharge(ApiGrowChargeDto apiGrowChargeDto) {
        Long memberId = LoginUserUtil.getLoginUser().getId();

        ApiGoChargeVo apiGoChargeVo = new ApiGoChargeVo();

        BigDecimal amount = apiGrowChargeDto.getAmount();
        if(BigDecimal.ZERO.compareTo(amount) >= 0){
@@ -595,7 +602,7 @@
        if(runVipNext == null){
            throw new FebsException("无法升级会员权益");
        }
        if(runVip.getOrderNumber() < runVipNext.getOrderNumber()){
        if(runVip.getOrderNumber() >= runVipNext.getOrderNumber()){
            throw new FebsException("用户无法升级");
        }

@@ -661,13 +668,29 @@
                mallCharge.setVipCode(runVipGrow.getLevelNext());
            }
        }else{
            if(runVipNext.getPresentPrice().compareTo(amount) <= 0){
            BigDecimal add = runVip.getPresentPrice().add(amount);
            if(runVipNext.getPresentPrice().compareTo(add) <= 0){
                mallCharge.setVipCode(runVipNext.getVipCode());
            }
        }

        mallChargeMapper.insert(mallCharge);
        return new FebsResponse().success().data("操作成功");

        apiGoChargeVo.setFailTime(mallCharge.getFailTime());
        apiGoChargeVo.setAddress(mallCharge.getAddress());
        apiGoChargeVo.setAmount(mallCharge.getAmount());
        apiGoChargeVo.setSysAddress(mallCharge.getSysAddress());
        apiGoChargeVo.setSysAddressType(mallCharge.getType());

        /**
         * 充值接口调用后，发送一个延时队列
         *  功能：延迟时间为【failMinutes】后，更新充值记录为失败。
         */
        ApiMemberChargeFailDto apiMemberChargeFailDto = new ApiMemberChargeFailDto();
        apiMemberChargeFailDto.setChargeId(mallCharge.getId());
        apiMemberChargeFailDto.setFailTime(Integer.parseInt(failMinutes) * 60L* 1000L);
        agentProducer.sendMemberChargeFailMsg(apiMemberChargeFailDto);
        return new FebsResponse().success().data(apiGoChargeVo);
    }

    @Override