Merge remote-tracking branch 'origin/zyqs-0502' into rb-copy

zj

2024-07-15 2ed572d6b2a4be6b91b3e2a1ed48485abde91553

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

@@ -16,6 +16,7 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.time.LocalDate;
import java.time.DayOfWeek;
import java.time.LocalDate;
import java.time.LocalTime;
@@ -60,11 +61,11 @@
        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;
        }

        return TimeUtil.isTradingHour(stockTimeSetting.getAmStartTime(),stockTimeSetting.getAmEndTime(),stockTimeSetting.getPmStartTime(),stockTimeSetting.getPmEndTime());
        return TimeUtil.isTradingHour(stock.getStockType(),stockTimeSetting.getAmStartTime(),stockTimeSetting.getAmEndTime(),stockTimeSetting.getPmStartTime(),stockTimeSetting.getPmEndTime());
    }

    /**