From 20b8e71d1b5079dc2f32fbbf0931380ca4d5e243 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 26 Apr 2024 23:24:13 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/utils/UserPointUtil.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nq/utils/UserPointUtil.java b/src/main/java/com/nq/utils/UserPointUtil.java
index 0e1b2a8..c89ac12 100644
--- a/src/main/java/com/nq/utils/UserPointUtil.java
+++ b/src/main/java/com/nq/utils/UserPointUtil.java
@@ -49,9 +49,9 @@
userPositionVO.setStockPlate(position.getStockPlate());
userPositionVO.setSpreadRatePrice(position.getSpreadRatePrice());
PositionProfitVO positionProfitVO = getPositionProfitVO(position,nowPrice);
- BigDecimal ss = positionProfitVO.getProfitAndLose().divide(userPositionVO.getBuyOrderPrice(),BigDecimal.ROUND_CEILING)
+ BigDecimal ss = positionProfitVO.getProfitAndLose().divide(userPositionVO.getOrderTotalPrice(),BigDecimal.ROUND_CEILING)
.multiply(new BigDecimal(100));
- userPositionVO.setProfitAndLoseParent(ss+"%");
+ userPositionVO.setProfitAndLoseParent(ss.setScale(2, BigDecimal.ROUND_DOWN)+"%");
userPositionVO.setProfitAndLose(positionProfitVO.getProfitAndLose());
userPositionVO.setAllProfitAndLose(positionProfitVO.getAllProfitAndLose());
userPositionVO.setNow_price(positionProfitVO.getNowPrice());
@@ -72,7 +72,7 @@
if ("买跌".equals(position.getOrderDirection())) {
profitAndLose = profitAndLose.negate();
}
- allProfitAndLose = profitAndLose.subtract(position.getOrderFee()).subtract(position.getOrderSpread()).subtract(position.getOrderStayFee()).subtract(position.getSpreadRatePrice());
+ allProfitAndLose = profitAndLose.subtract(position.getOrderSpread()).subtract(position.getOrderStayFee()).subtract(position.getSpreadRatePrice());
} else {
BigDecimal subPrice = nowPrice.subtract(position.getBuyOrderPrice());
profitAndLose = subPrice.multiply(new BigDecimal(position.getOrderNum().intValue()));
@@ -80,7 +80,7 @@
profitAndLose = profitAndLose.negate();
}
//总盈亏= 浮动盈亏 – 手续费 – 印花税 – 留仓费 – 点差费
- allProfitAndLose = profitAndLose.subtract(position.getOrderFee()).subtract(position.getOrderSpread()).subtract(position.getOrderStayFee()).subtract(position.getSpreadRatePrice());
+ allProfitAndLose = profitAndLose.subtract(position.getOrderSpread()).subtract(position.getOrderStayFee()).subtract(position.getSpreadRatePrice());
}
PositionProfitVO positionProfitVO = new PositionProfitVO();
positionProfitVO.setProfitAndLose(profitAndLose);
--
Gitblit v1.9.3