From 5677479567a47c14ee091770170e4c7e01bbf31c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 29 Aug 2020 17:17:04 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java | 194 +++++++++++++++++++++++++++++++++---------------
1 files changed, 133 insertions(+), 61 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 11f89a0..f26a9b1 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
@@ -143,28 +143,34 @@
}
for (ContractHoldOrderEntity order : orderList) {
Long orderId = order.getId();
- System.out.println("开多止盈订单号：" + order.getOrderNo());
- System.out.println("传来的止盈价格：" + modelMap.get(order.getId()));
+ log.info("开多止盈订单号：" + order.getOrderNo());
+ log.info("传来的止盈价格：" + modelMap.get(order.getId()));
if (null != order.getStopProfitPrice()) {
BigDecimal closePrice = order.getStopProfitPrice();
BigDecimal queuePrice = modelMap.get(order.getId());
- System.out.println("订单的止盈价格：" + closePrice);
+ log.info("订单的止盈价格：" + closePrice);
// 判断 保留七位是为了忽略以为小数 防止不精确导致的不相等
if (queuePrice.compareTo(closePrice) != 0) {
// 不能止盈
- System.out.println("数据库价格：" + queuePrice.toPlainString() + "--价格不能止盈：" + closePrice);
+ log.info("数据库价格：" + queuePrice.toPlainString() + "--价格不能止盈：" + closePrice);
//更新数据
contractHoldOrderService.updateOrderIsCanClosingAndBatchNoById(orderId);
continue;
}
- System.out.println("执行操作");
+ log.info("执行操作");
// 止盈价
String symbol = order.getSymbol();
// 本次需要退回的保证金
BigDecimal prePrice = order.getBondAmount();
Long memberId = order.getMemberId();
- MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
+ MemberWalletContractEntity wallet;
+ if (order.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
+ wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
+ } else {
+ wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeConvert.convertContractTypeToCoin(order.getSymbol()));
+ }
+
if (wallet != null) {
// 历史订单
ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(order);
@@ -192,7 +198,7 @@
// profitLossPrice = profitLossPrice.multiply(BigDecimal.ONE.add(tradeSetting.getProfitParam()));
}
}
- //回报率
+ // 回报率
BigDecimal returnRate = profitLossPrice.divide((order.getBondAmount().subtract(contractOrderEntity.getOpeningFeeAmount())), 8, BigDecimal.ROUND_DOWN);
contractOrderEntity.setRewardAmount(profitLossPrice);
contractOrderEntity.setRewardRatio(returnRate);
@@ -257,7 +263,12 @@
// 本次需要退回的预付款
BigDecimal prePrice = order.getBondAmount();
Long memberId = order.getMemberId();
- MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
+ MemberWalletContractEntity wallet;
+ if (order.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
+ wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
+ } else {
+ wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeConvert.convertContractTypeToCoin(order.getSymbol()));
+ }
if (wallet != null) {
// 历史订单
ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(order);
@@ -351,7 +362,12 @@
Long memberId = order.getMemberId();
// 本次需要退回的预付款
BigDecimal prePrice = order.getBondAmount();
- MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
+ MemberWalletContractEntity wallet;
+ if (order.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
+ wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
+ } else {
+ wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeConvert.convertContractTypeToCoin(order.getSymbol()));
+ }
if (wallet != null) {
// 历史订单
@@ -442,7 +458,12 @@
Long memberId = order.getMemberId();
// 本次需要退回的预付款
BigDecimal prePrice = order.getBondAmount();
- MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
+ MemberWalletContractEntity wallet;
+ if (order.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
+ wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
+ } else {
+ wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeConvert.convertContractTypeToCoin(order.getSymbol()));
+ }
if (wallet != null) {
// 历史订单
@@ -614,7 +635,7 @@
// 手续费
BigDecimal openFeePrice = CalculateUtil.getOpenFeePrice(entrustOrder.getEntrustPrice(), entrustOrder.getSymbolSku(), entrustOrder.getSymbolCnt(), tradeSettingEntity.getFeeRatio());
- ContractHoldOrderEntity wholeHoldOrder = contractHoldOrderDao.selectWholeHoldOrderByOrderType(entrustOrder.getMemberId(), entrustOrder.getEntrustType());
+ ContractHoldOrderEntity wholeHoldOrder = contractHoldOrderDao.selectWholeHoldOrderByOrderType(entrustOrder.getMemberId(), entrustOrder.getEntrustType(), entrustOrder.getSymbol());
// 判断持仓是否存在，若不存在则创建新的持仓订单
if (wholeHoldOrder == null) {
log.info("持仓不存在");
@@ -685,7 +706,7 @@
wholeHoldOrder.setBondAmount(wholeHoldOrder.getBondAmount().add(bondAmount));
wholeHoldOrder.setPrePaymentAmount(prePaymentAmount);
wholeHoldOrder.setOperateNo(wholeHoldOrder.getOperateNo() + 1);
- contractHoldOrderService.save(wholeHoldOrder);
+ contractHoldOrderService.updateById(wholeHoldOrder);
contractEntrustOrderService.removeById(entrustOrder.getId());
memberWalletContractService.increaseWalletContractBalanceById(null, openFeePrice.negate(), entrustOrder.getBondAmount().negate(), wallet.getId());
@@ -717,60 +738,111 @@
contractHoldOrderService.updateOrderIsCanClosingAndBatchNoById(orderId);
continue;
}
- boolean isDone = false;
- Long memId = coinsOrder.getMemberId();
- BigDecimal nowPrice = coinsOrder.getForceClosingPrice();
- // 创建订单(加入历史表的订单)
- ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(coinsOrder);
- //查询是否满足爆仓条件
- if (coinsOrder.getOpeningType() == ContractHoldOrderEntity.OPENING_TYPE_MORE) {
- //如果是开多,当前价小于预估强平价即为爆仓
- // 设置平仓类型 // 爆仓平多
- contractOrderEntity.setClosingType(4);
- //更新用户钱包数据
- isDone = true;
+ if (ContractEntrustOrderEntity.POSITION_TYPE_ADD == coinsOrder.getPositionType()) {
+ bombOrder(coinsOrder);
} else {
- //如果是开空，当前价大于预估强平价即为爆仓
- contractOrderEntity.setClosingType(5);
- //更新主表订单状态位为“已平仓”
- isDone = true;
+ List<ContractHoldOrderEntity> holdOrderEntities = contractHoldOrderDao.selectHoldOrderListForWholeByMemberIdAndSymbol(coinsOrder.getMemberId(), coinsOrder.getSymbol());
+ if (CollectionUtils.isNotEmpty(holdOrderEntities)) {
+ for (ContractHoldOrderEntity holdOrderEntity : holdOrderEntities) {
+ bombOrder(holdOrderEntity);
+ }
- }
- if (isDone) {
- //删除次仓订单
- contractHoldOrderService.removeById(orderId);
- // 订单状态转换
- if (ContractOrderEntity.ORDER_TYPE_OPEN_MORE == contractOrderEntity.getOrderType()) {
- contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_MORE);
- } else {
- contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_LESS);
+ MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(coinsOrder.getMemberId(), CoinTypeConvert.convertContractTypeToCoin(coinsOrder.getSymbol()));
+
+ // 流水记录 TODO
+ MemberAccountFlowEntity record = new MemberAccountFlowEntity();
+ record.setCreateTime(new Date());
+ record.setSource("系统自动平仓");
+ record.setRemark("系统自动平仓");
+ record.setBalance(BigDecimal.ZERO);
+ record.setMemberId(coinsOrder.getMemberId());
+ record.setSymbol(coinsOrder.getSymbol());
+ record.setPrice(wallet.getTotalBalance().subtract(coinsOrder.getOpeningFeeAmount()));
+ memberAccountFlowEntityDao.insert(record);
}
- //更新主表订单状态位为“已平仓”
- contractOrderEntity.setId(null);
- contractOrderEntity.setClosingPrice(nowPrice);
- contractOrderEntity.setClosingTime(new Date());
- contractOrderEntity.setClosingFeeAmount(coinsOrder.getOpeningFeeAmount());
- contractOrderEntity.setRewardAmount(coinsOrder.getBondAmount().subtract(contractOrderEntity.getOpeningFeeAmount()).negate());
- contractOrderService.save(contractOrderEntity);
-
- //更新用户钱包数据
- MemberWalletContractEntity usdt = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, "USDT");
-
- // 减去的时候用负数
- BigDecimal totalPrice = coinsOrder.getBondAmount().negate();
- memberWalletContractService.increaseWalletContractBalanceById(null, totalPrice, null, usdt.getId());
- // 流水记录 TODO
- MemberAccountFlowEntity record = new MemberAccountFlowEntity();
- record.setCreateTime(new Date());
- record.setSource("系统自动平仓");
- record.setRemark("系统自动平仓");
- record.setBalance(usdt.getAvailableBalance());
- record.setMemberId(memId);
- record.setSymbol(coinsOrder.getSymbol());
- record.setPrice(coinsOrder.getBondAmount());
- memberAccountFlowEntityDao.insert(record);
}
+
+ }
+ }
+ }
+
+ private void bombOrder(ContractHoldOrderEntity coinsOrder) {
+ Long orderId = coinsOrder.getId();
+ boolean isDone = false;
+ Long memId = coinsOrder.getMemberId();
+ BigDecimal nowPrice = coinsOrder.getForceClosingPrice();
+ // 创建订单(加入历史表的订单)
+ ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(coinsOrder);
+
+ //查询是否满足爆仓条件
+ if (coinsOrder.getOpeningType() == ContractHoldOrderEntity.OPENING_TYPE_MORE) {
+ //如果是开多,当前价小于预估强平价即为爆仓
+ // 设置平仓类型 // 爆仓平多
+ contractOrderEntity.setClosingType(4);
+ //更新用户钱包数据
+ isDone = true;
+ } else {
+ //如果是开空，当前价大于预估强平价即为爆仓
+ contractOrderEntity.setClosingType(5);
+ //更新主表订单状态位为“已平仓”
+ isDone = true;
+
+ }
+ if (isDone) {
+ //删除次仓订单
+ contractHoldOrderService.removeById(orderId);
+ // 订单状态转换
+ if (ContractOrderEntity.ORDER_TYPE_OPEN_MORE == contractOrderEntity.getOrderType()) {
+ contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_MORE);
+ } else {
+ contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_LESS);
+ }
+ //更新主表订单状态位为“已平仓”
+ contractOrderEntity.setId(null);
+ contractOrderEntity.setClosingPrice(nowPrice);
+ contractOrderEntity.setClosingTime(new Date());
+ contractOrderEntity.setClosingFeeAmount(coinsOrder.getOpeningFeeAmount());
+
+ if (coinsOrder.getPositionType() == ContractEntrustOrderEntity.POSITION_TYPE_ADD) {
+ contractOrderEntity.setRewardAmount(coinsOrder.getBondAmount().subtract(contractOrderEntity.getOpeningFeeAmount()).negate());
+ contractOrderService.save(contractOrderEntity);
+
+ //更新用户钱包数据
+ MemberWalletContractEntity usdt = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, "USDT");
+
+ // 减去的时候用负数
+ BigDecimal totalPrice = coinsOrder.getBondAmount().negate();
+ memberWalletContractService.increaseWalletContractBalanceById(null, totalPrice, null, usdt.getId());
+
+ // 流水记录 TODO
+ MemberAccountFlowEntity record = new MemberAccountFlowEntity();
+ record.setCreateTime(new Date());
+ record.setSource("系统自动平仓");
+ record.setRemark("系统自动平仓");
+ record.setBalance(usdt.getAvailableBalance());
+ record.setMemberId(memId);
+ record.setSymbol(coinsOrder.getSymbol());
+ record.setPrice(coinsOrder.getBondAmount());
+ memberAccountFlowEntityDao.insert(record);
+ } else {
+ MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memId, CoinTypeConvert.convertContractTypeToCoin(coinsOrder.getSymbol()));
+
+ BigDecimal rewardRatio = BigDecimal.ZERO;
+ // 开多
+ if (ContractHoldOrderEntity.OPENING_TYPE_MORE == coinsOrder.getOpeningType()) {
+ // (最新价-开仓价)*规格*张数
+ rewardRatio = nowPrice.subtract(coinsOrder.getOpeningPrice()).multiply(coinsOrder.getSymbolSku()).multiply(new BigDecimal(coinsOrder.getSymbolCntSale()));
+ // 开空
+ } else {
+ // (开仓价-最新价)*规格*张数
+ rewardRatio = coinsOrder.getOpeningPrice().subtract(nowPrice).multiply(coinsOrder.getSymbolSku()).multiply(new BigDecimal(coinsOrder.getSymbolCntSale()));
+ }
+
+ contractOrderEntity.setRewardAmount(rewardRatio);
+ contractOrderService.save(contractOrderEntity);
+
+ memberWalletContractService.increaseWalletContractBalanceById(wallet.getAvailableBalance().negate(), wallet.getTotalBalance().negate(), null, wallet.getId());
}
}
}
--
Gitblit v1.9.1