1

zj

2024-04-26 20b8e71d1b5079dc2f32fbbf0931380ca4d5e243

 src/main/java/com/nq/service/impl/UserPositionServiceImpl.java

@@ -1172,7 +1172,7 @@
            return ServerResponse.createByErrorMsg("该新股不存在");
        }
        if (userStockSubscribe.getStatus() == 4 || userStockSubscribe.getStatus() == 3 && stockSubscribe.getType() == 2) {
            Stock stock = stockMapper.selectOne(new LambdaQueryWrapper<Stock>().eq(Stock::getStockSpell, userStockSubscribe.getNewCode()));
            Stock stock = stockMapper.selectOne(new LambdaQueryWrapper<Stock>().eq(Stock::getStockCode, userStockSubscribe.getNewCode()));
            if(null == stock){
                return ServerResponse.createByErrorMsg("该新股不存在");
            }
@@ -1617,10 +1617,6 @@
            Result result = getResult(position);
            if (result == null) continue;

            //利润为0不需要进行强制平仓
            if(result.signum == 0){
                continue;
            }
            boolean liquidation = false;
            liquidation = isLiquidation(position, result.signum, result.profit, liquidation);
            if(liquidation){
@@ -1703,7 +1699,7 @@
            //如果买涨 signum 为-1则表示亏损
            if(signum == -1){
                //止损
                if(null != position.getStopTargetPrice() && nowPrice.compareTo(position.getStopTargetPrice()) >= 0){
                if(null != position.getStopTargetPrice() && nowPrice.compareTo(position.getStopTargetPrice()) <= 0){
                    //强制平仓
                    return liquidation = true;
                }
@@ -1722,7 +1718,7 @@
            //买跌 signum
            if(signum == 1){
                //止损
                if(null != position.getStopTargetPrice() && profit.compareTo(position.getStopTargetPrice()) >= 0){
                if(null != position.getStopTargetPrice() && nowPrice.compareTo(position.getStopTargetPrice()) >= 0){
                    //强制平仓
                    return liquidation = true;
                }
@@ -1733,7 +1729,7 @@
                }
            }else{
                //止盈
                if(null != position.getProfitTargetPrice() && profit.compareTo(position.getProfitTargetPrice()) >= 0){
                if(null != position.getProfitTargetPrice() && nowPrice.compareTo(position.getProfitTargetPrice()) <= 0){
                    //强制平仓
                    return liquidation = true;
                }