From 28701d9c708089cd64e3dc813ad1d9079de6528a Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 11 Jan 2026 19:43:51 +0800
Subject: [PATCH] 日股，美股
---
src/main/java/com/nq/utils/UserPointUtil.java | 61 +++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nq/utils/UserPointUtil.java b/src/main/java/com/nq/utils/UserPointUtil.java
index a9a9cc2..ac1c628 100644
--- a/src/main/java/com/nq/utils/UserPointUtil.java
+++ b/src/main/java/com/nq/utils/UserPointUtil.java
@@ -7,6 +7,7 @@
import com.nq.vo.position.UserPositionVO;
import java.math.BigDecimal;
+import java.math.RoundingMode;
/**
* 仓位计算工具类
@@ -52,7 +53,9 @@
PositionProfitVO positionProfitVO = getPositionProfitVO(position,nowPrice);
BigDecimal ss = positionProfitVO.getProfitAndLose().divide(userPositionVO.getOrderTotalPrice(),BigDecimal.ROUND_CEILING)
.multiply(new BigDecimal(100));
- userPositionVO.setProfitAndLoseParent(ss.setScale(2, BigDecimal.ROUND_DOWN)+"%");
+ ss = ss.setScale(2, BigDecimal.ROUND_DOWN);
+ userPositionVO.setProfitAndLoseParent(ss+"%");
+ userPositionVO.setProfitAndLoseParent2(ss);
userPositionVO.setProfitAndLose(positionProfitVO.getProfitAndLose());
userPositionVO.setAllProfitAndLose(positionProfitVO.getAllProfitAndLose());
if(StringUtil.isEmpty(userPositionVO.getSellOrderId())){
@@ -60,9 +63,32 @@
}else{
userPositionVO.setNow_price(position.getSellOrderPrice().toString());
}
- userPositionVO.setAmountToBeCovered(position.getAmountToBeCovered());
+ //userPositionVO.setAmountToBeCovered(position.getAmountToBeCovered());
return userPositionVO;
}
+
+
+ /**
+ * 返回当前 仓位表 实时数据
+ * */
+ public static UserPositionVO assembleUserPositionVO2(UserPositionVO userPositionVO,BigDecimal nowPrice) {
+ PositionProfitVO positionProfitVO = getPositionProfitVO2(userPositionVO, nowPrice);
+ BigDecimal ss = positionProfitVO.getProfitAndLose().divide(userPositionVO.getOrderTotalPrice(), RoundingMode.CEILING)
+ .multiply(new BigDecimal(100));
+ ss = ss.setScale(2, RoundingMode.DOWN);
+ userPositionVO.setProfitAndLoseParent(ss+"%");
+ userPositionVO.setProfitAndLoseParent2(ss);
+ userPositionVO.setProfitAndLose(positionProfitVO.getProfitAndLose());
+ userPositionVO.setAllProfitAndLose(positionProfitVO.getAllProfitAndLose());
+ if(StringUtil.isEmpty(userPositionVO.getSellOrderId())){
+ userPositionVO.setNow_price(nowPrice.toString());
+ }else{
+ userPositionVO.setNow_price(userPositionVO.getSellOrderPrice().toString());
+ }
+ userPositionVO.setAmountToBeCovered(userPositionVO.getAmountToBeCovered());
+ return userPositionVO;
+ }
+
/**
* 计算仓位盈亏计算方法
@@ -94,4 +120,35 @@
positionProfitVO.setNowPrice(nowPrice.setScale(5,BigDecimal.ROUND_UP).toString());
return positionProfitVO;
}
+
+ /**
+ * 计算仓位盈亏计算方法
+ * */
+ public static PositionProfitVO getPositionProfitVO2(UserPositionVO position,BigDecimal nowPrice) {
+ BigDecimal profitAndLose = new BigDecimal("0");
+ BigDecimal allProfitAndLose = new BigDecimal("0");
+
+ if (position.getSellOrderId() != null) {
+
+ BigDecimal subPrice = position.getSellOrderPrice().subtract(position.getBuyOrderPrice());
+ profitAndLose = subPrice.multiply(new BigDecimal(position.getOrderNum().intValue()));
+ if ("买跌".equals(position.getOrderDirection())) {
+ profitAndLose = profitAndLose.negate();
+ }
+ 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()));
+ if ("买跌".equals(position.getOrderDirection())) {
+ profitAndLose = profitAndLose.negate();
+ }
+ //总盈亏= 浮动盈亏 – 手续费 – 印花税 – 留仓费 – 点差费
+ allProfitAndLose = profitAndLose.subtract(position.getOrderSpread()).subtract(position.getOrderStayFee()).subtract(position.getSpreadRatePrice());
+ }
+ PositionProfitVO positionProfitVO = new PositionProfitVO();
+ positionProfitVO.setProfitAndLose(profitAndLose);
+ positionProfitVO.setAllProfitAndLose(allProfitAndLose);
+ positionProfitVO.setNowPrice(nowPrice.setScale(5,BigDecimal.ROUND_UP).toString());
+ return positionProfitVO;
+ }
}
--
Gitblit v1.9.3