1

zj

2024-05-29 da335bddc242b2872029003332ef7549cceb0ce8

1

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

@@ -60,7 +60,7 @@
        if(stockTimeSetting == null){
            return  false;
        }
        if(stockTimeSetting.getWeekDay().indexOf(String.valueOf(LocalDate.now().getDayOfWeek().getValue())) < 0){
        if(!stockTimeSetting.getWeekDay().contains(String.valueOf(LocalDate.now().getDayOfWeek().getValue()))){
            return false;
        }


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

@@ -326,10 +326,15 @@
            return ServerResponse.createBySuccessMsg("股票不存在！", request);
        }
        //判断股票是否在可交易时间段
        Boolean b = isStockMarketOpen(stock.getStockType());
        Boolean wb = tradingHourService.weekDayeCheck(stock.getStockCode());
            if (!b || !wb) {
            return ServerResponse.createByErrorMsg("订单失败,不在交易时间之内", request);
//        Boolean b = isStockMarketOpen(stock.getStockType());
//        Boolean wb = tradingHourService.weekDayeCheck(stock.getStockCode());
//            if (!b || !wb) {
//            return ServerResponse.createByErrorMsg("订单失败,不在交易时间之内", request);
//        }

        Boolean b = tradingHourService.timeCheck(userPosition.getStockCode());
        if (!b) {
            return ServerResponse.createByErrorMsg("订单失败,不在交易时间之内");
        }

        if (userPosition == null) {