From 08133a4fa45cb8ed3da68fea587c6e3199743918 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 29 Jan 2021 17:25:44 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 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 fcd2cd8..76b3c28 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
@@ -197,9 +197,6 @@
             if (i > 0) {
                 memberWalletContractDao.increaseWalletContractBalanceById(prePaymentAmount.negate(), openFeePrice.negate(), null, walletContract.getId());
 
-                // 全仓爆仓
-                ThreadPoolUtils.sendWholePrice(memberEntity.getId());
-
                 // 发送预估强平价
                 ThreadPoolUtils.sendWholeForceClosingPrice(submitOrderDto.getSymbol(), memberEntity);
                 // 计算佣金
@@ -211,6 +208,9 @@
                 } else {
                     LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), prePaymentAmount, walletContract.getAvailableBalance().subtract(prePaymentAmount), submitOrderDto.getSymbol(), "买跌持仓", "买跌:" + submitOrderDto.getSymbol());
                 }
+
+                // 全仓爆仓
+                ThreadPoolUtils.sendWholePrice(memberEntity.getId());
 
                 // 提交成功
                 return Result.ok(MessageSourceUtils.getString("member_service_0024"));
@@ -262,6 +262,9 @@
                 LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), prePaymentAmount, walletContract.getAvailableBalance().subtract(prePaymentAmount), submitOrderDto.getSymbol(), "买跌持仓", "买跌:" + submitOrderDto.getSymbol());
             }
 
+            // 全仓爆仓
+            ThreadPoolUtils.sendWholePrice(memberEntity.getId());
+
             // 提交成功
             return Result.ok(MessageSourceUtils.getString("member_service_0024"));
         }

--
Gitblit v1.9.1