From 36d5129bba6e4c5b67870cce53e2cc7dba9068bc Mon Sep 17 00:00:00 2001 From: baobao Date: Mon, 9 Nov 2026 11:06:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=A4=9A=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E7=9B=88=E4=BA=8F=E5=8F=91=E5=B8=83=E4=B8=8E=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E6=A0=B8=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DEVLOG.md | 2 + .../pnl_summary_release_20261109.json | 111 ++++++++++++++++++ .../evidence/sifang_grid_review_20261109.json | 39 +++++- docs/多策略盈亏与四方网格核验_2026-11-09.md | 20 +++- 4 files changed, 168 insertions(+), 4 deletions(-) create mode 100644 docs/evidence/pnl_summary_release_20261109.json diff --git a/DEVLOG.md b/DEVLOG.md index 6d8355b..98ca62f 100644 --- a/DEVLOG.md +++ b/DEVLOG.md @@ -2919,3 +2919,5 @@ PMS最终代码56db0fd已推送,155 web/WS/beat为execution-2b1c447,worker ## 2026-11-09 多策略盈亏比例与四方网格核验 按用户反馈统一累计盈亏、合计持仓盈亏的金额及比例,悬浮按策略展示,缺数与零分母留空。开发机80批、专项22例及三道页面护栏通过,桌面与390/320隔离真实响应复现通过。四方股份只读发现网格同一边界上下穿越即买卖的索引缺陷,31.37买1000、31.38发卖700已在断网内存环境复现;10:45卖单尚未成交,费用未知。页面按真实来源改称网格加仓/减仓;本次不改交易逻辑和在途订单。发布与后续边界见[接续](docs/多策略盈亏与四方网格核验_2026-11-09.md)。 + +11:05补记:11:04:04仅pms-web发布`pms:pnl-summary-5a88b33`,开发机与候选各80批通过,其余18容器及私有配置保持。实际账户累计与多策略持仓比例核对通过,页面哈希一致。确认1732802与落库一致,数量及现金对账正常、待入账和孤儿0。11:05四方股份卖700股仍受理未成交;网格执行缺陷另待实施,未修改在途单或运行策略。 diff --git a/docs/evidence/pnl_summary_release_20261109.json b/docs/evidence/pnl_summary_release_20261109.json new file mode 100644 index 0000000..98c33fd --- /dev/null +++ b/docs/evidence/pnl_summary_release_20261109.json @@ -0,0 +1,111 @@ +{ + "runtime": { + "at": "2026-11-09T11:04:57.988880+08:00", + "prefix": "", + "scope": "pms-sim-155", + "dispatch": "ws", + "buy_halt": false, + "exec_halt": false, + "qmt": { + "conn_state": "ONLINE", + "last_seq": 1732802, + "acked_seq": 1732802, + "resync_flag": 0 + }, + "pending": 0, + "orphan": 0, + "recent_contiguous": true, + "quantity_reconciliation": { + "ok": true, + "diffs": [], + "fixes": [], + "errors": [], + "severity": "OK", + "source": "ws", + "note": "策略数量之和核对账户;不猜测差异归属,不自动把差异并入任何策略" + }, + "accounting_ready": true, + "cash_difference": 0.0, + "funds_age_sec": 30.0, + "blocked_calls": 0 + }, + "release": { + "at": "2026-11-09T11:04:05.184170+08:00", + "commit": "5a88b3374eed6fe7cd3b6b69b1b70d6a5cbd1a4d", + "targets": { + "pms-web": { + "id": "589d2365800dc8e1ef13e7b6e898d3a133cba4dcfd3247f1e4609d03a7285980", + "image": "sha256:731384ab3efe4f951bcd42906450772d860bd0ae2a55b37fb69d24fa2a096d28", + "tag": "pms:pnl-summary-5a88b33", + "started": "2026-11-09T03:04:04.341118256Z" + } + }, + "other_unchanged": 18, + "other_changed": [], + "config_preserved": true + }, + "page_status": 200, + "page_sha256": "59218dcbd931fc45916db4804321ab487662e9d6f0b9e968c7ecf7210cba8cf1", + "account_performance": { + "ready": true, + "profit": -2770.0, + "profit_pct": -0.0014075720076998355, + "started_at": "2026-11-02T10:08:20", + "reason": null + }, + "holding_performance": { + "ready": true, + "profit": 7112.1, + "profit_pct": 0.039431073932778504, + "strategies": [ + { + "book_id": "original", + "name": "主观量化", + "ready": true, + "names_count": 6, + "profit": 7112.1, + "profit_pct": 0.0394, + "cost_basis": 180367.9 + }, + { + "book_id": "micro30", + "name": "微盘轮动", + "ready": true, + "names_count": 0, + "profit": 0, + "profit_pct": null, + "cost_basis": 0 + } + ], + "reason": null + }, + "candidate": { + "commit": "5a88b3374eed6fe7cd3b6b69b1b70d6a5cbd1a4d", + "tag": "pms:pnl-summary-5a88b33", + "image": "sha256:731384ab3efe4f951bcd42906450772d860bd0ae2a55b37fb69d24fa2a096d28", + "passed": true + }, + "local_suites": 80, + "candidate_suites": 80, + "browser": { + "widths": [ + 1440, + 390, + 320 + ], + "amountDigits": 2, + "percentDigits": 2, + "amountFont": "18px", + "percentFont": "12px", + "negativeGreen": true, + "positiveRed": true, + "strategyPopover": true, + "emptyStrategy": "0.00 暂无持仓", + "cardOverflow": false, + "pageOverflow": false, + "gridLabelAccurate": true, + "consoleErrors": [], + "acceptance": "11月9日10:32真实只读响应隔离复现,新统计字段由同一原始账本计算,写请求拒绝" + }, + "db_write_attempts": 0 +} diff --git a/docs/evidence/sifang_grid_review_20261109.json b/docs/evidence/sifang_grid_review_20261109.json index 54f611a..0b17177 100644 --- a/docs/evidence/sifang_grid_review_20261109.json +++ b/docs/evidence/sifang_grid_review_20261109.json @@ -122,5 +122,42 @@ "worker_image": "pms:rating-priority-38f91d2", "runner_sha256": "a1d8a30162eb9d98ceadf8920f88075d50be232e3ac39241a9195a78f086c37c", "execution_logic_changed": false, - "orders_changed": false + "orders_changed": false, + "latest_check": { + "at": "2026-11-09T11:05:14.654457+08:00", + "instructions": [ + { + "instruction_id": "STR20261109100402_601126SH_g", + "side": "sell", + "qty": 700, + "exec_qty": 0, + "status": "DISPATCHED" + }, + { + "instruction_id": "STR20261109094705_601126SH_g", + "side": "buy", + "qty": 1000, + "exec_qty": 1000, + "status": "CONFIRMED" + } + ], + "orders": [ + { + "instruction_id": "STR20261109100402_601126SH_g_D01", + "status": "ACCEPTED", + "limit_price": "31.32" + }, + { + "instruction_id": "STR20261109094705_601126SH_g_D01", + "status": "FILLED", + "limit_price": "31.43" + } + ], + "position": { + "total_qty": 1700, + "avail_qty": 700, + "avg_cost": "31.279" + }, + "blocked_calls": 0 + } } diff --git a/docs/多策略盈亏与四方网格核验_2026-11-09.md b/docs/多策略盈亏与四方网格核验_2026-11-09.md index 5a88736..2f6f730 100644 --- a/docs/多策略盈亏与四方网格核验_2026-11-09.md +++ b/docs/多策略盈亏与四方网格核验_2026-11-09.md @@ -1,6 +1,6 @@ # 多策略盈亏展示与四方股份网格核验 -核验时间:2026年11月9日10:57,北京时间。页面修改完成开发机验证,候选及实际发布结果待后续补齐。四方股份当前运行逻辑、策略和在途订单没有修改。 +核验时间:2026年11月9日11:05,北京时间。11:04:04已仅发布155网页服务;候选80批断网回归及真实接口核验通过。四方股份当前运行逻辑、策略和在途订单没有修改。 ## 总览展示 @@ -31,7 +31,7 @@ 按原参数在断网、内存环境重现了31.37买1000、31.38卖700,未调用调度、落表或下单。700股仅有7元理论价差,约0.032%,且费用未知;执行报价允许卖单低至31.32,相对本次网格买价反而可能形成35元价差损失。以上是对报价的假设计算,不是已经发生的成交盈亏。当前31.279摊薄成本混合了原700股与新1000股,也不能拿来代替单个网格循环的收益。 -这属于网格实现缺陷,不是正常的2%网格兑现。修复应把买入记录与真正穿过的档位对齐,卖出对应相邻上档,并以实际成交记录维护数量、价格和剩余量;执行报价需保留该网格的卖出底价,不能被积极成交报价突破。旧的已买档、已发未成交卖单需逐笔审计承接,不能直接改索引、清空状态或重放成交。此次用户要求交易原因解释,当前发布范围只含展示修正;交易规则修复及存量订单处理留待明确实施安排。 +这属于网格实现缺陷,不是正常的2%网格兑现。修复应把买入记录与真正穿过的档位对齐,卖出对应相邻上档,并以实际成交记录维护数量、价格和剩余量;执行报价需保留网格买入上限和卖出下限,不能被积极成交报价突破。旧的已买档、已发未成交卖单需逐笔审计承接,不能直接改索引、清空状态或重放成交。此次用户要求交易原因解释,当前发布范围只含展示修正;交易规则修复及存量订单处理留待明确实施安排。 ## 验证与发布范围 @@ -39,4 +39,18 @@ 浏览器使用11月9日10:32真实只读响应隔离复现,新字段从同一账本计算,所有写请求拒绝,区别于真实登录验收。1440、390、320宽度检查金额与比例样式、正负色、策略悬浮、无持仓、分类再次收起及网格名称,卡片和页面无横向溢出、控制台错误0。[桌面](evidence/pnl-summary-ui-20261109/desktop.png)、[390窄屏](evidence/pnl-summary-ui-20261109/mobile390.png)、[320窄屏](evidence/pnl-summary-ui-20261109/mobile320.png)。 -只拟更新155的pms-web;唯一WS、交易worker、beat、观测、采集和其他容器保持,188不操作。回退仅恢复当前页面镜像pms:overview-layout-60a9709。四方股份核验与隔离复现的脱敏证据见[专项记录](evidence/sifang_grid_review_20261109.json)。 +只更新155的pms-web;唯一WS、交易worker、beat、观测、采集和其他容器保持,188不操作。回退仅恢复当前页面镜像pms:overview-layout-60a9709。四方股份核验与隔离复现的脱敏证据见[专项记录](evidence/sifang_grid_review_20261109.json)。 + +## 实际发布与最新状态 + +代码提交`5a88b3374eed6fe7cd3b6b69b1b70d6a5cbd1a4d`,155实际页面镜像`pms:pnl-summary-5a88b33`,镜像ID为`sha256:731384ab3efe4f951bcd42906450772d860bd0ae2a55b37fb69d24fa2a096d28`。候选基于现用依赖,以断网、只读文件系统、无业务配置、CPU及内存限制完成80批全量回归,末行为ALL SUITES PASS。 + +11:04:04沿原Compose项目及私有覆盖,以`--no-deps --no-build --force-recreate`仅重建pms-web。其余18个容器标识、镜像、启动时间不变;挂载、私有环境和服务器未提交脚本保持。备份在155的`/home/factor/project/tradingSystem/backups/pnl-summary-20261109-5a88b33`,私有配置不导出。回退只恢复网页原镜像,不变更账本、队列或交易规则。 + +11:04:57实际页面HTTP 200,哈希匹配提交。累计盈亏-2770.00元、比例-0.140757%,合计持仓盈亏7112.10元、比例3.943107%;主观量化对应7112.10元、微盘轮动无持仓,合计及成本加权计算核对通过。页面按两位百分比呈现,数值随行情变化,截图是更早10:32采样而非11:05即时收益。 + +QMT确认和落库同为1732802,最近200条连续,resync=0,待入账与孤儿0,资金快照30秒;数量对账通过、现金差0,核验写入尝试0。详见[脱敏发布证据](evidence/pnl_summary_release_20261109.json)。 + +11:05:14再查四方股份:买1000股仍为CONFIRMED;卖700股父指令DISPATCHED、子单ACCEPTED、成交0、限价31.32。当前持仓1700股、可卖700股、摊薄成本31.279元。没有新增成交修正、撤单或策略状态写入。 + +用户要求的展示修改与原因核验已完成。网格索引和报价边界问题尚未修复,需另行明确交易逻辑修复及存量在途处置范围;不得把页面名称更正当作执行缺陷已消除。没有创建长期观察。