modify

Helius

2021-05-13 f8c1d9838e3c337d0dc9f406fb1b2b54e2be06b5

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

@@ -104,13 +104,15 @@


            if (CollUtil.isNotEmpty(memberWalletCoinlist)) {

                for (MemberWalletCoinEntity memberWalletCoinEntity : memberWalletCoinlist) {

                    MemberWalletCoinInfoVo memberWalletCoinInfoVo = new MemberWalletCoinInfoVo();

                    memberWalletCoinInfoVo.setAvailableBalance(memberWalletCoinEntity.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));

                    memberWalletCoinInfoVo.setFrozenBalance(memberWalletCoinEntity.getFrozenBalance().setScale(4, BigDecimal.ROUND_DOWN));

                    memberWalletCoinInfoVo.setMemberId(memberWalletCoinEntity.getMemberId());

                    memberWalletCoinInfoVo.setTotalBalance(memberWalletCoinEntity.getTotalBalance().setScale(4, BigDecimal.ROUND_DOWN));

                    memberWalletCoinInfoVo.setWalletCode(memberWalletCoinEntity.getWalletCode());

                    memberWalletCoinInfoVolist.add(memberWalletCoinInfoVo);

                    if ("USDT".equals(memberWalletCoinEntity.getWalletCode()) || "XCH".equals(memberWalletCoinEntity.getWalletCode())) {

                        MemberWalletCoinInfoVo memberWalletCoinInfoVo = new MemberWalletCoinInfoVo();

                        memberWalletCoinInfoVo.setAvailableBalance(memberWalletCoinEntity.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));

                        memberWalletCoinInfoVo.setFrozenBalance(memberWalletCoinEntity.getFrozenBalance().setScale(4, BigDecimal.ROUND_DOWN));

                        memberWalletCoinInfoVo.setMemberId(memberWalletCoinEntity.getMemberId());

                        memberWalletCoinInfoVo.setTotalBalance(memberWalletCoinEntity.getTotalBalance().setScale(4, BigDecimal.ROUND_DOWN));

                        memberWalletCoinInfoVo.setWalletCode(memberWalletCoinEntity.getWalletCode());

                        memberWalletCoinInfoVolist.add(memberWalletCoinInfoVo);

                    }

                }

            }



@@ -122,16 +124,25 @@
                        totalUsdts = totalUsdts.add(totalUsdt);

                        BigDecimal totalCny = totalUsdt.multiply(cnyUsdt);

                        walletCoin.setTotalBalance(totalCny);

                    } else {

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

                        // 获取最新价

                        BigDecimal closePrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(walletCoin.getWalletCode()+"/USDT")));

                        BigDecimal totalUsdt = BigDecimal.ZERO;

                        //Double closePrice = symbolsService.getCloseSymbolsBySymbolsName(walletCoin.getWalletCode()+"/USDT");

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

                        totalUsdts = totalUsdts.add(totalUsdt);

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

                    }



                    if ("XCH".equals(walletCoin.getWalletCode())) {

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

                        String xchNewPrice = redisUtils.getString("XCH_NEW_PRICE");

                        BigDecimal totalUsdt = xch.add(new BigDecimal(xchNewPrice));

                        BigDecimal totalCny = totalUsdt.multiply(cnyUsdt);

                        walletCoin.setTotalBalance(totalCny);

                    }

//                    else {

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

//                        // 获取最新价

//                        BigDecimal closePrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(walletCoin.getWalletCode()+"/USDT")));

//                        BigDecimal totalUsdt = BigDecimal.ZERO;

//                        //Double closePrice = symbolsService.getCloseSymbolsBySymbolsName(walletCoin.getWalletCode()+"/USDT");

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

//                        totalUsdts = totalUsdts.add(totalUsdt);

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

//                    }

                }

            }

            MemberWalletCoinVo memberWalletCoinVo = new MemberWalletCoinVo();

@@ -453,19 +464,21 @@
       String walletCode = MemberWalletCoinEnum.WALLETCOINCODE.getValue();

       MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberId, symbol);

       BigDecimal availableBalance = walletContract.getAvailableBalance();



       BigDecimal canReduce = availableBalance;

       //可用减去盈亏

       if(totalProfitOrLess.compareTo(BigDecimal.ZERO) < 0){

            availableBalance = availableBalance.add(totalProfitOrLess);

            canReduce = availableBalance.add(totalProfitOrLess);

        }

       // 扣币

       BigDecimal availableSubtract = availableBalance.subtract(balance);

       BigDecimal availableSubtract = canReduce.subtract(balance);

       if (availableSubtract.compareTo(BigDecimal.ZERO) < 0) {

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

       }

       BigDecimal totalBalance = walletContract.getTotalBalance();

       BigDecimal totalSubtract = totalBalance.subtract(balance);

       

       walletContract.setAvailableBalance(availableSubtract);

       walletContract.setAvailableBalance(availableBalance.subtract(balance));

       walletContract.setTotalBalance(totalSubtract);

       int updateWalletCoinById = memberWalletContractDao.updateById(walletContract);

       if (updateWalletCoinById < 1) {

@@ -552,7 +565,11 @@
        if(totalProfitOrLess.compareTo(BigDecimal.ZERO) < 0){

            availableBalance = availableBalance.add(totalProfitOrLess);

        }

        availableBalance = availableBalance.setScale(4, BigDecimal.ROUND_DOWN);

        if(availableBalance.compareTo(BigDecimal.ZERO) > 0){

            availableBalance = availableBalance.setScale(4, BigDecimal.ROUND_DOWN);

        }else{

            availableBalance = BigDecimal.ZERO;

        }

        return Result.ok(availableBalance);

    }



@@ -1106,33 +1123,30 @@
        return Result.fail(MessageSourceUtils.getString("member_controller_0005"));

        

    }

	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	
	




    @Override

    public BigDecimal getAllWalletAmount(Long memberId) {

        List<MemberWalletCoinEntity> memberWalletCoinList = memberWalletCoinDao.selectMemberWalletCoinsByMemberId(memberId);

        BigDecimal total = BigDecimal.ZERO;

        if (CollUtil.isNotEmpty(memberWalletCoinList)) {

            for (MemberWalletCoinEntity memberWalletCoinEntity : memberWalletCoinList) {

                if (memberWalletCoinEntity.getWalletCode().equals(CoinTypeEnum.USDT.name())) {

                    total = total.add(memberWalletCoinEntity.getTotalBalance());

                } else {

                    BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(memberWalletCoinEntity.getWalletCode() + "/USDT")));

                    total = total.add(memberWalletCoinEntity.getTotalBalance().multiply(newPrice));

                }

            }

        }



        MemberWalletContractEntity contractWallet = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeEnum.USDT.name());

        total = total.add(contractWallet.getTotalBalance());



        MemberWalletAgentEntity walletAgent = memberWalletAgentDao.selectWalletAgentBymIdAndCode(memberId, CoinTypeEnum.USDT.name());

        if (walletAgent != null) {

            total = total.add(walletAgent.getTotalBalance());

        }

        return total;

    }

}