From a2dc849bc20bffaa4ad45d68e401d3892ace24b3 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 04 Jul 2025 22:21:20 +0800
Subject: [PATCH] 1
---
trading-order-bean/src/main/java/com/yami/trading/bean/contract/domain/ContractOrder.java | 48 ++++++++++++++++++++++++++++++------------------
1 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/trading-order-bean/src/main/java/com/yami/trading/bean/contract/domain/ContractOrder.java b/trading-order-bean/src/main/java/com/yami/trading/bean/contract/domain/ContractOrder.java
index c7a844f..879d2a2 100644
--- a/trading-order-bean/src/main/java/com/yami/trading/bean/contract/domain/ContractOrder.java
+++ b/trading-order-bean/src/main/java/com/yami/trading/bean/contract/domain/ContractOrder.java
@@ -133,6 +133,11 @@
private String orderPriceType;
+ /**
+ * 仓位类型：0：逐仓 1：全仓
+ */
+ private Integer locationType = 1;
+
public BigDecimal getAmountClose() {
if(amountClose == null){
amountClose = BigDecimal.ZERO;
@@ -178,25 +183,32 @@
}
public BigDecimal getChangeRatio() {
- if(amountClose == null){
- amountClose = BigDecimal.ZERO;
- }
- if(profit == null){
- profit = BigDecimal.ZERO;
- }
- if(deposit == null){
- deposit = BigDecimal.ZERO;
- }
- if(depositOpen == null){
- depositOpen = BigDecimal.ZERO;
- }
- if (STATE_SUBMITTED.equals(state)) {
- changeRatio = amountClose.add(profit).add(deposit).subtract(depositOpen).divide(depositOpen,10 , RoundingMode.HALF_UP);
- } else {
- changeRatio = amountClose.add(deposit).subtract(depositOpen).divide(depositOpen, 10 , RoundingMode.HALF_UP);
- }
+// if(amountClose == null){
+// amountClose = BigDecimal.ZERO;
+// }
+// if(profit == null){
+// profit = BigDecimal.ZERO;
+// }
+// if(deposit == null){
+// deposit = BigDecimal.ZERO;
+// }
+// if(depositOpen == null){
+// depositOpen = BigDecimal.ZERO;
+// }
+// if (STATE_SUBMITTED.equals(state)) {
+// changeRatio = amountClose.add(profit).add(deposit).subtract(depositOpen).divide(depositOpen,10 , RoundingMode.HALF_UP);
+// } else {
+// changeRatio = amountClose.add(deposit).subtract(depositOpen).divide(depositOpen, 10 , RoundingMode.HALF_UP);
+// }
+//
+// changeRatio = changeRatio.multiply(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP);
+ // 计算收益率，指定除法时的精度
+ BigDecimal changeRatio = profit.divide(depositOpen, 10, BigDecimal.ROUND_DOWN) // 设置精度为10位
+ .multiply(new BigDecimal("100"));
- changeRatio = changeRatio.multiply(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_HALF_UP);
+ // 保留两位小数
+ changeRatio = changeRatio.setScale(2, BigDecimal.ROUND_DOWN);
+
return changeRatio;
}
--
Gitblit v1.9.3