KKSU
2024-08-22 7a372033d44ba48383d9d1bc97e5d583b26a266f
src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
@@ -58,6 +58,7 @@
    private final MallMemberBankMapper mallMemberBankMapper;
    private final MallMemberWithdrawMapper mallMemberWithdrawMapper;
    private final IApiMallMemberService mallMemberService;
    private final MallScoreRecordMapper mallScoreRecordMapper;
    @Override
    public ScoreSignVo scoreSign() {
@@ -108,6 +109,7 @@
        MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(member.getId());
        apiScoreVoucherInfoVo.setVoucherCnt(mallMemberWallet.getVoucherCnt().compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : mallMemberWallet.getVoucherCnt());
        apiScoreVoucherInfoVo.setVoucherAmount(mallMemberWallet.getVoucherAmount().compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : mallMemberWallet.getVoucherAmount());
        apiScoreVoucherInfoVo.setVoucherFireCnt(mallMemberWallet.getVoucherFireCnt().compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : mallMemberWallet.getVoucherFireCnt());
        DataDictionaryCustom scorePriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                GreenScoreEnum.SCORE_PRICE.getType(),
                GreenScoreEnum.SCORE_PRICE.getCode());
@@ -116,6 +118,9 @@
                GreenScoreEnum.SCORE_POOL_CNT.getType(),
                GreenScoreEnum.SCORE_POOL_CNT.getCode());
        apiScoreVoucherInfoVo.setScorePoolCnt(new BigDecimal(scorePoolCntDic.getValue()).setScale(2,BigDecimal.ROUND_DOWN));
        BigDecimal voucherCntSurplus = mallScoreRecordMapper.selectSurplusCntByMemberId(member.getId());
        apiScoreVoucherInfoVo.setVoucherCntSurplus(voucherCntSurplus);
        return apiScoreVoucherInfoVo;
    }
@@ -173,7 +178,9 @@
        scorePoolCntDic.setValue(scorePoolCnt.toString());
        dataDictionaryCustomMapper.updateById(scorePoolCntDic);
        //增加凭证数量
        mallMemberWalletMapper.addVorCherCntByMemberId(voucherCnt,memberId);
//        mallMemberWalletMapper.addVorCherCntByMemberId(voucherCnt,memberId);
        //增加凭证燃烧值数量
        mallMemberWalletMapper.addVorCherFireCntByMemberId(voucherCnt,memberId);
        //增加购买记录
        String voucherNo = MallUtils.getOrderNum("VB");
        MallScoreVoucher mallScoreVoucher = new MallScoreVoucher();
@@ -220,7 +227,7 @@
        MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
        BigDecimal voucherCntMember = mallMemberWallet.getVoucherCnt();
        if(voucherCntMember.compareTo(voucherCnt) < 0){
            throw new FebsException("绿色积分不足");
            throw new FebsException("数量不足");
        }
        DataDictionaryCustom scorePriceDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
@@ -257,7 +264,7 @@
                voucherAmount,
                MoneyFlowTypeEnum.VOUCHER_SALE.getValue(),
                voucherNo,
                FlowTypeEnum.VOUCHER_AMOUNT.getValue());
                FlowTypeEnum.BALANCE.getValue());
        return new FebsResponse().success().message("操作成功");
    }
@@ -298,7 +305,7 @@
            throw new FebsException("金额不足");
        }
        walletService.reduce(withdrawalDto.getAmount(), memberId, "voucher_amount");
        walletService.reduce(withdrawalDto.getAmount(), memberId, "voucherAmount");
        String orderNo = MallUtils.getOrderNum("W");
        MallMemberWithdraw withdraw = new MallMemberWithdraw();