Merge branch 'master' of https://chonggaoxiao:xcg523511090712@gitee.com/cho...

gao

2020-06-05 01aa2cc5c8fafd89ff763bfb0016c4983ff79648

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

@@ -87,7 +87,7 @@
                        totalUsdt = walletCoin.getAvailableBalance().add(walletCoin.getFrozenBalance());

                        totalUsdts = totalUsdts.add(totalUsdt);

                        BigDecimal totalCny = totalUsdt.multiply(cnyUsdt);

                        walletCoin.setTotalBalance(totalCny.setScale(4, BigDecimal.ROUND_DOWN));

                        walletCoin.setTotalBalance(totalCny);

                    } else {

                        BigDecimal amount = walletCoin.getAvailableBalance().add(walletCoin.getFrozenBalance());

                        // 获取最新价

@@ -96,7 +96,7 @@
                        //Double closePrice = symbolsService.getCloseSymbolsBySymbolsName(walletCoin.getWalletCode()+"/USDT");

                        totalUsdt = totalUsdt.add(amount.multiply(closePrice));

                        totalUsdts = totalUsdts.add(totalUsdt);

                        walletCoin.setTotalBalance(totalUsdt.multiply(cnyUsdt).setScale(4, BigDecimal.ROUND_DOWN));

                        walletCoin.setTotalBalance(totalUsdt.multiply(cnyUsdt));

                    }

                }

            }

@@ -183,9 +183,9 @@
         */

        //获取当前的合约持仓

        //获取实时盈亏

        BigDecimal profitAndLoss = new BigDecimal("50.000");

        BigDecimal profitAndLoss = new BigDecimal("0");

        //获取总付款

        BigDecimal totalPayment = new BigDecimal("50.000");

        BigDecimal totalPayment = new BigDecimal("0");

        BigDecimal lastTotalBalance = new BigDecimal("0");

        BigDecimal totalBalance = walletContract.getTotalBalance();

        lastTotalBalance = totalBalance.add(profitAndLoss);

@@ -235,10 +235,10 @@
            MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberId, walletCode);

            BigDecimal availableBalance = walletContract.getAvailableBalance();

            BigDecimal add = availableBalance.add(balance);

            walletContract.setAvailableBalance(add.setScale(4, BigDecimal.ROUND_DOWN));

            walletContract.setAvailableBalance(add);

            BigDecimal totalBalance = walletContract.getTotalBalance();

            BigDecimal totalBigDecimal = totalBalance.add(balance);

            walletContract.setTotalBalance(totalBigDecimal.setScale(4, BigDecimal.ROUND_DOWN));

            walletContract.setTotalBalance(totalBigDecimal);

            int updateWalletContractById = memberWalletContractDao.updateById(walletContract);

            if (updateWalletContractById < 1) {

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

@@ -247,7 +247,7 @@
            MemberAccountMoneyChange memberAccountRecord = new MemberAccountMoneyChange();

            memberAccountRecord.setContent(MemberWalletCoinEnum.CONTENTTOCONTRACT.getValue());

            memberAccountRecord.setMemberId(memberId);

            memberAccountRecord.setAmount(balance.negate().setScale(4, BigDecimal.ROUND_DOWN));

            memberAccountRecord.setAmount(balance.negate());

            memberAccountRecord.setStatus(MemberAccountMoneyChange.STATUS_SUCCESS_INTEGER);

            memberAccountRecord.setSymbol(MemberWalletCoinEnum.WALLETCOINCODE.getValue());

            memberAccountRecord.setType(MemberAccountMoneyChange.TYPE_WALLET_COIN);

@@ -256,7 +256,7 @@
            //添加合约资金划转历史记录

            memberAccountRecord.setContent(MemberWalletCoinEnum.CONTENTFROMWALLETCOIN.getValue());

            memberAccountRecord.setSymbol(MemberWalletCoinEnum.WALLETCOINCODE.getValue());

            memberAccountRecord.setAmount(balance.setScale(4, BigDecimal.ROUND_DOWN));

            memberAccountRecord.setAmount(balance);

            memberAccountRecord.setType(MemberAccountMoneyChange.TYPE_WALLET_CONTRACT);

            memberAccountMoneyChangeDao.insert(memberAccountRecord);

        }

@@ -283,8 +283,8 @@
        BigDecimal totalBalance = walletContract.getTotalBalance();

        BigDecimal totalSubtract = totalBalance.subtract(balance);



        walletContract.setAvailableBalance(availableSubtract.setScale(4, BigDecimal.ROUND_DOWN));

        walletContract.setTotalBalance(totalSubtract.setScale(4, BigDecimal.ROUND_DOWN));

        walletContract.setAvailableBalance(availableSubtract);

        walletContract.setTotalBalance(totalSubtract);

        int updateWalletCoinById = memberWalletContractDao.updateById(walletContract);

        if (updateWalletCoinById < 1) {

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

@@ -296,8 +296,8 @@
        BigDecimal walletCoinTotalBalance = walletCoin.getTotalBalance();

        BigDecimal CoinTotalBalance = walletCoinTotalBalance.add(balance);



        walletCoin.setAvailableBalance(CoinAvailableBalance.setScale(4, BigDecimal.ROUND_DOWN));

        walletCoin.setTotalBalance(CoinTotalBalance.setScale(4, BigDecimal.ROUND_DOWN));

        walletCoin.setAvailableBalance(CoinAvailableBalance);

        walletCoin.setTotalBalance(CoinTotalBalance);

        int updateById = memberWalletCoinDao.updateById(walletCoin);

        if (updateById < 1) {

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

@@ -307,7 +307,7 @@
        MemberAccountMoneyChange memberAccountRecord = new MemberAccountMoneyChange();

        memberAccountRecord.setContent(MemberWalletCoinEnum.CONTENTTOWALLETCOIN.getValue());

        memberAccountRecord.setMemberId(memberId);

        memberAccountRecord.setAmount(balance.negate().setScale(4, BigDecimal.ROUND_DOWN));

        memberAccountRecord.setAmount(balance.negate());

        memberAccountRecord.setStatus(MemberAccountMoneyChange.STATUS_SUCCESS_INTEGER);

        memberAccountRecord.setSymbol(walletCode);

        memberAccountRecord.setType(MemberAccountMoneyChange.TYPE_WALLET_CONTRACT);

@@ -317,7 +317,7 @@
        memberAccountRecord.setContent(MemberWalletCoinEnum.CONTENTFROMCONTRACT.getValue());

        memberAccountRecord.setSymbol(walletCode);

        memberAccountRecord.setType(MemberAccountMoneyChange.TYPE_WALLET_COIN);

        memberAccountRecord.setAmount(balance.setScale(4, BigDecimal.ROUND_DOWN));

        memberAccountRecord.setAmount(balance);

        memberAccountMoneyChangeDao.insert(memberAccountRecord);

        return Result.ok(MessageSourceUtils.getString("member_service_0006"));

    }

@@ -435,8 +435,8 @@
            return Result.fail(MessageSourceUtils.getString("member_service_0008"));

        }



        walletAgent.setAvailableBalance(available.setScale(4, BigDecimal.ROUND_DOWN));

        walletAgent.setTotalBalance(total.setScale(4, BigDecimal.ROUND_DOWN));

        walletAgent.setAvailableBalance(available);

        walletAgent.setTotalBalance(total);



        int i = memberWalletAgentDao.updateById(walletAgent);

        if (i < 1) {

@@ -450,8 +450,8 @@
            BigDecimal walletCoinAvailableBalance = walletCoin.getAvailableBalance();

            BigDecimal walletCoinTotalBalance = walletCoin.getTotalBalance();



            walletCoin.setAvailableBalance(walletCoinAvailableBalance.add(balance).setScale(4, BigDecimal.ROUND_DOWN));

            walletCoin.setTotalBalance(walletCoinTotalBalance.add(balance).setScale(4, BigDecimal.ROUND_DOWN));

            walletCoin.setAvailableBalance(walletCoinAvailableBalance.add(balance));

            walletCoin.setTotalBalance(walletCoinTotalBalance.add(balance));



            int updateById = memberWalletCoinDao.updateById(walletCoin);

            if (updateById < 1) {

@@ -463,7 +463,7 @@
            memberAccountRecord.setSymbol(walletCode);

            memberAccountRecord.setContent(MemberWalletCoinEnum.CONTENTFROMAGENT.getValue());

            memberAccountRecord.setType(MemberAccountMoneyChange.TYPE_WALLET_COIN);

            memberAccountRecord.setAmount(balance.setScale(4, BigDecimal.ROUND_DOWN));

            memberAccountRecord.setAmount(balance);

            memberAccountMoneyChangeDao.insert(memberAccountRecord);

            memberAccountRecord.setContent(MemberWalletCoinEnum.CONTENTTOWALLETCOIN.getValue());



@@ -473,8 +473,8 @@
            BigDecimal walletContractAvailableBalance = walletContract.getAvailableBalance();

            BigDecimal walletContractTotalBalance = walletContract.getTotalBalance();



            walletContract.setAvailableBalance(walletContractAvailableBalance.add(balance).setScale(4, BigDecimal.ROUND_DOWN));

            walletContract.setTotalBalance(walletContractTotalBalance.add(balance).setScale(4, BigDecimal.ROUND_DOWN));

            walletContract.setAvailableBalance(walletContractAvailableBalance.add(balance));

            walletContract.setTotalBalance(walletContractTotalBalance.add(balance));



            int updateById = memberWalletContractDao.updateById(walletContract);

            if (updateById < 1) {

@@ -487,11 +487,11 @@
            memberAccountRecord.setSymbol(walletCode);

            memberAccountRecord.setContent(MemberWalletCoinEnum.CONTENTFROMAGENT.getValue());

            memberAccountRecord.setType(MemberAccountMoneyChange.TYPE_WALLET_CONTRACT);

            memberAccountRecord.setAmount(balance.setScale(4, BigDecimal.ROUND_DOWN));

            memberAccountRecord.setAmount(balance);

            memberAccountMoneyChangeDao.insert(memberAccountRecord);

            memberAccountRecord.setContent(MemberWalletCoinEnum.CONTENTTOCONTRACT.getValue());

        }

        memberAccountRecord.setAmount(balance.negate().setScale(4, BigDecimal.ROUND_DOWN));

        memberAccountRecord.setAmount(balance.negate());

        memberAccountRecord.setType(MemberAccountMoneyChange.TYPE_WALLET_AGENT);

        memberAccountMoneyChangeDao.insert(memberAccountRecord);