From bc4ff6cc8a7faf0d84e7caacd4cdf179f48dee5e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 01 Feb 2021 16:22:20 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
index 4f2d1cd..a5f0e26 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java
@@ -506,6 +506,7 @@
                     canReduceMaxBond = BigDecimal.ZERO;
                 }
 
+                holdOrderListVo.setBondAmount(walletContractEntity.getTotalBalance());
                 holdOrderListVo.setCanReduceMaxBond(canReduceMaxBond);
                 holdOrderListVo.setCanAddMaxBond(walletContractEntity.getAvailableBalance());
                 holdOrderListVo.setReturnRate(returnRate);
@@ -863,6 +864,11 @@
         if (equity.compareTo(BigDecimal.ZERO) <= 0) {
             equity = BigDecimal.ZERO;
         }
+
+        BigDecimal available = walletContractEntity.getAvailableBalance().add(totalProfitOrLess);
+        if (available.compareTo(BigDecimal.ZERO) <= 0) {
+            available = BigDecimal.ZERO;
+        }
         
         // 获取当日k线的开盘价
         Candlestick symbolObject = (Candlestick) redisUtils.get(symbol);
@@ -871,7 +877,7 @@
         contractMoneyInfoVo.setBeUsedBondAmount(beUsedBondAmount);
         contractMoneyInfoVo.setFrozenBondAmount(frozenBondAmount);
         contractMoneyInfoVo.setEquity(equity);
-        contractMoneyInfoVo.setAvailableBalance(walletContractEntity.getAvailableBalance());
+        contractMoneyInfoVo.setAvailableBalance(available);
         contractMoneyInfoVo.setFeeRatio(tradeSetting.getFeeRatio());
         contractMoneyInfoVo.setLeverAgeRatio(tradeSetting.getLeverageRatio());
         contractMoneyInfoVo.setNewPrice(newPriceSymbol);

--
Gitblit v1.9.1