From d8d3b097d7c41b460df91d1285e32a38e5c1bbf5 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 03 Jun 2026 15:27:37 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 7 +++++++
src/main/java/com/nq/service/impl/UserPendingorderServiceImpl.java | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserPendingorderServiceImpl.java b/src/main/java/com/nq/service/impl/UserPendingorderServiceImpl.java
index a28fe91..0cb6804 100644
--- a/src/main/java/com/nq/service/impl/UserPendingorderServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPendingorderServiceImpl.java
@@ -151,7 +151,7 @@
}
userPendingorderVO.setNowPrice(new BigDecimal(nowPrice));
userPendingorderVO.setStockName(stock.getStockName());
- userPendingorderVO.setStockId(stock.getStockCode());
+ userPendingorderVO.setStockId(stock.getStockGid() != null ? stock.getStockGid() : stock.getStockCode());
}
userPendingorderVO.setBuyNum(userPendingorder.getBuyNum());
userPendingorderVO.setBuyType(userPendingorder.getBuyType());
@@ -365,7 +365,7 @@
}
int delCount = this.userPendingorderMapper.deleteById(id);
if (delCount > 0) {
- return ServerResponse.createByErrorMsg("删除成功");
+ return ServerResponse.createBySuccessMsg("删除成功");
}
return ServerResponse.createByErrorMsg("删除失败");
}
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index aced777..180937d 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -2310,6 +2310,13 @@
userPositionVO.setAllProfitAndLoseStr(positionProfitVO.getAllProfitAndLoseStr());
userPositionVO.setOrderTotalPrice(positionProfitVO.getOrderTotalPrice());
+ if (position.getOrderLever() != null && position.getOrderLever() > 0
+ && position.getBuyOrderPrice() != null && position.getOrderNum() != null) {
+ userPositionVO.setBuyAmtAutual(
+ position.getBuyOrderPrice()
+ .multiply(new BigDecimal(position.getOrderNum()))
+ .divide(new BigDecimal(position.getOrderLever()), 2, RoundingMode.HALF_UP));
+ }
return userPositionVO;
}
--
Gitblit v1.9.3