From c5b488df437af1edb49daec97b5e7b04b7c6328e Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 14 Aug 2025 19:26:24 +0800
Subject: [PATCH] 1

---
 trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 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 00de97a..8a8377d 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
@@ -115,24 +115,26 @@
      */
     public void settle(ContractOrder order, String profit_loss, BigDecimal currentPrice, List<ContractOrder> partyContractOrders) {
 
-
-
         Item item = itemService.findBySymbol(order.getSymbol());
 
-        /*
-         * 根据偏 差点数和手数算出盈亏金额
-         */
-        /**
-         * 偏差点位
-         */
-        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());
-        }
 
+        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());
+            }
+        }
 
         double faceValue = 0.01; // 合约面值(固定面值不能调整)
         double maintenanceMarginRate = 0.004; // 维持保证金率(固定不变)

--
Gitblit v1.9.3