在两个策略的最终买入出口复核个股禁令
This commit is contained in:
parent
06cfb0ac24
commit
165d25217f
|
|
@ -122,13 +122,11 @@ RUNTIME_EXTRA = {
|
||||||
# (它只回 ok=False 不抛异常, 调用点又把返回值丢了)。后果是 prev_ymd 永远读回 0,
|
# (它只回 ok=False 不抛异常, 调用点又把返回值丢了)。后果是 prev_ymd 永远读回 0,
|
||||||
# 「连续 N 日」的按日推进彻底失效, 修复形同虚设。加表时**必须同步加这里**。
|
# 「连续 N 日」的按日推进彻底失效, 修复形同虚设。加表时**必须同步加这里**。
|
||||||
"PMS_RECON_STREAK_YMD": (0, int, "上次推进连续天数的交易日 YYYYMMDD (同日不重复计数)"),
|
"PMS_RECON_STREAK_YMD": (0, int, "上次推进连续天数的交易日 YYYYMMDD (同日不重复计数)"),
|
||||||
# 2026-08-14: 上游信号告警面板的三个显示参数。原来只在 upstream_signals.py 里用 get_int
|
# 旧版扫描窗与每类条数保留作配置兼容,当前全场快照使用 PMS_UPSTREAM_DAY_SCAN。
|
||||||
# 兜底、没登记, 所以设置页调不到、改一次得重新部署。注册进来后可在页面实时调 (即时生效)。
|
"PMS_UPSTREAM_ALERT_SCAN": (300, int, "历史兼容参数。当前告警按当天来源分页,扫描上限使用 PMS_UPSTREAM_DAY_SCAN"),
|
||||||
"PMS_UPSTREAM_ALERT_SCAN": (300, int, "告警扫描窗: 每轮从告警流取最近 N 条再分类限量 (窗要大于各类上限之和, 防 price_notice 等高频源把风控告警挤出最新N)"),
|
"PMS_UPSTREAM_ALERT_PER_CAT": (20, int, "历史兼容参数。当前告警按当天来源分页"),
|
||||||
"PMS_UPSTREAM_ALERT_PER_CAT": (20, int, "历史兼容参数;现行告警按当天来源分页,每类不再单独截断"),
|
"PMS_UPSTREAM_ALERT_MAX_AGE_MIN": (60, int, "告警超过此分钟数标为陈旧,仍可查看。0 表示不限龄"),
|
||||||
"PMS_UPSTREAM_ALERT_MAX_AGE_MIN": (60, int, "告警时间窗(分钟): 超过此龄判为陈旧并在页面置灰标注(不删除, 风控不丢信息), 0=不限龄。与每类上限正交, 先按龄标记再每类限量"),
|
# 点击单票查看当天信号时独立回扫,避免把单票浏览变成全场轮询。
|
||||||
# 2026-09-09: 点股票看它今天全部信号 (台账 055)。快照口径只留每类最新 N 条, 到下午
|
|
||||||
# 一只活跃票早盘的信号早被挤掉; 按代码回扫是另一条路径, 上限单独可调。
|
|
||||||
"PMS_UPSTREAM_BYCODE_SCAN": (5000, int, "单票信号回扫上限: 点开一只票时每条上游流最多倒序回扫 N 条 (分页 500/次)。只在点击时触发, 不进轮询; 调大更全但更慢"),
|
"PMS_UPSTREAM_BYCODE_SCAN": (5000, int, "单票信号回扫上限: 点开一只票时每条上游流最多倒序回扫 N 条 (分页 500/次)。只在点击时触发, 不进轮询; 调大更全但更慢"),
|
||||||
# ── 2026-09-09 解锁重问 (台账 055): 研判驳回后的当日闸不再是死的, 输入确实变了就放一次。
|
# ── 2026-09-09 解锁重问 (台账 055): 研判驳回后的当日闸不再是死的, 输入确实变了就放一次。
|
||||||
# 八个键一次定死, 不按复盘读数回调 —— 要调先记台账。
|
# 八个键一次定死, 不按复盘读数回调 —— 要调先记台账。
|
||||||
|
|
|
||||||
|
|
@ -720,6 +720,13 @@ def order_control_blocker(parent, side):
|
||||||
if side == 'buy':
|
if side == 'buy':
|
||||||
if param_store.locked_open_param('PMS_GLOBAL_BUY_HALT'):
|
if param_store.locked_open_param('PMS_GLOBAL_BUY_HALT'):
|
||||||
return '用户暂停买入'
|
return '用户暂停买入'
|
||||||
|
if book == books.ORIGINAL:
|
||||||
|
code = parent.get('ts_code')
|
||||||
|
if not code:
|
||||||
|
return '买入证券无法核实'
|
||||||
|
restriction = micro_buy_restrictions(code).get(code)
|
||||||
|
if restriction:
|
||||||
|
return restriction
|
||||||
return strategy_buy_blocker(book, parent, config=config)
|
return strategy_buy_blocker(book, parent, config=config)
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
包含 (例数按 2026-10-26 隔离回归实跑校正):
|
包含 (例数按 2026-10-26 隔离回归实跑校正):
|
||||||
test_batch57_units.py 异步请求持久化、截止时间、旧结果隔离、结果优先收取、真实调度入口及行情来源 (32例)
|
test_batch57_units.py 异步请求持久化、截止时间、旧结果隔离、结果优先收取、真实调度入口及行情来源 (32例)
|
||||||
test_batch56_units.py 微盘v3冻结候选、按序递补与部分成交保护 (40例)
|
test_batch56_units.py 微盘冻结篮子、账户禁买、部分成交、人工退出和恢复 (57例)
|
||||||
test_batch55_units.py 共同撤换状态、报价、依据监控与取消确认 (34例)
|
test_batch55_units.py 共同撤换状态、报价、依据监控与取消确认 (34例)
|
||||||
test_sim_reset_units.py 双账本重置、空仓证据、配置与去重保留、幂等及SQL回滚 (9例)
|
test_sim_reset_units.py 双账本重置、空仓证据、配置与去重保留、幂等及SQL回滚 (9例)
|
||||||
test_batch53_units.py QMT下单策略类型、原字段与签名、双策略买卖归属及读取故障保留队列 (8例)
|
test_batch53_units.py QMT下单策略类型、原字段与签名、双策略买卖归属及读取故障保留队列 (8例)
|
||||||
|
|
|
||||||
|
|
@ -141,6 +141,40 @@ class MicroBuyRestrictionTests(unittest.TestCase):
|
||||||
[old['instruction_id'], old['instruction_id']])
|
[old['instruction_id'], old['instruction_id']])
|
||||||
self.assertEqual([call.kwargs['arbiter'] for call in cancel.call_args_list], ['user', 'system'])
|
self.assertEqual([call.kwargs['arbiter'] for call in cancel.call_args_list], ['user', 'system'])
|
||||||
|
|
||||||
|
def test_original_final_send_distinguishes_rotation_stop_from_account_buy_ban(self):
|
||||||
|
from app.services import rotation_service as r, execution_orders as e
|
||||||
|
from app.repo import pms_repo, qmt_repo
|
||||||
|
code = '600000.SH'
|
||||||
|
parent = dict(self.parent(code),book_id='original',origin_type='strategy',action='T0_ROUND',progress={'leg':'open'})
|
||||||
|
child = {'parent_id':parent['instruction_id'],'ts_code':code,'side':'buy'}
|
||||||
|
phase = {'rotation':{'phase':'original'}}
|
||||||
|
self.enterContext(patch.object(r.settings,'INFRA_STRATEGY_BOOK_SCHEMA',True))
|
||||||
|
self.enterContext(patch.object(r.settings,'PMS_TABLE_PREFIX',''))
|
||||||
|
self.enterContext(patch.object(e,'account_guard',side_effect=nullcontext))
|
||||||
|
self.enterContext(patch.object(e,'correction_blocker',return_value=None))
|
||||||
|
self.enterContext(patch.object(pms_repo,'get_param',return_value=None))
|
||||||
|
self.enterContext(patch.object(pms_repo,'get_instruction',return_value=parent))
|
||||||
|
self.enterContext(patch.object(qmt_repo,'get_order',return_value=child))
|
||||||
|
self.enterContext(patch.object(qmt_repo,'mark_send_attempt',return_value=True))
|
||||||
|
self.enterContext(patch.object(r.store,'get',return_value=(phase,1)))
|
||||||
|
def marked():
|
||||||
|
return e.prepare_send('child')['marked']
|
||||||
|
self.assertTrue(marked())
|
||||||
|
phase['rotation']['phase'] = 'entering_micro'
|
||||||
|
self.assertFalse(marked())
|
||||||
|
parent['progress']['leg'] = 'close'
|
||||||
|
self.assertTrue(marked())
|
||||||
|
for stop, release in [('FREEZE_STOCK','UNFREEZE_STOCK'), ('BLACKLIST_ADD','BLACKLIST_REMOVE')]:
|
||||||
|
self.command(code, stop)
|
||||||
|
for leg in ('open','close'):
|
||||||
|
parent['progress']['leg'] = leg
|
||||||
|
self.assertFalse(marked())
|
||||||
|
child['side'] = parent['side'] = 'sell'
|
||||||
|
self.assertTrue(marked())
|
||||||
|
child['side'] = parent['side'] = 'buy'
|
||||||
|
self.command(code, release)
|
||||||
|
self.assertTrue(marked())
|
||||||
|
|
||||||
def test_queued_then_frozen_then_released_at_final_send(self):
|
def test_queued_then_frozen_then_released_at_final_send(self):
|
||||||
from app.services import execution_orders as eo, execution_conflicts as conflicts, rotation_service
|
from app.services import execution_orders as eo, execution_conflicts as conflicts, rotation_service
|
||||||
from app.services import param_store, risk_exit
|
from app.services import param_store, risk_exit
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue