1

zj

2024-04-26 9112da7b09e001e465313b163f7b72f84d8c05d3

1

 src/main/java/com/nq/controller/protol/UserController.java

@@ -106,8 +106,8 @@
                              @RequestParam("buyType") Integer buyType,
                              @RequestParam("lever") Integer lever,
                              @RequestParam(value = "profitTarget",required = false)
                                  BigDecimal profitTarget,@RequestParam(value = "stopTarget",required = false) BigDecimal stopTarget, HttpServletRequest request) {
        return   this.iUserPositionService.buy(stockId, buyNum, buyType, lever,profitTarget,stopTarget, request);
                                  BigDecimal profitTarget,@RequestParam(value = "stopLoss",required = false) BigDecimal stopLoss, HttpServletRequest request) {
        return   this.iUserPositionService.buy(stockId, buyNum, buyType, lever,profitTarget,stopLoss, request);
    }
    //修改涨跌板
    @RequestMapping({"updateProfitTarget.do"})

 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;
                }
            }
        }

 src/main/java/com/nq/utils/UserPointUtil.java

@@ -51,7 +51,7 @@
        PositionProfitVO positionProfitVO = getPositionProfitVO(position,nowPrice);
       BigDecimal ss =  positionProfitVO.getProfitAndLose().divide(userPositionVO.getOrderTotalPrice(),BigDecimal.ROUND_CEILING)
               .multiply(new BigDecimal(100));
        userPositionVO.setProfitAndLoseParent(ss+"%");
        userPositionVO.setProfitAndLoseParent(ss.setScale(2, BigDecimal.ROUND_DOWN)+"%");
        userPositionVO.setProfitAndLose(positionProfitVO.getProfitAndLose());
        userPositionVO.setAllProfitAndLose(positionProfitVO.getAllProfitAndLose());
        userPositionVO.setNow_price(positionProfitVO.getNowPrice());

 src/main/java/com/nq/utils/task/stock/StockTask.java

@@ -166,7 +166,7 @@
    /**
     * 强制平仓
     */
//    @Scheduled(cron = "0/1 * * * * ?")
    @Scheduled(cron = "0/1 * * * * ?")
    public void stockConstraint(){
        if (stockConstraintLock.tryLock()) {
            log.info("强制平仓任务：--------->开始");