From eaca7c0ae42149e8bcd7e651e94a56756e7b64c7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 05 Feb 2021 11:32:00 +0800
Subject: [PATCH] modify sms config
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 a5f0e26..72452b8 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
@@ -233,7 +233,7 @@
holdOrderEntity.setOpeningPrice(openingPrice);
holdOrderEntity.setOpeningType(submitOrderDto.getOrderType());
holdOrderEntity.setMarkPrice(newPrice);
- holdOrderEntity.setIsCanClosing(ContractHoldOrderEntity.ORDER_CAN_CLOSING_N);
+ holdOrderEntity.setIsCanClosing(ContractHoldOrderEntity.ORDER_CAN_CLOSING_Y);
holdOrderEntity.setPrePaymentAmount(prePaymentAmount);
holdOrderEntity.setBondAmount(bondAmount.add(openFeePrice));
holdOrderEntity.setOperateNo(1);
@@ -506,7 +506,6 @@
canReduceMaxBond = BigDecimal.ZERO;
}
- holdOrderListVo.setBondAmount(walletContractEntity.getTotalBalance());
holdOrderListVo.setCanReduceMaxBond(canReduceMaxBond);
holdOrderListVo.setCanAddMaxBond(walletContractEntity.getAvailableBalance());
holdOrderListVo.setReturnRate(returnRate);
@@ -526,7 +525,7 @@
BigDecimal totalEntrustAmount = BigDecimal.ZERO;
if (CollUtil.isNotEmpty(entrustOrder)) {
for (ContractEntrustOrderEntity contractEntrustOrderEntity : entrustOrder) {
- totalEntrustAmount.add(contractEntrustOrderEntity.getEntrustAmount());
+ totalEntrustAmount = totalEntrustAmount.add(contractEntrustOrderEntity.getEntrustAmount());
}
}
BigDecimal riskRatio = totalHoldBond.divide(walletContractEntity.getTotalBalance().add(totalProfitOrLoss).subtract(totalEntrustAmount), 4, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100));
@@ -864,10 +863,13 @@
if (equity.compareTo(BigDecimal.ZERO) <= 0) {
equity = BigDecimal.ZERO;
}
-
- BigDecimal available = walletContractEntity.getAvailableBalance().add(totalProfitOrLess);
- if (available.compareTo(BigDecimal.ZERO) <= 0) {
- available = BigDecimal.ZERO;
+
+ BigDecimal available = walletContractEntity.getAvailableBalance();
+ if (totalProfitOrLess.compareTo(BigDecimal.ZERO) <= 0) {
+ available = available.add(totalProfitOrLess);
+ if (available.compareTo(BigDecimal.ZERO) <= 0) {
+ available = BigDecimal.ZERO;
+ }
}
// 获取当日k线的开盘价
--
Gitblit v1.9.1