From c98dbf9d709286a35811e8a57b01269454bfd04f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 04 Sep 2020 11:06:20 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/utils/ThreadPoolUtils.java | 2 +-
src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java | 2 +-
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 7 +++++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java b/src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java
index bdca53a..7733528 100644
--- a/src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java
+++ b/src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java
@@ -140,7 +140,7 @@
}
// ThreadPoolUtils.sendWholeForceClosingPrice(symbol, memberEntity);
- CalculateUtil.getForceSetPriceForWhole(symbol, memberEntity);
+ CalculateUtil.getForceSetPriceForWhole(null, memberEntity);
}
}
diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
index 3314803..1fc3d1f 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.common.enumerates.CoinTypeEnum;
import com.xcong.excoin.common.enumerates.RabbitPriceTypeEnum;
@@ -85,7 +86,7 @@
* 全仓模式 -- 预估强平价
* 开仓价 - (权益 - 其他币种成本)/当前币种成本 * (开仓价 * 杠杆)
*/
- public static BigDecimal getForceSetPriceForWhole(@NotNull String currentSymbol, @NotNull MemberEntity memberEntity) {
+ public static BigDecimal getForceSetPriceForWhole(String currentSymbol, @NotNull MemberEntity memberEntity) {
ContractHoldOrderDao holdOrderDao = SpringContextHolder.getBean(ContractHoldOrderDao.class);
MemberWalletContractDao walletContractDao = SpringContextHolder.getBean(MemberWalletContractDao.class);
@@ -140,7 +141,9 @@
BigDecimal forcePrice = openPrice.subtract(divide.multiply(divide2));
log.info("forcePrice -- {}", forcePrice);
- holdOrderDao.updateForcePriceBySymbolAndMemberId(forcePrice, memberId, symbol);
+ if (StrUtil.isBlank(currentSymbol)) {
+ holdOrderDao.updateForcePriceBySymbolAndMemberId(forcePrice, memberId, symbol);
+ }
if (currentSymbol.equalsIgnoreCase(symbol)) {
result = forcePrice;
diff --git a/src/main/java/com/xcong/excoin/utils/ThreadPoolUtils.java b/src/main/java/com/xcong/excoin/utils/ThreadPoolUtils.java
index af0fd99..a8129f3 100644
--- a/src/main/java/com/xcong/excoin/utils/ThreadPoolUtils.java
+++ b/src/main/java/com/xcong/excoin/utils/ThreadPoolUtils.java
@@ -78,7 +78,7 @@
@Override
public void run() {
try {
- CalculateUtil.getForceSetPriceForWhole(symbol, memberEntity);
+ CalculateUtil.getForceSetPriceForWhole(null, memberEntity);
} catch (Exception e) {
log.error("全仓模式预估强平价", e);
}
--
Gitblit v1.9.1