From ad7773a39d74d16c6aaae53ca0c18dde14c83a0d Mon Sep 17 00:00:00 2001 From: lik Date: Sun, 8 Nov 2026 12:01:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=80=E6=AC=BE=E9=9D=9E=E6=88=90?= =?UTF-8?q?=E5=8A=9F=E7=BB=93=E6=9E=9C=E4=B8=8D=E5=9B=9E=E9=80=80=E5=B7=B2?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 创建/查询退款响应可能晚于成功回调到达:RefundRecord 与 PaymentRecord 均加 status 前置条件,迟到的 PROCESSING 不再把 success/refunded 回退成 processing/refunding --- handler/payment.js | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/handler/payment.js b/handler/payment.js index ebc3191..810d4a8 100644 --- a/handler/payment.js +++ b/handler/payment.js @@ -389,12 +389,11 @@ class HandlerPayment { const refundId = result.refund_id || refundRecord.refundId; if (refundId) setFields.refundId = refundId; - await DBModel.RefundRecord.updateOne( - { _id: refundRecord._id }, - { $set: setFields } - ); - if (status === "success") { + await DBModel.RefundRecord.updateOne( + { _id: refundRecord._id }, + { $set: setFields } + ); const recordSet = { "payment.status": "refunded", "meta.updatetime": nowMs() }; if (refundId) { recordSet["payment.refundNo"] = refundId; @@ -409,12 +408,21 @@ class HandlerPayment { { $set: recordSet } ); } else { + // 创建/查询响应可能晚于成功回调返回。非成功结果只能在退款尚未成功时落库, + // 否则迟到的 PROCESSING 会把 success/refunded 回退成 processing/refunding。 + const updated = await DBModel.RefundRecord.updateOne( + { _id: refundRecord._id, status: { $ne: "success" } }, + { $set: setFields } + ); + const matched = updated?.matchedCount ?? updated?.n; + if (matched === 0) return "success"; + await DBModel.PaymentRecord.updateOne( - { _id: refundRecord.paymentId }, + { _id: refundRecord.paymentId, status: { $ne: "refunded" } }, { $set: { status: "refunding", "meta.updatetime": nowMs() } } ); await DBModel.EscortRecord.updateOne( - { _id: refundRecord.recordId }, + { _id: refundRecord.recordId, "payment.status": { $ne: "refunded" } }, { $set: { "payment.status": "refunding", "meta.updatetime": nowMs() } } ); }