From 3516d575eecce85e86805ce1e7da158f52448c2e Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Sat, 07 Mar 2026 17:54:13 +0800
Subject: [PATCH] 盈亏显示
---
trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java | 9 ++++++---
trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java | 9 ++++++---
2 files changed, 12 insertions(+), 6 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);
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java b/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java
index 9322881..cf20876 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java
@@ -537,9 +537,12 @@
profit = point.multiply(new BigDecimal("0.01")).multiply(order.getVolumeOpen()).setScale(4, BigDecimal.ROUND_DOWN);;
System.out.println("------------------point-------------："+point);
System.out.println("------------------profit------------："+profit);
- if (order.getLocationType() == 0) {
- profit = order.getDepositOpen().add(order.getAddDepositOpen()).negate();
- System.out.println("------------------扣除保证金------------："+profit);
+ profit = order.getDepositOpen().add(order.getAddDepositOpen()).negate();
+ System.out.println("------------------扣除保证金------------："+profit);
+ if (order.getLocationType() == 1) {
+ Wallet wallet = this.walletService.findByUserId(order.getPartyId());
+ System.out.println("------------------扣除余额------------："+wallet.getMoney());
+ profit = profit.subtract(wallet.getMoney());
}
if (ContractOrder.DIRECTION_BUY.equals(order.getDirection())) {
order.setProfit(profit);
--
Gitblit v1.9.3