From 96e443a77b1d425d3e536c288fc271fe182f1496 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 18 Jul 2025 18:31:44 +0800
Subject: [PATCH] app股票列表修改

---
 src/main/java/com/nq/utils/UserPointUtil.java |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 54 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/nq/utils/UserPointUtil.java b/src/main/java/com/nq/utils/UserPointUtil.java
index 8ae2780..ac5f782 100644
--- a/src/main/java/com/nq/utils/UserPointUtil.java
+++ b/src/main/java/com/nq/utils/UserPointUtil.java
@@ -66,6 +66,29 @@
         return userPositionVO;
     }
 
+
+    /**
+     * 返回当前 仓位表 实时数据
+     * */
+    public  static  UserPositionVO assembleUserPositionVO2(UserPositionVO userPositionVO,BigDecimal nowPrice) {
+        PositionProfitVO positionProfitVO = getPositionProfitVO2(userPositionVO, nowPrice);
+        BigDecimal ss =  positionProfitVO.getProfitAndLose().divide(userPositionVO.getOrderTotalPrice(),BigDecimal.ROUND_CEILING)
+                .multiply(new BigDecimal(100));
+        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())){
+            userPositionVO.setNow_price(nowPrice.toString());
+        }else{
+            userPositionVO.setNow_price(userPositionVO.getSellOrderPrice().toString());
+        }
+        userPositionVO.setAmountToBeCovered(userPositionVO.getAmountToBeCovered());
+        return userPositionVO;
+    }
+
+
     /**
      * 计算仓位盈亏计算方法
      * */
@@ -96,4 +119,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