From 91f82652d3a19efa3da0be659aa8954bbde2c712 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Tue, 28 Oct 2025 14:03:59 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserPositionServiceImpl.java |   30 +++++++++++++++++++++++++-----
 1 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 685f6d0..353a09f 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -486,18 +486,38 @@
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public ServerResponse allSell(HttpServletRequest request, String stockType) throws Exception {
-        //判断股票是否在可交易时间段
+    public ServerResponse allSell(HttpServletRequest request) throws Exception {
         User user = iUserService.getCurrentUser(request);
         QueryWrapper<UserPosition> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id", user.getId());
         queryWrapper.isNull("sell_order_id");
 
         List<UserPosition> userPositionList = userPositionMapper.selectList(queryWrapper);
-        for (int i = 0; i < userPositionList.size(); i++) {
-            sell(userPositionList.get(i).getPositionSn(), 0);
+
+        // 如果没有需要平仓的持仓
+        if (userPositionList.isEmpty()) {
+            return ServerResponse.createBySuccessMsg("没有需要平仓的持仓订单");
         }
-        return ServerResponse.createBySuccessMsg("平仓成功!");
+
+        // 收集所有提示信息
+        List<String> successMessages = new ArrayList<>();
+        List<String> errorMessages = new ArrayList<>();
+
+        for (UserPosition position : userPositionList) {
+            ServerResponse response = sell(position.getPositionSn(), 0, position.getOrderNum(), request);
+
+            if (response.getStatus() == 0) {
+                // 失败的情况
+                errorMessages.add("订单号:" + position.getPositionSn() + " 失败,原因:" + response.getMsg());
+            }
+        }
+
+        // 根据是否有错误返回不同的状态
+        if (!errorMessages.isEmpty()) {
+            return ServerResponse.createByErrorMsg(errorMessages.toString(), request);
+        } else {
+            return ServerResponse.createBySuccessMsg("平仓成功!", request);
+        }
     }
 
     //用户追加保证金操作

--
Gitblit v1.9.3