From 38c8e4e9cccfead01002c6c20df6b9d5dd4a0b81 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 19 Aug 2020 16:34:02 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 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 4857cdb..cc77bc4 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
@@ -29,11 +29,9 @@
import com.xcong.excoin.modules.documentary.entity.FollowTraderInfoEntity;
import com.xcong.excoin.modules.member.dao.MemberDao;
import com.xcong.excoin.modules.member.dao.MemberLevelRateDao;
+import com.xcong.excoin.modules.member.dao.MemberSettingDao;
import com.xcong.excoin.modules.member.dao.MemberWalletContractDao;
-import com.xcong.excoin.modules.member.entity.AgentReturnEntity;
-import com.xcong.excoin.modules.member.entity.MemberEntity;
-import com.xcong.excoin.modules.member.entity.MemberLevelRateEntity;
-import com.xcong.excoin.modules.member.entity.MemberWalletContractEntity;
+import com.xcong.excoin.modules.member.entity.*;
import com.xcong.excoin.modules.platform.dao.TradeSettingDao;
import com.xcong.excoin.modules.platform.entity.PlatformTradeSettingEntity;
import com.xcong.excoin.rabbit.producer.OrderProducer;
@@ -88,6 +86,8 @@
@Resource
private MemberDao memberDao;
+ @Resource
+ private MemberSettingDao memberSettingDao;
@Resource
private FollowTraderInfoDao followTraderInfoDao;
@@ -133,12 +133,12 @@
BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(submitOrderDto.getSymbol())));
MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), CoinTypeEnum.USDT.name());
PlatformTradeSettingEntity tradeSettingEntity = cacheSettingUtils.getTradeSetting();
+
+ MemberSettingEntity memberSetting = memberSettingDao.selectMemberSettingByMemberId(memberEntity.getId());
+ BigDecimal spread = memberSetting.getSpread();
// 规格
BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(submitOrderDto.getSymbol());
- MemberEntity member = memberDao.selectById(memberEntity.getId());
- // 划点
- BigDecimal spread = member.getSpread();
// 开仓价
BigDecimal openingPrice = CalculateUtil.getOpeningPrice(submitOrderDto.getOrderType(), newPrice, spread);
@@ -162,12 +162,12 @@
BigDecimal subBondAmount = bondAmount.subtract(wholeHoldOrder.getBondAmount());
log.info("保证金差值:{}", subBondAmount);
- BigDecimal forceClosingPrice = CalculateUtil.getForceSetPriceForWhole(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(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);
@@ -288,9 +291,9 @@
// 规格
BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(submitOrderDto.getSymbol());
- MemberEntity member = memberDao.selectById(memberEntity.getId());
- // 划点
- BigDecimal spread = member.getSpread();
+ MemberSettingEntity memberSetting = memberSettingDao.selectMemberSettingByMemberId(memberEntity.getId());
+ BigDecimal spread = memberSetting.getSpread();
+
// 开仓价
BigDecimal openingPrice = CalculateUtil.getOpeningPrice(submitOrderDto.getOrderType(), newPrice, spread);
log.info("开仓价:{}", openingPrice);
--
Gitblit v1.9.1