From 367f8e26e9b8e267f7cf7f1ea4a6b3694b773c0c Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 23 May 2024 01:32:25 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserPositionServiceImpl.java |   17 ++++-------------
 1 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 5b6c5ce..ba92dc0 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -349,23 +349,14 @@
     @Override
     public ServerResponse allSell(HttpServletRequest request,String stockType) throws Exception{
         //判断股票是否在可交易时间段
-        User user =    iUserService.getCurrentUser(request);
+        User user = iUserService.getCurrentUser(request);
         QueryWrapper<UserPosition> queryWrapper = new QueryWrapper<>();
-        if(stockType.equals(EStockType.US.getCode())){
-            queryWrapper.eq("user_id",user.getId());
-            queryWrapper.isNull("sell_order_id");
-            queryWrapper.or().eq("stock_gid",EStockType.US.getCode());
-
-        }else{
-            queryWrapper.eq("user_id",user.getId());
-            queryWrapper.eq("stock_gid",stockType);
-            queryWrapper.isNull("sell_order_id");
-        }
-
+        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,request);
+            sell(userPositionList.get(i).getPositionSn(), 0);
         }
         return ServerResponse.createBySuccessMsg("平仓成功!");
     }

--
Gitblit v1.9.3