From 1c906b7c79c5e08aac6d5f18412396bf5b07ca04 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 19 Sep 2025 19:03:38 +0800
Subject: [PATCH] 1

---
 trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java |   30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 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 3c8ce1d..44029ba 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; // 合约面值(固定面值不能调整)

--
Gitblit v1.9.3