feat: 微信查单加短 TTL 缓存并允许 closed 终态回写
- queryPayment 高频轮询加短 TTL 缓存 + 同单号并发合并, 避免把支付页轮询放大成微信侧流量;失败不缓存 - closed 也允许回写流水:关单与支付成功存在竞态, 以微信侧明确终结的交易状态收敛本地流水
This commit is contained in:
+94
-8
@@ -39,6 +39,76 @@ function toDate(value) {
|
||||
return Number.isNaN(date.getTime()) ? null : date;
|
||||
}
|
||||
|
||||
// 支付页轮询会高频触发查单:短 TTL 缓存 + 同号合并,避免把前端轮询放大成微信侧流量。
|
||||
// 只用于 queryPayment,后台巡检/关单仍直接查微信,保证收敛判断拿到最新状态
|
||||
const ORDER_QUERY_TTL = 3000;
|
||||
const ORDER_QUERY_CACHE_MAX = 1000;
|
||||
|
||||
/**
|
||||
* 创建查单缓存
|
||||
*
|
||||
* - TTL 内重复查询直接复用结果;
|
||||
* - 同一 outTradeNo 的并发请求共享同一次上游调用;
|
||||
* - 查询失败不缓存,下一轮仍会重试。
|
||||
*
|
||||
* @param {Object} [options]
|
||||
* @param {number} [options.ttl] 缓存毫秒数
|
||||
* @param {number} [options.maxSize] 最大缓存条数
|
||||
* @param {Function} [options.query] 实际查单函数
|
||||
* @param {Function} [options.now] 时钟(测试注入)
|
||||
* @returns {Function} (outTradeNo, { force }?) => Promise<Object>
|
||||
*/
|
||||
export function createOrderQueryCache({
|
||||
ttl = ORDER_QUERY_TTL,
|
||||
maxSize = ORDER_QUERY_CACHE_MAX,
|
||||
query = (outTradeNo) => wxpay.queryOrder(outTradeNo),
|
||||
now = nowMs,
|
||||
} = {}) {
|
||||
const cache = new Map();
|
||||
const inFlight = new Map();
|
||||
|
||||
const prune = () => {
|
||||
const time = now();
|
||||
for (const [key, entry] of cache) {
|
||||
if (entry.expiresAt <= time) cache.delete(key);
|
||||
}
|
||||
while (cache.size > maxSize) {
|
||||
cache.delete(cache.keys().next().value);
|
||||
}
|
||||
};
|
||||
|
||||
return async function queryOrderCached(outTradeNo, { force = false } = {}) {
|
||||
if (!outTradeNo) return query(outTradeNo);
|
||||
|
||||
if (!force) {
|
||||
const hit = cache.get(outTradeNo);
|
||||
if (hit && hit.expiresAt > now()) return hit.trade;
|
||||
}
|
||||
|
||||
const running = inFlight.get(outTradeNo);
|
||||
if (running) return running;
|
||||
|
||||
const task = Promise.resolve()
|
||||
.then(() => query(outTradeNo))
|
||||
.then((trade) => {
|
||||
cache.set(outTradeNo, { trade, expiresAt: now() + ttl });
|
||||
prune();
|
||||
return trade;
|
||||
})
|
||||
.finally(() => {
|
||||
inFlight.delete(outTradeNo);
|
||||
});
|
||||
|
||||
inFlight.set(outTradeNo, task);
|
||||
return task;
|
||||
};
|
||||
}
|
||||
|
||||
const queryOrderForPolling = createOrderQueryCache();
|
||||
|
||||
// 微信侧已明确终结的交易状态:可以直接把本地流水收敛为 closed
|
||||
const CLOSED_TRADE_STATES = ["CLOSED", "PAYERROR", "REFUND", "REVOKED"];
|
||||
|
||||
function replySuccess(ctx) {
|
||||
// 官方约定:验签通过应答 200/204,无需返回应答报文
|
||||
ctx.status = 200;
|
||||
@@ -198,8 +268,11 @@ class HandlerPayment {
|
||||
const transactionId = transaction.transactionId || paymentRecord.transactionId;
|
||||
if (transactionId) setFields.transactionId = transactionId;
|
||||
|
||||
// closed 也允许回写:关单与支付成功存在竞态(关单瞬间用户完成支付),
|
||||
// 流水可能已被置为 closed,但微信侧确实是 SUCCESS。
|
||||
// 不允许恢复就会丢 transactionId,退款时找不到 pay_success 流水只能人工核对
|
||||
const updated = await DBModel.PaymentRecord.findOneAndUpdate(
|
||||
{ _id: paymentRecord._id, status: { $in: ACTIVE_PAYMENT_STATUS } },
|
||||
{ _id: paymentRecord._id, status: { $in: [...ACTIVE_PAYMENT_STATUS, "closed"] } },
|
||||
{ $set: setFields },
|
||||
{ new: true }
|
||||
);
|
||||
@@ -704,7 +777,8 @@ class HandlerPayment {
|
||||
|
||||
if (payment && ACTIVE_PAYMENT_STATUS.includes(payment.status) && wxpay.isConfigured()) {
|
||||
try {
|
||||
const trade = await wxpay.queryOrder(payment.outTradeNo);
|
||||
// 轮询复用短 TTL 查单结果,避免前端每次刷新都打一次微信
|
||||
const trade = await queryOrderForPolling(payment.outTradeNo);
|
||||
tradeState = trade.trade_state || null;
|
||||
if (trade.trade_state === "SUCCESS") {
|
||||
HandlerPayment.verifyTrade(trade, payment);
|
||||
@@ -723,11 +797,17 @@ class HandlerPayment {
|
||||
}
|
||||
} else {
|
||||
const expireAt = toDate(payment.timeExpireAt);
|
||||
if (payment.status === "created" && trade.trade_state === "NOTPAY"
|
||||
if (CLOSED_TRADE_STATES.includes(trade.trade_state)) {
|
||||
await HandlerPayment.setPaymentStatus(payment._id, "closed", { closedAt: new Date() });
|
||||
} else if (payment.status === "created" && trade.trade_state === "NOTPAY"
|
||||
&& expireAt && nowMs() > expireAt.getTime()) {
|
||||
await HandlerPayment.closeExpiredPayment(payment);
|
||||
} else if (payment.status === "closed_unconfirmed") {
|
||||
await HandlerPayment.setPaymentStatus(payment._id, "closed", { closedAt: new Date() });
|
||||
} else if (payment.status === "closed_unconfirmed"
|
||||
&& trade.trade_state === "NOTPAY"
|
||||
&& expireAt && nowMs() > expireAt.getTime()) {
|
||||
// 关单结果不确定时不能仅凭 NOTPAY 就落 closed:微信侧旧单在过期前仍可能支付。
|
||||
// 已过期则补一次关单,失败保持 closed_unconfirmed 交给巡检继续收敛
|
||||
await HandlerPayment.closeExpiredPayment(payment);
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
@@ -1067,13 +1147,19 @@ async function sweepPayment(payment) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (payment.status === "closed_unconfirmed") {
|
||||
// 微信侧已明确终结:无需再关单,直接收敛
|
||||
if (CLOSED_TRADE_STATES.includes(state)) {
|
||||
await HandlerPayment.setPaymentStatus(payment._id, "closed", { closedAt: new Date() });
|
||||
return;
|
||||
}
|
||||
|
||||
if (["CLOSED", "PAYERROR", "REFUND", "REVOKED"].includes(state)) {
|
||||
await HandlerPayment.setPaymentStatus(payment._id, "closed", { closedAt: new Date() });
|
||||
// 关单结果不确定时不能仅凭 NOTPAY 就落 closed:微信侧旧单在过期前仍可能支付。
|
||||
// 未过期保持 closed_unconfirmed 交给下一轮继续收敛;已过期才补一次关单
|
||||
if (payment.status === "closed_unconfirmed") {
|
||||
if (state === "NOTPAY" && payment.timeExpireAt
|
||||
&& nowMs() > new Date(payment.timeExpireAt).getTime()) {
|
||||
await HandlerPayment.closeExpiredPayment(payment);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user