Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin

Helius

2020-07-07 960a8a614ab08485ffa334a916d1b24d5f9e198c

Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin

 src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java

@@ -226,7 +226,9 @@
            if (total.compareTo(BigDecimal.ZERO) < 0) {

                return Result.fail(MessageSourceUtils.getString("member_service_0005"));

            }

            BigDecimal subtract = walletCoin.getTotalBalance().subtract(balance);

            walletCoin.setAvailableBalance(total);

            walletCoin.setTotalBalance(subtract);

            int updateWalletCoinById = memberWalletCoinDao.updateById(walletCoin);

            if (updateWalletCoinById < 1) {

                return Result.fail(MessageSourceUtils.getString("member_service_0096"));

@@ -294,8 +296,11 @@
        MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, walletCode);

        BigDecimal walletCoinAvailableBalance = walletCoin.getAvailableBalance();

        BigDecimal CoinAvailableBalance = walletCoinAvailableBalance.add(balance);

        BigDecimal walletCoinTotalBalance = walletCoin.getTotalBalance();

        BigDecimal CoinTotalBalance = walletCoinTotalBalance.add(balance);



        walletCoin.setAvailableBalance(CoinAvailableBalance);

        walletCoin.setTotalBalance(CoinTotalBalance);

        int updateById = memberWalletCoinDao.updateById(walletCoin);

        if (updateById < 1) {

            return Result.fail(MessageSourceUtils.getString("member_service_0096"));