Repository navigation
refactor: integrate subscription accounting and Auto key badge - #6
Merged
OnePlus-X-code merged 6 commits intoOct 16, 2026
Merged
Conversation
OnePlus-X-code
marked this pull request as ready for review
October 16, 2026 07:30
6 of 8 tasks
6 of 11 tasks
YunfanGoForIt
deleted the
codex/integration-architecture-auto-20261016
branch
October 20, 2026 17:00
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
📝 变更描述 / Description
集成 #3 的订阅预扣、锁顺序与支付额度换算重构,以及 #4 的 Auto 标记修复,供维护者一次审查后合入 main。分支直接创建自 #4 最终提交 e4722eb;保留 #3(dae9a04a)、#4(e4722ebab)、#5(34b6db14f)全部原始提交。追加提交 0e87a44 仅包含报告、清单与诊断附件,业务树相对 #4 无差异。#5 的持久化退款代码不包含在本 PR。
结论:完整 CI 通过,未发现集成引入的功能、计费或测试回归,可人工审阅合并。仍保持 Draft,等待维护者确认;没有合并或部署。由 Codex 按维护者指示准备,人工确认项保持未勾选。
完整集成报告 · 最简生产发布与回退清单。
合并结论不等于无条件生产就绪:本 PR 仍沿用旧异步退款机制,最终失败后的补偿缺口需在发布前处置。#5 的隔离 SQL 测量确认,关闭批量更新时正常钱包/订阅原额结算分别从 2→6、3→7 条 DML;追加预扣后退款分别从 6→13、9→16。它每轮串行最多处理 100 条,不能保证每分钟 100 条;外部告警尽力投递,旧 master 清理会破坏非终态退款证据。#5 暂不建议发布,需补充容量、告警送达与迁移/回退演练;本轮只评估,没有扩展实现。
🚀 变更类型 / Type of change
🔗 关联任务 / Related Issue
集成 #3、#4;独立评估 #5,不引入其实现。
✅ 提交前检查项 / Checklist
📸 运行证明 / Proof of Work