From 69e40a4445dd4f73c9b04de52f6a6d04d66127b7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 19 Aug 2020 17:42:59 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 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 5906081..4fb9319 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
@@ -162,12 +162,12 @@
BigDecimal subBondAmount = bondAmount.subtract(wholeHoldOrder.getBondAmount());
log.info("保证金差值:{}", subBondAmount);
- BigDecimal forceClosingPrice = CalculateUtil.getForceSetPriceForWhole(submitOrderDto.getSymbol(), memberEntity);
- log.info("新预估强平价:{}", forceClosingPrice);
+// BigDecimal forceClosingPrice = CalculateUtil.getForceSetPriceForWhole(submitOrderDto.getSymbol(), memberEntity);
+// log.info("新预估强平价:{}", forceClosingPrice);
ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(wholeHoldOrder);
contractOrderEntity.setBondAmount(bondAmount.add(openFeePrice));
- contractOrderEntity.setForceClosingPrice(forceClosingPrice);
+// contractOrderEntity.setForceClosingPrice(forceClosingPrice);
contractOrderEntity.setOpeningPrice(newOpenPrice);
contractOrderEntity.setSymbolCnt(submitOrderDto.getSymbolCnt());
contractOrderEntity.setOpeningTime(new Date());
@@ -180,7 +180,7 @@
wholeHoldOrder.setBondAmount(bondAmount);
wholeHoldOrder.setSymbolCnt(wholeHoldOrder.getSymbolCnt() + submitOrderDto.getSymbolCnt());
wholeHoldOrder.setSymbolCntSale(wholeHoldOrder.getSymbolCntSale() + submitOrderDto.getSymbolCnt());
- wholeHoldOrder.setForceClosingPrice(forceClosingPrice);
+// wholeHoldOrder.setForceClosingPrice(forceClosingPrice);
wholeHoldOrder.setPrePaymentAmount(prePaymentAmount);
wholeHoldOrder.setOperateNo(wholeHoldOrder.getOperateNo() + 1);
int i = contractHoldOrderDao.updateById(wholeHoldOrder);
@@ -188,8 +188,9 @@
memberWalletContractDao.increaseWalletContractBalanceById(subBondAmount.add(openFeePrice).negate(), openFeePrice.negate(), null, walletContract.getId());
// 发送爆仓消息
- sendOrderBombMsg(wholeHoldOrder.getId(), wholeHoldOrder.getOpeningType(), forceClosingPrice, wholeHoldOrder.getSymbol(), wholeHoldOrder.getOperateNo());
-
+// sendOrderBombMsg(wholeHoldOrder.getId(), wholeHoldOrder.getOpeningType(), forceClosingPrice, wholeHoldOrder.getSymbol(), wholeHoldOrder.getOperateNo());
+ // 发送预估强平价
+ ThreadPoolUtils.sendWholeForceClosingPrice(submitOrderDto.getSymbol(), memberEntity);
// 计算佣金
ThreadPoolUtils.calReturnMoney(memberEntity.getId(), openFeePrice, contractOrderEntity, AgentReturnEntity.ORDER_TYPE_OPEN);
@@ -221,7 +222,7 @@
}
// 预估强平价
- BigDecimal forceClosingPrice = CalculateUtil.getForceSetPriceForWhole(submitOrderDto.getSymbol(), memberEntity);
+// BigDecimal forceClosingPrice = CalculateUtil.getForceSetPriceForWhole(submitOrderDto.getSymbol(), memberEntity);
ContractHoldOrderEntity holdOrderEntity = new ContractHoldOrderEntity();
holdOrderEntity.setMemberId(memberEntity.getId());
@@ -233,12 +234,12 @@
holdOrderEntity.setSymbolCntSale(submitOrderDto.getSymbolCnt());
holdOrderEntity.setSymbolSku(lotNumber);
holdOrderEntity.setLeverRatio(submitOrderDto.getLeverRatio());
- holdOrderEntity.setForceClosingPrice(forceClosingPrice);
+// holdOrderEntity.setForceClosingPrice(forceClosingPrice);
holdOrderEntity.setOpeningFeeAmount(openFeePrice);
holdOrderEntity.setOpeningPrice(openingPrice);
holdOrderEntity.setOpeningType(submitOrderDto.getOrderType());
holdOrderEntity.setMarkPrice(newPrice);
- holdOrderEntity.setIsCanClosing(ContractHoldOrderEntity.ORDER_CAN_CLOSING_Y);
+ holdOrderEntity.setIsCanClosing(ContractHoldOrderEntity.ORDER_CAN_CLOSING_N);
holdOrderEntity.setPrePaymentAmount(prePaymentAmount);
holdOrderEntity.setBondAmount(bondAmount.add(openFeePrice));
holdOrderEntity.setOperateNo(1);
@@ -254,7 +255,9 @@
memberWalletContractDao.increaseWalletContractBalanceById(prePaymentAmount.negate(), openFeePrice.negate(), null, walletContract.getId());
// 发送爆仓消息
- sendOrderBombMsg(holdOrderEntity.getId(), holdOrderEntity.getOpeningType(), forceClosingPrice, holdOrderEntity.getSymbol(), holdOrderEntity.getOperateNo());
+// sendOrderBombMsg(holdOrderEntity.getId(), holdOrderEntity.getOpeningType(), forceClosingPrice, holdOrderEntity.getSymbol(), holdOrderEntity.getOperateNo());
+ // 发送预估强平价
+ ThreadPoolUtils.sendWholeForceClosingPrice(submitOrderDto.getSymbol(), memberEntity);
// 计算佣金
ThreadPoolUtils.calReturnMoney(memberEntity.getId(), contractOrderEntity.getOpeningFeeAmount(), contractOrderEntity, AgentReturnEntity.ORDER_TYPE_OPEN);
@@ -553,15 +556,19 @@
return Result.fail("可平张数不足");
}
+ log.info("--->{},{}", holdOrderEntity.getSymbolCntSale(), wholeCloseOrderDto.getCount());
+ int sub = holdOrderEntity.getSymbolCntSale() - wholeCloseOrderDto.getCount();
+ log.info("剩余张数:{}", sub);
// 判断当前持仓张数是否等于平仓张数，若等于则直接更新该订单为不可平状态，否则更新可平张数
- if (wholeCloseOrderDto.getCount() == holdOrderEntity.getSymbolCntSale()) {
- contractHoldOrderDao.updateHoldOrderIsCanClosingById(ContractHoldOrderEntity.ORDER_CAN_CLOSING_N, wholeCloseOrderDto.getId());
- } else {
- // 更新可平张数
- holdOrderEntity.setSymbolCntSale(holdOrderEntity.getSymbolCntSale() - wholeCloseOrderDto.getCount());
- contractHoldOrderDao.updateById(holdOrderEntity);
+ if (sub == 0) {
+ holdOrderEntity.setIsCanClosing(ContractHoldOrderEntity.ORDER_CAN_CLOSING_N);
}
+ // 更新可平张数
+ holdOrderEntity.setSymbolCntSale(sub);
+ holdOrderEntity.setSymbolCnt(sub);
+ contractHoldOrderDao.updateById(holdOrderEntity);
+
// 将待平张数放入缓存
redisUtils.set(AppContants.CLOSING_ORDER_PREFIX + holdOrderEntity.getId(), wholeCloseOrderDto.getCount());
--
Gitblit v1.9.1