diff --git a/DEVLOG.md b/DEVLOG.md index d06fcce..3bc1926 100644 --- a/DEVLOG.md +++ b/DEVLOG.md @@ -4,7 +4,7 @@ 09:25在155确认资金提示的ValueError实际为雷赛智能缺少盘前分钟行情,数量对账正常;09:30行情自然恢复后现金差0。修改只读估值为逐策略保留未知值,现金、数量继续独立核对,严格划拨和日结健康判断不放宽。成本均价固定显示三位,导出保留原始加权精度并按金额计算盈亏,补零股保护。用户确认48.296是含费成本,而原QMT成交及最新持仓均48.290、费用未知,故不改写成交或猜测手续费。自然执行依据刷新还暴露Decimal无法编码,复用既有JSON类型转换修复。 -新增估值18、精度8、执行依据编码5项隔离检查,页面与全量验证及实际发布结果见[本次接续](docs/策略估值与成本精度修复_2026-11-04.md)。本条为实施记录,部署结果另补,不能当作已上线回执。 +独立复核还发现公示导出把负向手续费流水再次相减,误加为平仓收益;已在导出边界修正费用和退款方向,保留原账本符号。新增估值18、精度及费用11、执行依据编码5项隔离检查,页面与全量验证及实际发布结果见[本次接续](docs/策略估值与成本精度修复_2026-11-04.md)。本条为实施记录,部署结果另补,不能当作已上线回执。 > 这份文件的用途只有一个:**让下一次交接不必重新查一遍**。 > 每个重要节点写一条,写完就补,不攒到最后。一条节点包含五样东西: diff --git a/app/services/publish_export.py b/app/services/publish_export.py index 4dff022..51a69ed 100644 --- a/app/services/publish_export.py +++ b/app/services/publish_export.py @@ -101,10 +101,11 @@ def _display_name(v, code: str) -> str: def _fee_map() -> dict: - """{(ymd, ts_code): 费用合计}。读不到按空 —— 费用缺席只影响平仓行含费口径, + """{(ymd, ts_code): 费用成本}:流出负现金流转为正费用,退款为负费用。 + 读不到按空 —— 费用缺席只影响平仓行含费口径, 表尾会把未摊费用标出来, 不拦导出。""" try: - return {(int(r["ymd"]), r["ts_code"]): float(r["fee"] or 0) + return {(int(r["ymd"]), r["ts_code"]): -float(r["fee"] or 0) for r in pms_repo.fee_sum_by_code()} except Exception as e: # noqa: BLE001 logger.warning("公示导出读费用失败 (平仓行按不含费出): %s", e) @@ -210,7 +211,8 @@ def _compute_snapshot() -> dict: # 未摊入明细的费用 (买入侧 + 无代码归属的校准行): 表尾如实标注, 不悄悄吞掉 try: - fee_total = float(pms_repo.sum_fee_all()) + # 仓储返回有符号现金流,导出费用按成本口径反号;退款不可取绝对值。 + fee_total = -float(pms_repo.sum_fee_all()) except Exception: # noqa: BLE001 fee_total = fee_alloc fee_resid = round(fee_total - fee_alloc, 2) @@ -427,7 +429,8 @@ def build_workbook(s: dict, nav_rows: list) -> bytes: f"({'、'.join(s['price_missing'][:5])}" f"{' 等' if len(s['price_missing']) > 5 else ''})") if s.get("fee_resid"): - notes.append(f"另有 {s['fee_resid']:.2f} 元费用(买入侧/校准)未摊入明细行") + label = "费用" if s["fee_resid"] > 0 else "费用返还" + notes.append(f"另有 {abs(s['fee_resid']):.2f} 元{label}(买入侧/校准)未摊入明细行") if notes: c = _put(ws, note_row, 2, "注:" + ";".join(notes) + "。") c.font = Font(name="宋体", size=10) diff --git a/docs/策略估值与成本精度修复_2026-11-04.md b/docs/策略估值与成本精度修复_2026-11-04.md index c14e826..b2ba59c 100644 --- a/docs/策略估值与成本精度修复_2026-11-04.md +++ b/docs/策略估值与成本精度修复_2026-11-04.md @@ -14,6 +14,13 @@ - 页面成本、开仓均价及核销均价固定显示三位;金额与均价采用各自精度。页面和表格标明费用另计,既有成交、账本、资金及费用记录不改写。 - 导出保留加权均价的计算精度,仅用单元格格式显示三位;成本金额和盈亏核算到分。复现案例为100股48.290加200股48.291,实际成本14487.20,现价49.01时盈亏215.80;原来先舍入均价导致215.70。表格修改成本或股数后,成本金额和持仓盈亏同步重算。 - 执行依据HTTP入口复用研判接口的明确类型转换,Decimal保留为JSON数值,未知对象和非有限数仍拒绝发送。没有注入模型请求、信号或验收委托。 +- 导出费用聚合原样读取负向现金流水,却再次从平仓收益中相减,导致费用被加为盈利。本次仅在导出边界转成费用口径,不取绝对值,退款方向保留,未分摊费用残差同步修正;账本现金流水定义不变。 + +## 用户确认的费用后补边界 + +用户随后核实QMT当前只返回实际持仓情况,实际交易费用只能后补。现有程序支持成交首次携带费用时按父指令确定策略,在事务内记费用及现金;但没有已入账成交的独立费用修订入口。同一成交号补发会被去重,不能通过改原报文或重放成交补费。 + +旧calibrate_fees仅有日总额流水校准,不更新capital:live双策略现金,不具备本场景所需的原成交归属、可靠并发和修订保护,不可用于155补费。协议中的资金反推描述也不等于已实现。当前缺乏真实费用明细和补费来源契约,本轮不新建补费通道、不猜测0.60元费用。后续需要独立费用修订记录,绑定原成交、策略、来源和版本,只记费用差额;审计与现金更新同事务,重复修订不重复扣款,不能改变成交数量、价格或原始回执。 ## 验证与发布 diff --git a/scripts/run_tests.py b/scripts/run_tests.py index ff0dac4..ffdbf53 100644 --- a/scripts/run_tests.py +++ b/scripts/run_tests.py @@ -8,7 +8,7 @@ 新增限制价采集专项:core 25例、provider 21例、targets 18例、collector 28例, 缓存消费23例、独立进程入口6例。 -策略资金缺行情展示与严格划拨专项18例;成本均价展示与导出精度专项8例。 +策略资金缺行情展示与严格划拨专项18例;成本均价展示与导出精度专项11例。 执行依据数据库数值序列化专项5例。 包含 (例数按 2026-10-26 隔离回归实跑校正): diff --git a/scripts/test_cost_precision.py b/scripts/test_cost_precision.py index 121623d..6b04b56 100644 --- a/scripts/test_cost_precision.py +++ b/scripts/test_cost_precision.py @@ -55,7 +55,43 @@ class CostPrecisionTests(unittest.TestCase): snapshot = publish_export.compute_snapshot() self.assertEqual(snapshot['holdings'][0]['cost'], 48.29) self.assertEqual(snapshot['holdings'][0]['amount'], 4829.00) - self.assertEqual(abs(snapshot['fee_resid']), .60) + self.assertEqual(snapshot['fee_resid'], .60) + + def closed_profit_fixture(self): + self.fake.insert_lot(ts_code='002979.SZ', lot_type='BASE', qty=1000, + open_price=10, open_date=date.today()) + self.fake.close_lot_qty(self.fake.lots[-1]['id'], qty=1000, + close_price=11, realized_pnl=1000) + return int(date.today().strftime('%Y%m%d')) + + def test_negative_fee_cash_flow_reduces_closed_profit(self): + day = self.closed_profit_fixture() + self.fake.insert_cash_flow(ymd=day, kind='FEE', amount=-12.5, ts_code='002979.SZ') + self.fake.insert_cash_flow(ymd=day, kind='CALIBRATE', amount=-3.5) + snapshot = publish_export.compute_snapshot() + self.assertEqual(snapshot['closed'][0]['pnl'], 987.5) + self.assertEqual(snapshot['realized'], 987.5) + self.assertEqual(snapshot['fee_resid'], 3.5) + self.assertEqual([r['amount'] for r in self.fake.cash_flows], [-12.5, -3.5]) + + def test_positive_fee_refund_offsets_cost_instead_of_becoming_another_fee(self): + day = self.closed_profit_fixture() + self.fake.insert_cash_flow(ymd=day, kind='FEE', amount=-12.5, ts_code='002979.SZ') + self.fake.insert_cash_flow(ymd=day, kind='FEE', amount=2.5, ts_code='002979.SZ') + snapshot = publish_export.compute_snapshot() + self.assertEqual(snapshot['closed'][0]['pnl'], 990) + self.assertEqual(snapshot['fee_resid'], 0) + self.assertEqual([r['amount'] for r in self.fake.cash_flows], [-12.5, 2.5]) + + def test_unallocated_refund_keeps_negative_cost_and_is_labelled_as_refund(self): + day = int(date.today().strftime('%Y%m%d')) + self.fake.insert_cash_flow(ymd=day, kind='CALIBRATE', amount=2.5) + snapshot = publish_export.compute_snapshot() + self.assertEqual(snapshot['fee_resid'], -2.5) + workbook = openpyxl.load_workbook(io.BytesIO( + publish_export.build_workbook(snapshot, publish_export._nav_series(snapshot)))) + self.assertTrue(any('2.50 元费用返还' in str(cell.value or '') + for row in workbook['Sheet1'] for cell in row)) def test_qmt_position_snapshot_keeps_cost_third_decimal(self): value = ws_codec.parse_positions_snapshot({'items': [ diff --git a/scripts/test_wiring.py b/scripts/test_wiring.py index 6387f22..49d393d 100644 --- a/scripts/test_wiring.py +++ b/scripts/test_wiring.py @@ -2792,8 +2792,8 @@ def _(): fake.close_lot_qty(lot_id, qty=1000, close_price=9.0, realized_pnl=1000.0) fake.update_lot(lot_id, updated_at=datetime.now()) ymd = int(date.today().strftime("%Y%m%d")) - fake.insert_cash_flow(ymd=ymd, kind="FEE", amount=12.5, ts_code="000001.SZ") - fake.insert_cash_flow(ymd=ymd, kind="CALIBRATE", amount=3.5) # 无代码归属 → 残差 + fake.insert_cash_flow(ymd=ymd, kind="FEE", amount=-12.5, ts_code="000001.SZ") + fake.insert_cash_flow(ymd=ymd, kind="CALIBRATE", amount=-3.5) # 无代码归属 → 残差 s = pub.compute_snapshot() h = {x["code"]: x for x in s["holdings"]}