20221221

xiaoyong931011

2022-12-23 0e7f25ad6e903c569fa7364e729ddfca6547a279

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

@@ -462,14 +462,8 @@
    public BigDecimal canMoney() {
        Long memberId = LoginUserUtil.getLoginUser().getId();
        MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
        BigDecimal profit = mallMoneyFlowMapper.selectProfitByDateAndMemberId(memberId);

        BigDecimal canMoney = wallet.getCommission();
        if (profit != null) {
            if(canMoney.compareTo(BigDecimal.ZERO) > 0) {
                canMoney = canMoney.subtract(profit);
            }
        }
        BigDecimal canMoney = wallet.getBalance();
        canMoney = canMoney.compareTo(BigDecimal.ZERO) > 0 ? canMoney : BigDecimal.ZERO;
        return canMoney;
    }

@@ -614,11 +608,7 @@
    public FebsResponse updateMemberBank(UpdateMemberBankDto updateMemberBankDto) {
        Long id = updateMemberBankDto.getId();
        MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(id);
        mallMemberBank.setName(updateMemberBankDto.getName());
        mallMemberBank.setIdType(updateMemberBankDto.getIdType());
        mallMemberBank.setIdCardNum(updateMemberBankDto.getIdCardNum());
        mallMemberBank.setBankNo(updateMemberBankDto.getBankNo());
        mallMemberBank.setPhone(updateMemberBankDto.getPhone());
        mallMemberBankMapper.updateById(mallMemberBank);
        return new FebsResponse().success();
    }