Repository navigation
merge: preserve production commerce and integrate reviewed accounting - #7
Merged
OnePlus-X-code merged 16 commits intoOct 16, 2026
Merged
Conversation
YunfanGoForIt
deleted the
codex/release-production-integration-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
从当前生产 f676e27 创建发布集成分支，合入 main df48ce0，保留两侧历史。逐段处理 IFLinkPay 冲突：保留生产不透明订单/uid、验签、钱包与套餐回调分流及支付流程；使用 #6 的 WalletQuota 统一精确到分的入账与补单，并保留溢出检查。订阅锁序、预扣幂等和 Auto 展示随 main 集成，不包含 #5。
补充合成 HTTP 回归，验证新订单 uid 与实际支付 URL 一致，旧订单 uid 兼容用例仍保留。由 Codex 按维护者生产发布授权整合；此 PR 作为完整 CI 与合并入口，验证完成后继续发布，不作为任务终点。
🚀 变更类型 / Type of change
🔗 关联任务 / Related Issue
生产发布接续 #6；保留当前生产 14 个业务提交，排除 #5。
✅ 提交前检查项 / Checklist
📸 运行证明 / Proof of Work
生产提交 f676e27 与原 main df48ce0 的历史均保留。完整 CI 38869245549 通过后，以 merge commit 51bd2fc 合回 main。异步退款测试修正 CollectT 的使用，仍要求钱包和 Key 均恢复原值。
外层发布 0c94216ff7cffd6799cbdad2935e317d588726a5 已通过完整 CI 并部署；镜像来源、配置摘要及文件层均经核对。生产应用健康，公网健康接口/登录页/应用脚本为 200，无 Key 请求为 401；400 份既有订阅、486 个 Key 及价格/渠道/支付配置的保护核对通过。未重启数据库或 Redis，未回滚，未执行真实支付。