From c759b55471f47af64a3c92a3666b0485af77c1ec Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 24 Oct 2025 18:53:53 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java | 62 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 26 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 b84693c..9ceaa38 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
@@ -118,22 +118,20 @@
Item item = itemService.findBySymbol(order.getSymbol());
- if(null != order.getProfitLossRatio()){//根据后台设置的盈亏比来
- order.setProfit(order.getDepositOpen().multiply(new BigDecimal((order.getProfitLossRatio()/100))).setScale(2, RoundingMode.DOWN));
- }else{
- /*
- * 根据偏 差点数和手数算出盈亏金额
- */
- /**
- * 偏差点位
- */
- BigDecimal point = currentPrice.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())) {
- order.setProfit(amount);
- } else{
- order.setProfit(amount.negate());
- }
+ /*
+ * 根据偏 差点数和手数算出盈亏金额
+ */
+ /**
+ * 偏差点位
+ */
+ BigDecimal point = currentPrice.subtract(order.getTradeAvgPrice());
+ BigDecimal amount = point.multiply(new BigDecimal("0.01")).multiply(order.getVolumeOpen()).setScale(4, BigDecimal.ROUND_DOWN);;
+ log.info(order.getSymbol()+"--------------当前点位:"+currentPrice);
+ log.info(order.getOrderNo()+"--------收益:"+amount);
+ if (ContractOrder.DIRECTION_BUY.equals(order.getDirection())) {
+ order.setProfit(amount);
+ } else{
+ order.setProfit(amount.negate());
}
double faceValue = 0.01; // 合约面值(固定面值不能调整)
@@ -155,14 +153,9 @@
.ne(ContractOrder::getOrderNo, order.getOrderNo())
);
- // 提前计算 currentPrice 与 order.getTradeAvgPrice() 的差值,避免重复计算
- BigDecimal priceDifference = currentPrice.subtract(order.getTradeAvgPrice());
-
- // 计算所有订单的收益
+ // 计算所有订单的收益+保证金
for (ContractOrder contractOrder : list) {
- BigDecimal profit = priceDifference
- .multiply(new BigDecimal("0.01"))
- .multiply(contractOrder.getVolumeOpen())
+ BigDecimal profit = contractOrder.getProfit().add(contractOrder.getDepositOpen())
.setScale(4, RoundingMode.DOWN);
earnings = earnings.add(profit); // 累加收益
@@ -265,9 +258,18 @@
//判断买涨还是买跌"buy":买(多) "sell":卖(空)
if(order.getDirection().equals("buy")){
if (currentPrice.compareTo(new BigDecimal(order.getForceClosePrice())) <= 0) {//达到强平价
- /**
- * 触发全仓强平
- */
+ /**
+ * 触发全仓强平
+ */
+ log.info("------------------currentPrice-------------:"+currentPrice);
+ log.info("------------------order.getForceClosePrice()-------------"+order.getForceClosePrice());
+ log.info("------------------开多强平-------------");
+
+ double number = strongLevelCalculationService.countSheets(earnings.doubleValue(), order.getLeverRate().intValue(), 0.01, order.getTradeAvgPrice().doubleValue());
+ BigDecimal qpPoint = currentPrice.subtract(order.getTradeAvgPrice());
+ BigDecimal qpAmount = qpPoint.multiply(new BigDecimal("0.01")).multiply(new BigDecimal(number)).setScale(4, BigDecimal.ROUND_DOWN);;
+ log.info(order.getOrderNo()+"--------强平收益:"+amount);
+ order.setProfit(qpAmount);
this.contractOrderService.allClose(order.getPartyId());
}
@@ -276,6 +278,14 @@
/**
* 触发全仓强平
*/
+ log.info("------------------currentPrice-------------:"+currentPrice);
+ log.info("------------------order.getForceClosePrice()-------------"+order.getForceClosePrice());
+ log.info("------------------开空强平-------------");
+ double number = strongLevelCalculationService.countSheets(earnings.doubleValue(), order.getLeverRate().intValue(), 0.01, order.getTradeAvgPrice().doubleValue());
+ BigDecimal qpPoint = currentPrice.subtract(order.getTradeAvgPrice());
+ BigDecimal qpAmount = qpPoint.multiply(new BigDecimal("0.01")).multiply(new BigDecimal(number)).setScale(4, BigDecimal.ROUND_DOWN);;
+ log.info(order.getOrderNo()+"--------强平收益:"+amount);
+ order.setProfit(qpAmount.negate());
this.contractOrderService.allClose(order.getPartyId());
}
--
Gitblit v1.9.3