update pay ui
This commit is contained in:
23
app.py
23
app.py
@@ -6407,6 +6407,11 @@ def get_stock_kline(stock_code):
|
||||
chart_type = request.args.get('type', 'minute')
|
||||
event_time = request.args.get('event_time')
|
||||
|
||||
# 是否跳过"下一个交易日"逻辑:
|
||||
# - 如果没有传 event_time(灵活屏等实时行情场景),盘后应显示当天数据
|
||||
# - 如果传了 event_time(Community 事件等场景),使用原逻辑
|
||||
skip_next_day = event_time is None
|
||||
|
||||
try:
|
||||
event_datetime = datetime.fromisoformat(event_time) if event_time else datetime.now()
|
||||
except ValueError:
|
||||
@@ -6426,7 +6431,7 @@ def get_stock_kline(stock_code):
|
||||
if chart_type == 'daily':
|
||||
return get_daily_kline(stock_code, event_datetime, stock_name)
|
||||
elif chart_type == 'minute':
|
||||
return get_minute_kline(stock_code, event_datetime, stock_name)
|
||||
return get_minute_kline(stock_code, event_datetime, stock_name, skip_next_day=skip_next_day)
|
||||
elif chart_type == 'timeline':
|
||||
return get_timeline_data(stock_code, event_datetime, stock_name)
|
||||
else:
|
||||
@@ -7584,15 +7589,23 @@ def get_daily_kline(stock_code, event_datetime, stock_name):
|
||||
})
|
||||
|
||||
|
||||
def get_minute_kline(stock_code, event_datetime, stock_name):
|
||||
"""处理分钟K线数据"""
|
||||
def get_minute_kline(stock_code, event_datetime, stock_name, skip_next_day=False):
|
||||
"""处理分钟K线数据
|
||||
|
||||
Args:
|
||||
stock_code: 股票代码
|
||||
event_datetime: 事件时间
|
||||
stock_name: 股票名称
|
||||
skip_next_day: 是否跳过"下一个交易日"逻辑(用于灵活屏盘后查看当天数据)
|
||||
"""
|
||||
client = get_clickhouse_client()
|
||||
|
||||
target_date = get_trading_day_near_date(event_datetime.date())
|
||||
is_after_market = event_datetime.time() > dt_time(15, 0)
|
||||
|
||||
# 核心逻辑改动:先判断当前日期是否是交易日,以及是否已收盘
|
||||
if target_date and is_after_market:
|
||||
# 只有在指定了 event_time 参数时(如 Community 页面事件)才跳转到下一个交易日
|
||||
# 灵活屏等实时行情场景,盘后应显示当天数据
|
||||
if target_date and is_after_market and not skip_next_day:
|
||||
# 如果是交易日且已收盘,查找下一个交易日
|
||||
next_trade_date = get_trading_day_near_date(target_date + timedelta(days=1))
|
||||
if next_trade_date:
|
||||
|
||||
Reference in New Issue
Block a user