From 4afdfe3c9b53bf1cfa1a1c694e721d8e99789494 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 28 Apr 2026 16:46:18 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java | 4 +++-
trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java | 38 ++++++++++++++++++++------------------
2 files changed, 23 insertions(+), 19 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 83a9d99..2d1416c 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
@@ -249,7 +249,9 @@
*/
//重新计算强平
BigDecimal forceClosePrice = new BigDecimal(order.getForceClosePrice());
- if (currentPrice.compareTo(new BigDecimal(order.getForceClosePrice())) <= 0) {//达到强平价
+ //达到强平价
+ if ((ContractOrder.DIRECTION_BUY.equals(order.getDirection()) && currentPrice.compareTo(new BigDecimal(order.getForceClosePrice())) <= 0)
+ || (ContractOrder.DIRECTION_SELL.equals(order.getDirection()) && currentPrice.compareTo(new BigDecimal(order.getForceClosePrice())) >= 0)) {
BigDecimal point = forceClosePrice.subtract(order.getTradeAvgPrice());
BigDecimal amount = point.multiply(new BigDecimal("0.01")).multiply(order.getVolumeOpen()).setScale(4, BigDecimal.ROUND_DOWN);
if (ContractOrder.DIRECTION_BUY.equals(order.getDirection())) {
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 cf20876..49e520d 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
@@ -531,30 +531,32 @@
BigDecimal close = realtime.getClose();
BigDecimal point = close.subtract(order.getTradeAvgPrice());
BigDecimal profit = point.multiply(new BigDecimal("0.01")).multiply(order.getVolumeOpen()).setScale(4, BigDecimal.ROUND_DOWN);;
- if (order.getForceClosePrice() != null && !order.getForceClosePrice().isEmpty() &&
- close.compareTo(new BigDecimal(order.getForceClosePrice())) <= 0) { //达到强平价
- point = new BigDecimal(order.getForceClosePrice()).subtract(order.getTradeAvgPrice());
- 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);
- 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);
- } else{
- order.setProfit(profit.negate());
+ if (order.getForceClosePrice() != null && !order.getForceClosePrice().isEmpty()) { //达到强平价
+ if ((ContractOrder.DIRECTION_BUY.equals(order.getDirection()) && close.compareTo(new BigDecimal(order.getForceClosePrice())) <= 0)
+ || (ContractOrder.DIRECTION_SELL.equals(order.getDirection()) && close.compareTo(new BigDecimal(order.getForceClosePrice())) >= 0)) {
+ point = new BigDecimal(order.getForceClosePrice()).subtract(order.getTradeAvgPrice());
+ 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);
+ 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(null != order.getProfitLossRatio() && order.getProfitLossRatio() > 0){
profit = order.getDepositOpen().multiply(new BigDecimal((order.getProfitLossRatio()/100))).setScale(2, RoundingMode.DOWN);
}
- BigDecimal rentalProfit = order.getDepositOpen().add(profit).add(order.getAddDepositOpen());
+ if (ContractOrder.DIRECTION_BUY.equals(order.getDirection())) {
+ order.setProfit(profit);
+ } else{
+ order.setProfit(profit.negate());
+ }
+ BigDecimal rentalProfit = order.getDepositOpen().add(order.getProfit()).add(order.getAddDepositOpen());
System.out.println("------------------rentalProfit------------:"+rentalProfit);
BigDecimal rate = volume.divide(order.getVolumeOpen(), 2, RoundingMode.HALF_UP);
order.setAmountClose(order.getAmountClose().add(profit));
--
Gitblit v1.9.3