From ff2d1f5acdadc466d7e199028ef385ae8ca277e7 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 17 Apr 2025 21:48:42 +0800
Subject: [PATCH] 1

---
 src/main/java/project/contract/internal/ContractOrderServiceImpl.java |   23 +----------------------
 1 files changed, 1 insertions(+), 22 deletions(-)

diff --git a/src/main/java/project/contract/internal/ContractOrderServiceImpl.java b/src/main/java/project/contract/internal/ContractOrderServiceImpl.java
index 2984582..63378f2 100644
--- a/src/main/java/project/contract/internal/ContractOrderServiceImpl.java
+++ b/src/main/java/project/contract/internal/ContractOrderServiceImpl.java
@@ -240,12 +240,6 @@
 
 		moneyLogService.save(moneylog);
 
-		order.setState(ContractOrder.STATE_CREATED);
-		order.setVolume(0D);
-		order.setDeposit(0);
-		order.setClose_time(new Date());
-		update(order);
-
 		/**
 		 * 合约产品平仓后添加当前流水
 		 */
@@ -343,7 +337,7 @@
 			order.setState(ContractOrder.STATE_CREATED);
 			order.setClose_time(new Date());
 		}
-
+		update(order);
 		return profit;
 
 	}
@@ -522,21 +516,6 @@
 		} else {
 			map.put("profit", df.format(order.getProfit()));
 		}
-//		double currentPrice = Double.parseDouble(map.get("trade_avg_price").toString());
-//
-//		double leve = Double.parseDouble(map.get("lever_rate").toString());
-//		//得到强平价格
-//		if(null != map.get("direction")){
-//			double liquidationPrice;
-//			if(map.get("direction").equals("sell")){
-//				liquidationPrice = currentPrice * (1 + (1 / leve));
-//			}else{
-//				liquidationPrice = currentPrice * (1 - 1 / leve);
-//			}
-//			DecimalFormat dfs = new DecimalFormat("#.#####");
-//			String formattedPrice = dfs.format(liquidationPrice);
-//			map.put("qiangPing",formattedPrice);
-//		}
 
 		double depositOpen =  Double.parseDouble(map.get("deposit_open").toString());
 		double leverRate = Double.parseDouble(map.get("lever_rate").toString());

--
Gitblit v1.9.3