From 254bd271cf90e225ad6882fb89f238693279c250 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 05 Mar 2021 10:59:10 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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 a48bce9..b61cfba 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
@@ -16,6 +16,7 @@
import com.xcong.excoin.modules.contract.service.ContractEntrustOrderService;
import com.xcong.excoin.modules.contract.service.ContractHoldOrderService;
import com.xcong.excoin.modules.contract.service.ContractOrderService;
+import com.xcong.excoin.modules.documentary.service.FollowOrderOperationService;
import com.xcong.excoin.modules.member.dao.AgentReturnDao;
import com.xcong.excoin.modules.member.dao.MemberSettingDao;
import com.xcong.excoin.modules.member.entity.AgentReturnEntity;
@@ -80,7 +81,8 @@
private ContractEntrustOrderDao contractEntrustOrderDao;
@Resource
private RedisUtils redisUtils;
-
+ @Resource
+ private FollowOrderOperationService followOrderOperationService;
public void dealOrderFromMq(List<OrderModel> list, Integer type) {
if (CollectionUtils.isNotEmpty(list)) {
@@ -244,6 +246,7 @@
// 全仓模式，止盈/止损 删除委托平仓
if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
+ ThreadPoolUtils.sendWholePrice(memberId);
deleteEntrustCloseOrder(order.getOrderNo());
}
}
@@ -344,6 +347,7 @@
// 全仓模式，止盈/止损 删除委托平仓
if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
+ ThreadPoolUtils.sendWholePrice(memberId);
deleteEntrustCloseOrder(order.getOrderNo());
}
}
@@ -442,6 +446,7 @@
// 全仓模式，止盈/止损 删除委托平仓
if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
+ ThreadPoolUtils.sendWholePrice(memberId);
deleteEntrustCloseOrder(order.getOrderNo());
}
}
@@ -539,6 +544,7 @@
// 全仓模式，止盈/止损 删除委托平仓
if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == order.getPositionType()) {
+ ThreadPoolUtils.sendWholePrice(memberId);
deleteEntrustCloseOrder(order.getOrderNo());
}
}
@@ -619,6 +625,7 @@
contractHoldOrderEntity.setOpeningPrice(entrustPrice);
contractHoldOrderEntity.setTradeType(ContractHoldOrderEntity.TRADE_TYPE_LIMIT);
contractHoldOrderEntity.setOperateNo(1);
+ contractHoldOrderEntity.setSymbolCntSale(contractHoldOrderEntity.getSymbolCnt());
contractHoldOrderService.save(contractHoldOrderEntity);
// 需要一个历史插入
@@ -700,6 +707,7 @@
holdOrderEntity.setOperateNo(1);
// 设置合约类型
holdOrderEntity.setContractType(ContractOrderEntity.CONTRACTTYPE_NORMAL);
+ holdOrderEntity.setHoldBond(CalculateUtil.calMemberHoldBond(holdOrderEntity));
ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(holdOrderEntity);
contractOrderEntity.setOpeningTime(new Date());
@@ -710,6 +718,8 @@
if (isSuccess) {
contractEntrustOrderService.removeById(entrustOrder.getId());
memberWalletContractService.increaseWalletContractBalanceById(null, openFeePrice.negate(), entrustOrder.getBondAmount().negate(), wallet.getId());
+
+ ThreadPoolUtils.sendWholePrice(member.getId());
// 发送强平价
ThreadPoolUtils.sendWholeForceClosingPrice(entrustOrder.getSymbol(), member);
@@ -764,6 +774,7 @@
*
* @param
*/
+ @Transactional(rollbackFor = Exception.class)
public void dealCoinOut(List<ContractHoldOrderEntity> orderList, List<OrderModel> orderModels) {
if (CollectionUtils.isNotEmpty(orderList)) {
Map<Long, Integer> modelMap = new HashMap<Long, Integer>();
@@ -785,6 +796,7 @@
continue;
}
+ // 仅逐仓有用
if (ContractEntrustOrderEntity.POSITION_TYPE_ADD == coinsOrder.getPositionType()) {
bombOrder(coinsOrder);
} else {
@@ -794,7 +806,7 @@
bombOrder(holdOrderEntity);
}
- MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(coinsOrder.getMemberId(), CoinTypeConvert.convertContractTypeToCoin(coinsOrder.getSymbol()));
+ MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(coinsOrder.getMemberId(), CoinTypeEnum.USDT.name());
// 流水记录 TODO
MemberAccountFlowEntity record = new MemberAccountFlowEntity();
@@ -855,7 +867,7 @@
contractOrderService.save(contractOrderEntity);
//更新用户钱包数据
- MemberWalletContractEntity usdt = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, CoinTypeConvert.convertContractTypeToCoin(coinsOrder.getSymbol()));
+ MemberWalletContractEntity usdt = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, CoinTypeEnum.USDT.name());
// 减去的时候用负数
BigDecimal totalPrice = coinsOrder.getBondAmount().negate();
@@ -871,6 +883,12 @@
record.setSymbol(coinsOrder.getSymbol());
record.setPrice(coinsOrder.getBondAmount());
memberAccountFlowEntityDao.insert(record);
+
+ MemberEntity memberEntity = memberService.getById(memId);
+ // 如果订单为交易员的订单，爆仓了，则旗下的所有跟单都进行平仓
+ if (ContractOrderEntity.CONTRACTTYPE_DOCUMENTARY == coinsOrder.getContractType() && MemberEntity.IS_TRADER_Y.equals(memberEntity.getIsTrader())) {
+ followOrderOperationService.closingFollowOrders(coinsOrder.getOrderNo());
+ }
} else {
MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, "USDT");
--
Gitblit v1.9.1