From 85e204ffc471a73fd9cab58470f906e1ef3c13c4 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Thu, 29 Feb 2024 10:14:59 +0800 Subject: [PATCH] 抽奖 --- src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java index 94f95e4..3b2ceba 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java +++ b/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() { @@ -117,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; } @@ -223,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( @@ -272,10 +276,6 @@ MallMember mallMember = mallMemberMapper.selectById(memberId); if (StrUtil.isBlank(mallMember.getTradePassword())) { throw new FebsException("未设置支付密码"); - } - - if (!mallMember.getTradePassword().equals(SecureUtil.md5(withdrawalDto.getTradePwd()))) { - throw new FebsException("支付密码错误"); } CashOutSettingVo cashOutSettingVo = new CashOutSettingVo(); -- Gitblit v1.9.1