From a3fad01004f2a3de679222394a30d3fda46cbe80 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 01 Mar 2026 14:40:17 +0800
Subject: [PATCH] 1

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

diff --git a/src/main/java/com/nq/utils/UserPointUtil.java b/src/main/java/com/nq/utils/UserPointUtil.java
index 679fcee..a9a9cc2 100644
--- a/src/main/java/com/nq/utils/UserPointUtil.java
+++ b/src/main/java/com/nq/utils/UserPointUtil.java
@@ -1,6 +1,7 @@
 package com.nq.utils;
 
 
+import com.github.pagehelper.util.StringUtil;
 import com.nq.pojo.UserPosition;
 import com.nq.vo.position.PositionProfitVO;
 import com.nq.vo.position.UserPositionVO;
@@ -51,10 +52,15 @@
         PositionProfitVO positionProfitVO = getPositionProfitVO(position,nowPrice);
        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());
+        if(StringUtil.isEmpty(userPositionVO.getSellOrderId())){
+            userPositionVO.setNow_price(nowPrice.toString());
+        }else{
+            userPositionVO.setNow_price(position.getSellOrderPrice().toString());
+        }
+        userPositionVO.setAmountToBeCovered(position.getAmountToBeCovered());
         return userPositionVO;
     }
 

--
Gitblit v1.9.3