fix(payment): 增加支付配置诊断并拦截取消中的订单
- isConfigured 拆出 getConfigDiagnostics,日志列出缺失项且不输出密钥 - 证书路径支持 WXPAY_PRIVATE_KEY_PATH / WXPAY_PUBLIC_KEY_PATH 覆盖 - 已申请取消或已取消的订单不再回刷 paid,也不允许发起支付 - 发起支付与查询退款未配置时输出诊断日志
This commit is contained in:
+8
-2
@@ -182,7 +182,7 @@ class HandlerPayment {
|
||||
|
||||
/**
|
||||
* 支付成功收敛:流水 → pay_success,订单快照 → paid
|
||||
* 订单已取消时不刷 paid,返回 cancelled 由调用方发起退款。
|
||||
* 订单已取消(cancelStatus 非 none)时不刷 paid,返回 cancelled 由调用方发起退款。
|
||||
* @returns {{ payment: Object, record: Object|null, cancelled: boolean }}
|
||||
*/
|
||||
static async applyPaymentSuccess(paymentRecord, transaction = {}) {
|
||||
@@ -209,7 +209,8 @@ class HandlerPayment {
|
||||
if (!record || record.deletedAt) {
|
||||
return { payment, record: null, cancelled: true };
|
||||
}
|
||||
if (record.status === "cancelled") {
|
||||
// 取消与 status 解耦:已申请取消或已取消的订单都不再回刷 paid(兼容旧数据 status=cancelled)
|
||||
if ((record.cancelStatus || "none") !== "none" || record.status === "cancelled") {
|
||||
return { payment, record, cancelled: true };
|
||||
}
|
||||
// 已进入退款阶段的流水不再回刷 paid,避免快照倒退
|
||||
@@ -463,6 +464,9 @@ class HandlerPayment {
|
||||
if (payChannel !== "online_wechat") {
|
||||
return ResponseUtil.badRequest(ctx, "请先切换为微信支付");
|
||||
}
|
||||
if ((record.cancelStatus || "none") !== "none" || record.status === "cancelled") {
|
||||
return ResponseUtil.badRequest(ctx, "订单已取消或正在取消,无法支付");
|
||||
}
|
||||
if (!PAYABLE_ORDER_STATUS.includes(record.status)) {
|
||||
return ResponseUtil.badRequest(ctx, "当前订单状态不支持支付");
|
||||
}
|
||||
@@ -470,6 +474,7 @@ class HandlerPayment {
|
||||
return ResponseUtil.badRequest(ctx, "订单已支付,请勿重复支付");
|
||||
}
|
||||
if (!wxpay.isConfigured()) {
|
||||
logger.warn(`[payment] 微信支付未配置,拒绝发起支付 recordId=${id}:${wxpay.getConfigDiagnostics().join(";")}`);
|
||||
return ResponseUtil.error(ctx, "支付功能暂未开放,请选择线下支付", null, 503);
|
||||
}
|
||||
|
||||
@@ -879,6 +884,7 @@ class HandlerPayment {
|
||||
.sort({ createdAt: -1 });
|
||||
if (!refundRecord) return ResponseUtil.error(ctx, "无退款记录", null, 404);
|
||||
if (!wxpay.isConfigured()) {
|
||||
logger.warn(`[payment] 微信支付未配置,拒绝查询退款 recordId=${id}:${wxpay.getConfigDiagnostics().join(";")}`);
|
||||
return ResponseUtil.error(ctx, "支付功能暂未开放,请选择线下支付", null, 503);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user