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/service/impl/UserPositionServiceImpl.java |   63 +++++++++++++++++++++++++------
 1 files changed, 50 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 fc19500..353a09f 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -117,6 +117,9 @@
     @Autowired
     UserPositionCheckDzService userPositionCheckDzService;
 
+    @Resource
+    StockBuySettingMapper stockBuySettingMapper;
+
 
 
     @Transactional(rollbackFor = Exception.class)
@@ -152,14 +155,27 @@
                 if(buyNum<Integer.parseInt(mainBuyConfig.getCValue())){
                     return ServerResponse.createByErrorMsg("最低购买数量"+mainBuyConfig.getCValue(), request);
                 }*/
-                //最低购买数量 US 10 其他1000
-                Integer minBuyNum = 10;
-                if (!stock.getStockType().equals(EStockType.US.getCode())) {
+                //最低购买数量 US 10 印度100 香港台湾1000
+                /*Integer minBuyNum;
+                if (stock.getStockType().equals(EStockType.US.getCode())) {
+                    minBuyNum = 10;
+                } else if (stock.getStockType().equals(EStockType.IN.getCode())) {
+                    minBuyNum = 100;
+                } else {
                     minBuyNum = 1000;
                 }
                 if(buyNum < minBuyNum){
                     return ServerResponse.createByErrorMsg("最低购买数量" + minBuyNum, request);
+                }*/
+
+                StockBuySetting stockBuySetting = stockBuySettingMapper.selectOne(new QueryWrapper<StockBuySetting>().eq("accets_type", stock.getStockType()));
+                if (stockBuySetting != null && stockBuySetting.getHandsNum() != null && stockBuySetting.getStockNum() != null) {
+                    if(buyNum < stockBuySetting.getHandsNum()){
+                        return ServerResponse.createByErrorMsg("最低购买手数" + stockBuySetting.getHandsNum(), request);
+                    }
+                    buyNum = buyNum * stockBuySetting.getStockNum();
                 }
+
 
                 UserAssets userAssets = iUserAssetsServices.assetsByTypeAndUserId(stock.getStockType(), user.getId());
                 StockConfig maxBuyConfig =  iStockConfigServices.queryByKey(EConfigKey.MAX_BUY.getCode());
@@ -470,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);
+        }
     }
 
     //用户追加保证金操作
@@ -1469,7 +1505,7 @@
 
             userPosition.setOrderStayDays(Integer.valueOf(0));
             userPosition.setOrderStayFee(new BigDecimal("0"));
-            userPosition.setAmountToBeCovered(amountToBeCovered);
+            //userPosition.setAmountToBeCovered(amountToBeCovered);
             userPosition.setNewId(stockSubscribe.getNewlistId());
             int ret = 0;
             ret = this.userPositionMapper.insert(userPosition);
@@ -2159,20 +2195,21 @@
                     }else{
                         userPositionVO.setProfitAndLose(userPositionVO.getProfitAndLose().multiply(new BigDecimal(userPositionVO.getOrderLever())));
                     }
+                    BigDecimal nowPriceSUM = nowPrice.multiply(BigDecimal.valueOf(position.getOrderNum()));
                     if (position.getStockGid().equals(EStockType.US.getCode())) {
-                        usMarketValue = usMarketValue.add(nowPrice);
+                        usMarketValue = usMarketValue.add(nowPriceSUM);
                         usPositionEarnings = usPositionEarnings.add(userPositionVO.getProfitAndLose());
                         usPositionEarningsParent = usPositionEarningsParent.add(userPositionVO.getProfitAndLoseParent2());
                     } else if(position.getStockGid().equals(EStockType.HK.getCode())) {
-                        hkMarketValue = hkMarketValue.add(nowPrice);
+                        hkMarketValue = hkMarketValue.add(nowPriceSUM);
                         hkPositionEarnings = hkPositionEarnings.add(userPositionVO.getProfitAndLose());
                         hkPositionEarningsParent = hkPositionEarningsParent.add(userPositionVO.getProfitAndLoseParent2());
                     } else if(position.getStockGid().equals(EStockType.IN.getCode())) {
-                        inMarketValue = inMarketValue.add(nowPrice);
+                        inMarketValue = inMarketValue.add(nowPriceSUM);
                         inPositionEarnings = inPositionEarnings.add(userPositionVO.getProfitAndLose());
                         inPositionEarningsParent = inPositionEarningsParent.add(userPositionVO.getProfitAndLoseParent2());
                     } else if(position.getStockGid().equals(EStockType.TW.getCode())) {
-                        twMarketValue = twMarketValue.add(nowPrice);
+                        twMarketValue = twMarketValue.add(nowPriceSUM);
                         twPositionEarnings = twPositionEarnings.add(userPositionVO.getProfitAndLose());
                         twPositionEarningsParent = twPositionEarningsParent.add(userPositionVO.getProfitAndLoseParent2());
                     }

--
Gitblit v1.9.3