diff --git a/src/main/kotlin/service/AutoTradingManager.kt b/src/main/kotlin/service/AutoTradingManager.kt index 5e9a850..ec7e46e 100644 --- a/src/main/kotlin/service/AutoTradingManager.kt +++ b/src/main/kotlin/service/AutoTradingManager.kt @@ -1687,7 +1687,7 @@ object AutoTradingManager { TradingLogStore.addAnalyzer( " - ", " - ", - "πŸŒ™ [μ•Όκ°„ μŠ€μΌ€μ€„ μ‹€ν–‰] μ˜€ν›„ ${now.hour}μ‹œ ${currentMinute}λΆ„ - μ•Όκ°„ λ³΄μœ μ£Όμ‹ μžλ™ μ˜ˆμ•½ 맀도 주문을 μ‹œμž‘ν•©λ‹ˆλ‹€ (19:30 이후 당일 1회 μ‹€ν–‰).", + "πŸŒ™ [μ•Όκ°„ μŠ€μΌ€μ€„ μ‹€ν–‰] μ˜€ν›„ ${now.hour}μ‹œ ${currentMinute}λΆ„ - μ„€μ •λœ μ‹œκ°„μ— 맞좰 μ•Όκ°„ λ³΄μœ μ£Όμ‹ μžλ™ μ˜ˆμ•½ 맀도 주문을 μ‹œμž‘ν•©λ‹ˆλ‹€.", true ) println("πŸŒ™ [μ•Όκ°„ μŠ€μΌ€μ€„ μ‹€ν–‰] μ˜€ν›„ ${now.hour}μ‹œ ${currentMinute}λΆ„ - μ•Όκ°„ λ³΄μœ μ£Όμ‹ μžλ™ μ˜ˆμ•½ 맀도 주문을 μ‹œμž‘ν•©λ‹ˆλ‹€.") diff --git a/src/main/kotlin/service/MarketScheduleManager.kt b/src/main/kotlin/service/MarketScheduleManager.kt index 26e6134..64a7a17 100644 --- a/src/main/kotlin/service/MarketScheduleManager.kt +++ b/src/main/kotlin/service/MarketScheduleManager.kt @@ -83,6 +83,7 @@ object MarketScheduleManager { currentTime.isBefore(LocalTime.of(15, 40)) -> MarketPhase.REGULAR_CLOSING currentTime.isBefore(LocalTime.of(16, 0)) -> MarketPhase.AFTER_HOURS currentTime.isBefore(LocalTime.of(19, 30)) -> MarketPhase.AFTER_SINGLE + currentTime.isBefore(userReservationTime) -> MarketPhase.AFTER_EXTENDED currentTime.isBefore(userEndTime) -> MarketPhase.OVERNIGHT_RESERVATION else -> MarketPhase.CLOSED } @@ -148,20 +149,13 @@ object MarketScheduleManager { } /** - * μ•Όκ°„ λ³΄μœ μ£Όμ‹ μžλ™ μ˜ˆμ•½ 맀도 ꡬ간 (19:30 이후 ~ userEndTime) - * μ• ν”„ν„°λ§ˆμΌ“μ΄ 19:30에 마감된 ν›„ μ•ˆμ „ν•˜κ²Œ μ•Όκ°„ μ˜ˆμ•½ 맀도λ₯Ό μ‹€ν–‰ν•©λ‹ˆλ‹€. + * μ•Όκ°„ λ³΄μœ μ£Όμ‹ μžλ™ μ˜ˆμ•½ 맀도 ꡬ간 (μ‚¬μš©μž μ„€μ • μ‹œκ° reservationSellHour:Minute ~ userEndTime) */ fun isOvernightReservationTime(currentTime: LocalTime = now()): Boolean { - val reservationStart = LocalTime.of( - KisSession.tradeConfig.reservationSellHour.coerceIn(0, 23), - KisSession.tradeConfig.reservationSellMinute.coerceIn(0, 59) - ) - // 19:30 이전 μ„€μ • λ°©μ§€: μ΅œμ†Œ 19:30 이후뢀터 μ‹€ν–‰ 보μž₯ - val effectiveStart = if (reservationStart.isBefore(LocalTime.of(19, 30))) LocalTime.of(19, 30) else reservationStart - return KisSession.tradeConfig.useReservationSell && - (currentTime.isAfter(effectiveStart) || currentTime == effectiveStart) && - currentTime.isBefore(userEndTime) + (currentTime.hour == KisSession.tradeConfig.reservationSellHour && + currentTime.minute >= KisSession.tradeConfig.reservationSellMinute && + currentTime.isBefore(userEndTime)) } /**