From 20ab0322832eac0744f6fd63edcd360f8be9a54a Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Sun, 28 Sep 2025 15:18:55 +0800
Subject: [PATCH] 一键平仓

---
 src/main/java/com/nq/controller/protol/UserController.java     |    4 ++--
 src/main/java/com/nq/service/impl/UserPositionServiceImpl.java |   30 +++++++++++++++++++++++++-----
 src/main/java/com/nq/service/IUserPositionService.java         |    2 +-
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/nq/controller/protol/UserController.java b/src/main/java/com/nq/controller/protol/UserController.java
index 3f8228c..404d779 100644
--- a/src/main/java/com/nq/controller/protol/UserController.java
+++ b/src/main/java/com/nq/controller/protol/UserController.java
@@ -145,9 +145,9 @@
     //一键用户平仓操作
     @RequestMapping({"allsell.do"})
     @ResponseBody
-    public ServerResponse allsell(@RequestParam("stockType") String positionSn,HttpServletRequest request) {
+    public ServerResponse allsell(HttpServletRequest request) {
         try {
-            return this.iUserPositionService.allSell(request,positionSn);
+            return this.iUserPositionService.allSell(request);
         } catch (Exception e) {
             return  ServerResponse.createByErrorMsg("Sell Fail",request);
         }
diff --git a/src/main/java/com/nq/service/IUserPositionService.java b/src/main/java/com/nq/service/IUserPositionService.java
index 80fb389..77c5525 100644
--- a/src/main/java/com/nq/service/IUserPositionService.java
+++ b/src/main/java/com/nq/service/IUserPositionService.java
@@ -19,7 +19,7 @@
   ServerResponse sell(String paramString, int paramInt);
   ServerResponse sell(String paramString, int paramInt,Integer number,  HttpServletRequest request);
 
-  ServerResponse allSell(HttpServletRequest request,String stockType)throws  Exception;
+  ServerResponse allSell(HttpServletRequest request)throws  Exception;
   
   ServerResponse lock(Integer paramInteger1, Integer paramInteger2, String paramString);
   
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