From 9112da7b09e001e465313b163f7b72f84d8c05d3 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 26 Apr 2024 20:59:59 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserPositionServiceImpl.java |   64 ++++++++++++++++++++++----------
 1 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
index 083f08a..f29214f 100644
--- a/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserPositionServiceImpl.java
@@ -1644,10 +1644,10 @@
         }
 
         // 检查是否在交易时间内
-        if (!tradingHourService.timeCheck(position.getStockCode())) {
-            log.info("不在交易时间之内,订单id: {}", position.getId());
-            return null;
-        }
+//        if (!tradingHourService.timeCheck(position.getStockCode())) {
+//            log.info("不在交易时间之内,订单id: {}", position.getId());
+//            return null;
+//        }
 
         //判断订单
         if (1 == position.getIsLock().intValue()) {
@@ -1657,17 +1657,17 @@
 
         // 检查股票是否垫停
         Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code", position.getStockCode()));
-        if (!priceServices.isLimitDownSell(stock.getStockCode())) {
-            log.info("股票跌停,无法平仓,订单id: {}", position.getId());
-            return null;
-        }
+//        if (!priceServices.isLimitDownSell(stock.getStockCode())) {
+//            log.info("股票跌停,无法平仓,订单id: {}", position.getId());
+//            return null;
+//        }
 
         //最新报价
         BigDecimal nowPrice = priceServices.getNowPrice(position.getStockCode());
-        if (nowPrice.compareTo(BigDecimal.ZERO) <= 0) {
-            log.info("报价0,平仓失败,订单id: {}", position.getId());
-            return null;
-        }
+//        if (nowPrice.compareTo(BigDecimal.ZERO) <= 0) {
+//            log.info("报价0,平仓失败,订单id: {}", position.getId());
+//            return null;
+//        }
 
         //判断订单是否已到强制平仓价格
         BigDecimal purchaseAmount = position.getBuyOrderPrice().multiply(new BigDecimal(position.getOrderNum()));// 买入价总额
@@ -1694,24 +1694,48 @@
     }
 
     //判断平仓
-    private static boolean isLiquidation(UserPosition position, int signum, BigDecimal profit, boolean liquidation) {
+    private boolean isLiquidation(UserPosition position, int signum, BigDecimal profit, boolean liquidation) {
+        //最新报价
+        BigDecimal nowPrice = priceServices.getNowPrice(position.getStockCode());
         if(position.getOrderDirection().equals("买涨")){
+            //判断亏损金额是否达到保证金金额
+            BigDecimal negate = profit.negate();
             //如果买涨 signum 为-1则表示亏损
             if(signum == -1){
-                //判断亏损金额是否达到保证金金额
-                BigDecimal negate = profit.negate();
-                if (negate.compareTo(position.getOrderTotalPrice()) >= 0){
+                //止损
+                if(null != position.getStopTargetPrice() && nowPrice.compareTo(position.getStopTargetPrice()) >= 0){
                     //强制平仓
-                    liquidation = true;
+                    return liquidation = true;
+                }
+                if (negate.compareTo(position.getOrderTotalPrice()) >= 0){//亏平强平
+                    //强制平仓
+                    return liquidation = true;
+                }
+            }else{
+                //止盈
+                if(null != position.getProfitTargetPrice() && nowPrice.compareTo(position.getProfitTargetPrice()) >= 0){
+                    //强制平仓
+                    return liquidation = true;
                 }
             }
         }else{
             //买跌 signum
             if(signum == 1){
-                //判断亏损金额是否达到保证金金额
-                if (profit.compareTo(position.getOrderTotalPrice()) >= 0){
+                //止损
+                if(null != position.getStopTargetPrice() && profit.compareTo(position.getStopTargetPrice()) >= 0){
                     //强制平仓
-                    liquidation = true;
+                    return liquidation = true;
+                }
+                //判断亏损金额是否达到保证金金额
+                if (profit.compareTo(position.getOrderTotalPrice()) >= 0){//亏平强平
+                    //强制平仓
+                    return liquidation = true;
+                }
+            }else{
+                //止盈
+                if(null != position.getProfitTargetPrice() && profit.compareTo(position.getProfitTargetPrice()) >= 0){
+                    //强制平仓
+                    return liquidation = true;
                 }
             }
         }

--
Gitblit v1.9.3