From 8a0a1dadb1a5f4e87b92ee73b07fb4a0e311a952 Mon Sep 17 00:00:00 2001 From: Hentua <wangdoubleone@gmail.com> Date: Tue, 25 Apr 2023 23:39:53 +0800 Subject: [PATCH] fix --- src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java index b2112cd..181006d 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java @@ -234,13 +234,7 @@ if(AppContants.MEMBER_WITHDRAW_NORMAL.equals(mallMemberWithdraw.getRemark())){ //用户佣金增加对应的余额 iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"balance"); - } - if(AppContants.MEMBER_WITHDRAW_VOUCHER.equals(mallMemberWithdraw.getRemark())){ - iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"balance"); - iApiMallMemberWalletService.add(mallMemberWithdraw.getAmountFee(),mallMemberWithdraw.getMemberId(),"voucherCnt"); - } - if(AppContants.MEMBER_WITHDRAW_VOUCHER_AMOUNT.equals(mallMemberWithdraw.getRemark())){ - iApiMallMemberWalletService.add(mallMemberWithdraw.getAmount(),mallMemberWithdraw.getMemberId(),"voucherAmount"); + mallMoneyFlowService.addMoneyFlow(mallMemberWithdraw.getMemberId(), mallMemberWithdraw.getAmount(), MoneyFlowTypeEnum.WITHDRAWAL.getValue(),null, FlowTypeEnum.BALANCE.getValue()); } return new FebsResponse().success(); } @@ -654,6 +648,7 @@ adminMallMemberPaymentVo.setBankNo(mallMemberBank.getBankNo()); adminMallMemberPaymentVo.setBankName(mallMemberBank.getName()); adminMallMemberPaymentVo.setDigitalNo(mallMemberBank.getDigitalNo()); + adminMallMemberPaymentVo.setSubbranchName(mallMemberBank.getSubbranchName()); adminMallMemberPaymentVo.setBank(mallMemberBank.getBankName()); } return adminMallMemberPaymentVo; @@ -741,6 +736,17 @@ return mallMoneyFlowIPage; } + @Override + public FebsResponse insideWithType(Long id, int i) { + MallMember mallMember = mallMemberMapper.selectById(id); + if(ObjectUtil.isEmpty(mallMember)) { + return new FebsResponse().fail().message("会员信息不存在"); + } + mallMember.setInsideWith(i); + mallMemberMapper.updateById(mallMember); + return new FebsResponse().success(); + } + private String refererIds(String parentId) { boolean flag = false; if (StrUtil.isBlank(parentId)) { -- Gitblit v1.9.1