Repository navigation
fix(payment): bound closed-order payment recovery by the order deadline - #8765
Open
lishuangqiang wants to merge 1 commit into
Open
lishuangqiang wants to merge 1 commit into
lishuangqiang wants to merge 1 commit into
Conversation
EXPIRED/CANCELLED 订单仍可能收到上游支付确认,过去是这样收敛的: - EXPIRED:要求 updated_at 在最近 5 分钟内; - CANCELLED:无任何时间约束。 updated_at 不是“关闭时刻”,它是可被任何写入刷新的字段。主动查单 (VerifyOrderByOutTradeNo / resume-token 查单) 在调用 HandlePaymentNotification 之前会先把上游 trade_no 落库,这次 UPDATE 把 updated_at 刷新为当下,于是: 1. 几小时前就过期的订单,用户点一次“查询支付状态”; 2. 上游返回已支付,且 trade_no 与库里不同(扫码/precreate 单的常态); 3. 宽限判断成立,订单被置为 PAID 并按**下单时锁定的金额**履约。 CANCELLED 更直接:没有时间约束,任何时刻的迟到支付都按旧快照入账。 修复: - 过期与取消统一用订单自身的 expires_at + paymentRecoveryWindow(30m) 判定, 与 updated_at 解耦,内部写入无法再延长恢复窗口; - 超出窗口的支付不再自动履约,改为落 PAYMENT_AFTER_EXPIRY / PAYMENT_AFTER_CANCEL 审计(含 expiresAt / recoveryEnd)并 ack,转人工处理,避免渠道无限重试; - 窗口内的支付保持原行为:到期瞬间付款、回调稍晚到达仍正常入账。 测试:新增 payment_order_recovery_window_test.go 四个用例,覆盖“过期/取消” 在窗口内外的四种组合;窗口外的两条在修复前失败(订单被履约、余额按旧金额到账)。
This was referenced Nov 13, 2026
Contributor
Author
|
CI 情况说明: govulncheck 报的是标准库漏洞 GO-2026-6859( 已单独提交 #8767 升级工具链(go.mod + 4 处 workflow 断言 + 3 个 Dockerfile)。那个 PR 合入后本 PR 重新跑即可转绿。 本 PR 自身的检查: |
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.
问题
支付订单在
expires_at之后被标记为EXPIRED,或者被用户/管理员取消为CANCELLED。这两种状态下上游仍可能确认收到钱,所以需要允许“恢复入账”;但toPaid的判定条件本身不成立:updated_at不是“关闭时刻”,任何写入都会刷新它。触发场景
updated_at= 当时);VerifyOrderByOutTradeNo(或带签名的 resume-token 查单);checkPaidWithOptions在上游返回已支付后,先把 upstram trade_no 落库——paymentorderShouldPersistUpstreamTradeNo在payment_trade_no为空或与上游不同时返回 true,这是扫码 / precreate 单的常态,于是这次
UPDATE把updated_at刷成了当下;HandlePaymentNotification → confirmPayment重新读库,updated_at已经是现在,5 分钟宽限成立 → 订单置为
PAID并履约。履约金额取自订单快照(
amount/bonus_amount/pay_amount都在下单时锁定),所以效果是一张早已关闭的订单被按旧价格复活:充值倍率、赠送档位、套餐价格在下单后调整过,也会按旧值到账。
CANCELLED更直接:没有任何时间约束,任何时刻的迟到支付都按旧快照入账(渠道侧关闭失败、或用户在多端同时操作时并不罕见)。
修复
expires_at+paymentRecoveryWindow(30 分钟) 判定,与
updated_at解耦,内部写入无法再延长恢复窗口;PAYMENT_AFTER_EXPIRY/PAYMENT_AFTER_CANCEL审计(含
expiresAt/recoveryEnd/updatedAt)并向渠道 ack,转人工处理,避免渠道无限重试;
paymentRecoveryWindow是一个具名常量,维护者可以按部署实际的渠道回调延迟调整。测试
新增
payment_order_recovery_window_test.go,四种组合:TestVerifyOrderByOutTradeNoDoesNotReviveOrderLongAfterExpiryPAYMENT_AFTER_EXPIRYTestWebhookPaymentForLongCancelledOrderIsNotFulfilledPAYMENT_AFTER_CANCELTestExpiredOrderPaidWithinRecoveryWindowIsFulfilledTestCancelledOrderPaidWithinOrderWindowIsRecovered前两条在修复前失败(订单被置为
COMPLETED、余额按旧金额到账),修复后通过;后两条在修复前后都通过,用于锁定“不要误杀正常恢复”。本地验证:
go test -tags=unit ./internal/service/ ./internal/handler/ ./internal/repository/(
internal/service全量跑时有一条与本改动无关的堆内存断言偶发失败TestInflightEstimate_AccountMappingNoDBAndBoundedMemory,单独运行通过)go vet -tags=unit ./internal/service/通过需要确认的行为变化
超出窗口的迟到支付从“自动入账”改为“只记审计、转人工”。这是刻意的:自动入账等于允许无限期的旧价格履约。如果维护者希望更长/更短的窗口,只需调整
paymentRecoveryWindow。后续可做的根因治理(本 PR 未包含):把订单
expires_at传给渠道侧(支付宝timeout_express、微信time_expire、Stripe Checkoutexpires_at),让支付会话随订单一起失效,从源头上减少“过期后仍能付款”的情况。Closes #8766