From 914ba427c03d65de5b574723e6a0866f15b385aa Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 29 Jan 2021 17:24:00 +0800
Subject: [PATCH] 20210129
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
index 885064f..fa7f8a4 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java
@@ -244,6 +244,7 @@
// 全仓模式，止盈/止损 删除委托平仓
if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
+ ThreadPoolUtils.sendWholePrice(memberId);
deleteEntrustCloseOrder(order.getOrderNo());
}
}
@@ -344,6 +345,7 @@
// 全仓模式，止盈/止损 删除委托平仓
if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
+ ThreadPoolUtils.sendWholePrice(memberId);
deleteEntrustCloseOrder(order.getOrderNo());
}
}
@@ -442,6 +444,7 @@
// 全仓模式，止盈/止损 删除委托平仓
if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
+ ThreadPoolUtils.sendWholePrice(memberId);
deleteEntrustCloseOrder(order.getOrderNo());
}
}
@@ -539,6 +542,7 @@
// 全仓模式，止盈/止损 删除委托平仓
if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
+ ThreadPoolUtils.sendWholePrice(memberId);
deleteEntrustCloseOrder(order.getOrderNo());
}
}
@@ -711,6 +715,8 @@
contractEntrustOrderService.removeById(entrustOrder.getId());
memberWalletContractService.increaseWalletContractBalanceById(null, openFeePrice.negate(), entrustOrder.getBondAmount().negate(), wallet.getId());
+ ThreadPoolUtils.sendWholePrice(member.getId());
+
// 发送强平价
ThreadPoolUtils.sendWholeForceClosingPrice(entrustOrder.getSymbol(), member);
@@ -855,7 +861,7 @@
contractOrderService.save(contractOrderEntity);
//更新用户钱包数据
- MemberWalletContractEntity usdt = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, "USDT");
+ MemberWalletContractEntity usdt = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, CoinTypeConvert.convertContractTypeToCoin(coinsOrder.getSymbol()));
// 减去的时候用负数
BigDecimal totalPrice = coinsOrder.getBondAmount().negate();
@@ -872,7 +878,7 @@
record.setPrice(coinsOrder.getBondAmount());
memberAccountFlowEntityDao.insert(record);
} else {
- MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, CoinTypeConvert.convertContractTypeToCoin(coinsOrder.getSymbol()));
+ MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, "USDT");
// BigDecimal rewardRatio = BigDecimal.ZERO;
// // 开多
--
Gitblit v1.9.1