fix

Helius

2021-09-25 fc6de549ca1bf2ef27dcb5f59808248673d14341

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

@@ -6,10 +6,7 @@
import cc.mrbird.febs.common.utils.*;
import cc.mrbird.febs.mall.conversion.MallMemberConversion;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallMemberWallet;
import cc.mrbird.febs.mall.entity.MallMoneyFlow;
import cc.mrbird.febs.mall.entity.MallShoppingCart;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IApiMallMemberService;
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
@@ -55,6 +52,7 @@
    private final MallShoppingCartMapper mallShoppingCartMapper;
    private final MallMoneyFlowMapper mallMoneyFlowMapper;
    private final IApiMallMemberWalletService walletService;
    private final MallMemberPaymentMapper mallMemberPaymentMapper;

    @Value("${spring.profiles.active}")
    private String active;
@@ -213,6 +211,15 @@
            mallMemberVo.setReferrerName(referMember.getName());
        }

        if (StrUtil.isNotBlank(mallMember.getTradePassword())) {
            mallMemberVo.setHasTradePwd(1);
        }

        MallMemberPayment payment = mallMemberPaymentMapper.selectByMemberId(id);
        if (payment != null) {
            mallMemberVo.setHasPayment(1);
        }

        MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(mallMemberVo.getId());
        mallMemberVo.setBalance(wallet.getBalance());
        return new FebsResponse().success().data(mallMemberVo);
@@ -355,8 +362,33 @@
            throw new FebsException("最小提现金额为100");
        }

        MallMemberPayment payment = mallMemberPaymentMapper.selectByMemberId(memberId);
        if (payment == null) {
            throw new FebsException("未设置收款方式");
        }

        walletService.reduceBalance(withdrawalDto.getAmount(), memberId);
        String orderNo = MallUtils.getOrderNum("W");
        this.addMoneyFlow(memberId, withdrawalDto.getAmount().negate(), MoneyFlowTypeEnum.WITHDRAWAL.getValue(), orderNo, null, null, null, 1);
    }

    @Override
    public void setPayment(MallMemberPayment mallMemberPayment) {
        MallMember member = LoginUserUtil.getLoginUser();

        MallMemberPayment exist = mallMemberPaymentMapper.selectByMemberId(member.getId());
        if (exist == null) {
            mallMemberPayment.setMemberId(member.getId());
            mallMemberPaymentMapper.insert(mallMemberPayment);
        } else {
            mallMemberPayment.setId(exist.getId());
            mallMemberPaymentMapper.updateById(mallMemberPayment);
        }
    }

    @Override
    public MallMemberPayment findMemberPayment() {
        MallMember member = LoginUserUtil.getLoginUser();
        return mallMemberPaymentMapper.selectByMemberId(member.getId());
    }
}