From 4164ba59cb88d33b191f42d3bef122f6f7af6312 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 09 Mar 2026 18:09:18 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java
index d20c18c..83a9d99 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java
@@ -257,9 +257,12 @@
} else{
order.setProfit(amount.negate());
}
- //逐仓强平利润固定-100%
- if (order.getLocationType() == 0) {
- order.setProfit(order.getDepositOpen().add(order.getAddDepositOpen()).negate());
+ //强平利润固定-100%
+ order.setProfit(order.getDepositOpen().add(order.getAddDepositOpen()).negate());
+ //全仓强平利润+账户余额
+ if (order.getLocationType() == 1) {
+ Wallet wallet = this.walletService.findByUserId(order.getPartyId());
+ order.setProfit(order.getProfit().subtract(wallet.getMoney()));
}
}
this.contractOrderService.updateByIdBuffer(order);
--
Gitblit v1.9.3