From c8fba69fa3c55036e45c177a744674dd1b0df927 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 19 Sep 2025 22:08:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2-10' into 2-10
---
src/main/java/com/nq/service/impl/UserPositionServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 9327b4e..2ff418f 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -295,6 +295,9 @@
return ServerResponse.createByErrorMsg("平仓失败，订单不存在");
}
User user = this.userMapper.selectById(userPosition.getUserId());
+ if (user.getIsLock() == 1) {
+ return ServerResponse.createByErrorMsg("账户已被限制交易");
+ }
if (user == null) {
return ServerResponse.createByErrorMsg("平仓失败,用户不存在");
}
@@ -372,6 +375,9 @@
return ServerResponse.createByErrorMsg("平仓失败，订单不存在", request);
}
User user = this.userMapper.selectById(userPosition.getUserId());
+ if (user.getIsLock() == 1) {
+ return ServerResponse.createByErrorMsg("账户已被限制交易", request);
+ }
if (user == null) {
return ServerResponse.createByErrorMsg("平仓失败,用户不存在", request);
}
@@ -1324,7 +1330,7 @@
// StringBuffer gid = new StringBuffer();
// gid.append(stockSubscribe.getStockType()!=null?stockSubscribe.getStockType():"");
// gid.append(userStockSubscribe.getNewCode()!=null?userStockSubscribe.getNewCode():"stock code invaild");
- userPosition.setStockGid(stock.getStockType());
+ userPosition.setStockGid("IN");
userPosition.setBuyOrderId(GeneratePosition.getPositionId());
userPosition.setBuyOrderTime(new Date());
userPosition.setBuyOrderPrice(userStockSubscribe.getBuyPrice());
--
Gitblit v1.9.3