T-13 补修:verify_convert_lots/apply 字面造数日期改真库日历链式回推(用户指出硬编码 · 全仓排查留痕)
This commit is contained in:
@@ -25,7 +25,7 @@ TEXT 绑定参数转数值 → 不加就扣 0;见开发计划 §B.8 第 11 条
|
||||
from __future__ import annotations
|
||||
|
||||
import sys
|
||||
from datetime import date, datetime
|
||||
from datetime import date, datetime, time as dtime, timedelta
|
||||
from decimal import ROUND_HALF_UP, Decimal
|
||||
from pathlib import Path
|
||||
|
||||
@@ -39,14 +39,41 @@ from app.gateway.gateway_repository import GatewayRepository # noqa: E402
|
||||
from app.gateway.trade_gateway import _maintain_lots # noqa: E402
|
||||
from app.repository.core_ro import CoreReadOnlyRepository # noqa: E402
|
||||
from app.service.convert.lot_bootstrap import bootstrap_lots # noqa: E402
|
||||
from app.service.convert.trading_calendar import previous_biz_day # noqa: E402
|
||||
from app.utils.db import dispose_engines, get_engine # noqa: E402
|
||||
|
||||
CUSTOMER = "CUST-LOTT"
|
||||
PROD_SUB = "PROD-LOTTA" # A 组:申购建批次
|
||||
PROD_BOOT = "PROD-LOTTB" # D 组:无批次有持仓 → D8 兜底补建
|
||||
PROD_REDEEM = "PROD-LOTTC" # B/C 组:赎回 FIFO 扣减
|
||||
NAV_DATE = date(2026, 9, 4)
|
||||
TRADE_AT = datetime(2026, 9, 4, 14, 0, 0)
|
||||
# 造数日期在 main() 里按真库交易日历链式回推动态确定(T-12 模式:不猜自然日,
|
||||
# 对任意假期安排与日期漂移鲁棒)。相对关系与原固定基准(2026-09-04)一致:
|
||||
# TRADE_DATE = 回推 3 个交易日;C1/C2 批次 = 再回推 3/2 个交易日(保证 T+2 可扣);
|
||||
# D 组持仓 as_of = 回推 34 个自然日(hold_days 为自然日语义,档位断言不变)。
|
||||
NAV_DATE: "date | None" = None
|
||||
TRADE_AT: "datetime | None" = None
|
||||
_C1_AT: "datetime | None" = None
|
||||
_C2_AT: "datetime | None" = None
|
||||
_BOOT_AS_OF: "date | None" = None
|
||||
|
||||
|
||||
def _init_dates(admin) -> None:
|
||||
"""按真库交易日历把造数日期锚定到确定过去的历史开市日(必须在 seed 前调用)。"""
|
||||
global NAV_DATE, TRADE_AT, _C1_AT, _C2_AT, _BOOT_AS_OF
|
||||
is_open = CoreReadOnlyRepository(engine=admin).is_open
|
||||
d = date.today()
|
||||
for _ in range(3):
|
||||
d = previous_biz_day(d, is_open)
|
||||
NAV_DATE = d
|
||||
TRADE_AT = datetime.combine(d, dtime(10, 0))
|
||||
c1 = c2 = d
|
||||
for _ in range(3):
|
||||
c1 = previous_biz_day(c1, is_open)
|
||||
for _ in range(2):
|
||||
c2 = previous_biz_day(c2, is_open)
|
||||
_C1_AT = datetime.combine(c1, dtime(10, 0))
|
||||
_C2_AT = datetime.combine(c2, dtime(10, 0))
|
||||
_BOOT_AS_OF = d - timedelta(days=34)
|
||||
|
||||
_passed = 0
|
||||
_failed = 0
|
||||
@@ -108,8 +135,8 @@ def seed(engine) -> None:
|
||||
)
|
||||
# C 组:两个已存在批次(FIFO 扣减用)
|
||||
for lot_id, qty, nav, confirmed in [
|
||||
("LOT-LOTT-C1", "100", "1.0000", datetime(2026, 9, 1, 10, 0, 0)),
|
||||
("LOT-LOTT-C2", "50", "1.1000", datetime(2026, 9, 2, 10, 0, 0)),
|
||||
("LOT-LOTT-C1", "100", "1.0000", _C1_AT),
|
||||
("LOT-LOTT-C2", "50", "1.1000", _C2_AT),
|
||||
]:
|
||||
conn.execute(
|
||||
text(
|
||||
@@ -127,7 +154,7 @@ def seed(engine) -> None:
|
||||
"INSERT INTO core_holding (customer_id, product_id, qty, cost_amount, "
|
||||
"market_value, pnl_pct, as_of) VALUES (:c, :p, :q, :cost, :cost, 0, :d)"
|
||||
),
|
||||
{"c": CUSTOMER, "p": pid, "q": qty, "cost": cost, "d": date(2026, 8, 1)},
|
||||
{"c": CUSTOMER, "p": pid, "q": qty, "cost": cost, "d": _BOOT_AS_OF},
|
||||
)
|
||||
|
||||
|
||||
@@ -183,7 +210,7 @@ def assert_subscribe(admin, writer, core) -> None:
|
||||
"confirmed_at = T",
|
||||
str(q1(admin, "SELECT confirmed_at FROM core_share_lot WHERE customer_id = :c AND product_id = :p",
|
||||
c=CUSTOMER, p=PROD_SUB)),
|
||||
"2026-09-04 14:00:00",
|
||||
str(TRADE_AT),
|
||||
)
|
||||
|
||||
|
||||
@@ -310,6 +337,7 @@ def assert_rebuild_lots(admin) -> None:
|
||||
|
||||
def main() -> int:
|
||||
admin = get_engine(settings.mysql_core_database, "admin")
|
||||
_init_dates(admin)
|
||||
try:
|
||||
with admin.connect() as conn:
|
||||
conn.execute(text("SELECT 1"))
|
||||
|
||||
Reference in New Issue
Block a user