diff --git a/market_data_main.py b/market_data_main.py index 1eade2d..3341a06 100644 --- a/market_data_main.py +++ b/market_data_main.py @@ -121,8 +121,16 @@ class MarketDataMain: if end_time_ts - start_time_ts > 86400000 * 15: start_time_ts = end_time_ts - 86400000 * 15 start = timestamp_to_datetime(start_time_ts) + elif isinstance(start, int): + if end_time_ts - start > 86400000 * 15: + start_time_ts = end_time_ts - 86400000 * 15 + start = start_time_ts + else: + start_time_ts = start + start = timestamp_to_datetime(start_time_ts) else: - start_time_ts = transform_date_time_to_timestamp(start) + logger.error(f"开始时间格式错误: {start}") + return None else: start_time_ts = transform_date_time_to_timestamp(start) if start_time_ts is None: