From b7791ef47bc81b42c41b90720608850d38f6a6b9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 14 Jul 2020 10:41:08 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java b/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
index f66f335..a0a3aa8 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
+++ b/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);
}
@@ -226,7 +212,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 +282,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"));
--
Gitblit v1.9.1