From 01aa2cc5c8fafd89ff763bfb0016c4983ff79648 Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Fri, 05 Jun 2020 19:33:20 +0800
Subject: [PATCH] Merge branch 'master' of https://chonggaoxiao:xcg523511090712@gitee.com/chonggaoxiao/new_excoin.git
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 fdbcec5..f63eb5a 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
@@ -191,14 +191,15 @@
BigDecimal totalReturn = BigDecimal.ZERO;
contractOrderService.save(contractOrderEntity);
- contractEntrustOrderService.removeById(order.getId());
+ contractHoldOrderService.removeById(order.getId());
// 将需要退回的减去手续费
BigDecimal needReturn = prePrice.add(profitLossPrice);
//总退回金额=保证金+收益-手续费
totalReturn = needReturn.subtract(contractOrderEntity.getClosingFeeAmount());
// 总的是收益-平仓手续费
BigDecimal totalBalance = profitLossPrice.subtract(contractOrderEntity.getClosingFeeAmount());
- memberWalletContractService.increaseWalletContractBalanceById(totalBalance, totalReturn, null, wallet.getId());
+
+ memberWalletContractService.increaseWalletContractBalanceById(totalReturn, totalBalance, null, wallet.getId());
// 流水记录 TODO 531e
insertAccountFlow(order, wallet, profitLossPrice, "止盈平仓");
@@ -287,8 +288,8 @@
// 更新钱包
// 总的是收益-平仓手续费
BigDecimal totalBalance = profitLossPrice.subtract(contractOrderEntity.getClosingFeeAmount());
- memberWalletContractService.increaseWalletContractBalanceById(totalBalance, totalReturn, null, wallet.getId());
+ memberWalletContractService.increaseWalletContractBalanceById(totalReturn, totalBalance, null, wallet.getId());
insertAccountFlow(order, wallet, profitLossPrice, "止盈平仓");
@@ -369,6 +370,8 @@
contractOrderEntity.setClosingType(8);
BigDecimal totalReturn = BigDecimal.ZERO;
contractOrderService.save(contractOrderEntity);
+
+ contractHoldOrderService.removeById(order.getId());
// 将需要退回的减去手续费
BigDecimal needReturn = prePrice.add(profitLossPrice);
//总退回金额=保证金+收益-手续费
@@ -376,7 +379,8 @@
// 更新钱包
// 总的是收益-平仓手续费
BigDecimal totalBalance = profitLossPrice.subtract(contractOrderEntity.getClosingFeeAmount());
- memberWalletContractService.increaseWalletContractBalanceById(totalBalance, totalReturn, null, wallet.getId());
+
+ memberWalletContractService.increaseWalletContractBalanceById(totalReturn, totalBalance, null, wallet.getId());
insertAccountFlow(order, wallet, profitLossPrice, "开多止损平仓");
@@ -420,7 +424,7 @@
String symbol = order.getSymbol();
Long memberId = order.getMemberId();
// 本次需要退回的预付款
- BigDecimal prePrice = order.getPrePaymentAmount();
+ BigDecimal prePrice = order.getBondAmount();
MemberWalletContractEntity wallet = memberWalletContractService.findWalletContractByMemberIdAndSymbol(memberId, "USDT");
if (wallet != null) {
@@ -456,6 +460,9 @@
contractOrderEntity.setClosingType(9);
BigDecimal totalReturn = BigDecimal.ZERO;
contractOrderService.save(contractOrderEntity);
+
+ contractHoldOrderService.removeById(order.getId());
+
// 将需要退回的减去手续费
BigDecimal needReturn = prePrice.add(profitLossPrice);
//总退回金额=保证金+收益-手续费
@@ -463,7 +470,7 @@
// 更新钱包
// 总的是收益-平仓手续费
BigDecimal totalBalance = profitLossPrice.subtract(contractOrderEntity.getClosingFeeAmount());
- memberWalletContractService.increaseWalletContractBalanceById(totalBalance, totalReturn, null, wallet.getId());
+ memberWalletContractService.increaseWalletContractBalanceById(totalReturn, totalBalance, null, wallet.getId());
insertAccountFlow(order, wallet, profitLossPrice, "开空止损平仓");
@@ -547,6 +554,7 @@
contractOrderEntity.setEntrustOpeningPrice(coinsCoinsOrder.getEntrustPrice());
contractOrderEntity.setEntrustTime(coinsCoinsOrder.getCreateTime());
contractOrderEntity.setOpeningTime(new Date());
+
contractOrderEntity.setId(null);
contractOrderService.save(contractOrderEntity);
// 发送爆仓的队列
--
Gitblit v1.9.1