zainali5120
2020-07-16 c119feb821bdb1e6ef407f55056173f752c01c32
src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
@@ -184,26 +184,12 @@
        if (ObjectUtil.isEmpty(walletContract)) {
            return Result.fail(MessageSourceUtils.getString("member_service_0001"));
        }
        /**
         * todo
         */
        //获取当前的合约持仓
        //获取实时盈亏
        BigDecimal profitAndLoss = new BigDecimal("0");
        //获取总付款
        BigDecimal totalPayment = new BigDecimal("0");
        BigDecimal lastTotalBalance = new BigDecimal("0");
        BigDecimal totalBalance = walletContract.getTotalBalance();
        lastTotalBalance = totalBalance.add(profitAndLoss);
        if (lastTotalBalance.compareTo(BigDecimal.ZERO) < 0) {
            lastTotalBalance = new BigDecimal("0");
        }
        MemberWalletContractInfoVo memberWalletContractInfoVo = new MemberWalletContractInfoVo();
        memberWalletContractInfoVo.setFrozenBalance(totalPayment.setScale(4, BigDecimal.ROUND_DOWN));
        memberWalletContractInfoVo.setAvailableBalance(walletContract.getAvailableBalance());
        memberWalletContractInfoVo.setTotalBalance(lastTotalBalance.setScale(4, BigDecimal.ROUND_DOWN));
        memberWalletContractInfoVo.setTotalRMBBalance(lastTotalBalance.multiply(cnyUsdt).setScale(4, BigDecimal.ROUND_DOWN));
        memberWalletContractInfoVo.setFrozenBalance(walletContract.getFrozenBalance().setScale(4, BigDecimal.ROUND_DOWN));
        memberWalletContractInfoVo.setAvailableBalance(walletContract.getAvailableBalance().setScale(4, BigDecimal.ROUND_DOWN));
        memberWalletContractInfoVo.setTotalBalance(walletContract.getTotalBalance().setScale(4, BigDecimal.ROUND_DOWN));
        memberWalletContractInfoVo.setTotalRMBBalance(walletContract.getTotalBalance().multiply(cnyUsdt).setScale(4, BigDecimal.ROUND_DOWN));
        return Result.ok(memberWalletContractInfoVo);
    }
@@ -502,17 +488,19 @@
           MemberAgentIntoInfoVo memberAgentIntoInfoVo = new MemberAgentIntoInfoVo();
           List<MemberAccountMoneyChangeInfoVo> arrayList = new ArrayList<>();
           if (ObjectUtil.isNotNull(contractRecordList)) {
               for (MemberAccountMoneyChange memberAccountMoneyChange : contractRecordList) {
                   MemberAccountMoneyChangeInfoVo memberAccountMoneyChangeInfoVo = new MemberAccountMoneyChangeInfoVo();
                   memberAccountMoneyChangeInfoVo.setAmount(memberAccountMoneyChange.getAmount());
                   memberAccountMoneyChangeInfoVo.setContent(memberAccountMoneyChange.getContent());
                   memberAccountMoneyChangeInfoVo.setStatus(memberAccountMoneyChange.getStatus());
                   memberAccountMoneyChangeInfoVo.setSymbol(memberAccountMoneyChange.getSymbol());
                   memberAccountMoneyChangeInfoVo.setType(memberAccountMoneyChange.getType());
                   memberAccountMoneyChangeInfoVo.setUpdateTime(memberAccountMoneyChange.getUpdateTime());
                   arrayList.add(memberAccountMoneyChangeInfoVo);
               }
           if(CollUtil.isNotEmpty(contractRecordList)) {
              if (ObjectUtil.isNotNull(contractRecordList)) {
                 for (MemberAccountMoneyChange memberAccountMoneyChange : contractRecordList) {
                    MemberAccountMoneyChangeInfoVo memberAccountMoneyChangeInfoVo = new MemberAccountMoneyChangeInfoVo();
                    memberAccountMoneyChangeInfoVo.setAmount(memberAccountMoneyChange.getAmount());
                    memberAccountMoneyChangeInfoVo.setContent(memberAccountMoneyChange.getContent());
                    memberAccountMoneyChangeInfoVo.setStatus(memberAccountMoneyChange.getStatus());
                    memberAccountMoneyChangeInfoVo.setSymbol(memberAccountMoneyChange.getSymbol());
                    memberAccountMoneyChangeInfoVo.setType(memberAccountMoneyChange.getType());
                    memberAccountMoneyChangeInfoVo.setUpdateTime(memberAccountMoneyChange.getUpdateTime());
                    arrayList.add(memberAccountMoneyChangeInfoVo);
                 }
              }
           }
           memberAgentIntoInfoVo.setMemberAccountMoneyChangeInfoVo(arrayList);
           return Result.ok(memberAgentIntoInfoVo);