完成支付失败商户轮换禁用
Some checks failed
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Failing after 5h7m21s

This commit is contained in:
2026-09-22 15:58:03 +08:00
parent 622e99b543
commit 9959168e22
16 changed files with 579 additions and 70 deletions

View File

@@ -385,6 +385,9 @@ func (h *ClientWalletHandler) createWechatRecharge(
if err := h.paymentStore.CreateWithTx(resolved.SkipPermissionCtx, tx, payment); err != nil {
return errors.Wrap(errors.CodeDatabaseError, err, "创建支付记录失败")
}
if err := merchantpayment.RecordRoutingAttempt(resolved.SkipPermissionCtx, tx, payment); err != nil {
return err
}
return h.appendRechargePaymentCreatedAudit(resolved.SkipPermissionCtx, tx, payment, rechargeOrder)
}); err != nil {
return err
@@ -405,7 +408,14 @@ func (h *ClientWalletHandler) createWechatRecharge(
int(req.Amount),
)
if err != nil {
if completeErr := h.completeRechargePaymentAttempt(resolved.SkipPermissionCtx, attempt, startedAt, constants.IntegrationResultUnknown, "request_unknown", "充值支付预下单结果未知"); completeErr != nil {
resultClass := constants.IntegrationResultUnknown
if merchantpayment.ShouldDisableMerchant(err) {
resultClass = constants.IntegrationResultFailed
if disableErr := merchantpayment.DisableMerchantAfterExplicitFailure(resolved.SkipPermissionCtx, h.db, payment, "payment_precreate_failed", time.Now()); disableErr != nil {
return disableErr
}
}
if completeErr := h.completeRechargePaymentAttempt(resolved.SkipPermissionCtx, attempt, startedAt, resultClass, "request_failed", "充值支付预下单结果已分类"); completeErr != nil {
return completeErr
}
if updateErr := h.markRechargePaymentFailed(resolved.SkipPermissionCtx, payment); updateErr != nil {
@@ -480,18 +490,22 @@ func (h *ClientWalletHandler) createAlipayRecharge(
if err := h.paymentStore.CreateWithTx(resolved.SkipPermissionCtx, tx, payment); err != nil {
return err
}
if err := merchantpayment.RecordRoutingAttempt(resolved.SkipPermissionCtx, tx, payment); err != nil {
return err
}
return h.appendRechargePaymentCreatedAudit(resolved.SkipPermissionCtx, tx, payment, rechargeOrder)
}); err != nil {
return err
}
wapURL, err := alipay.BuildWapPayURL(resolved.SkipPermissionCtx, config, payment, "资产钱包充值")
if err != nil {
if merchantpayment.ShouldDisableMerchant(err) {
if disableErr := merchantpayment.DisableMerchantAfterExplicitFailure(resolved.SkipPermissionCtx, h.db, payment, "payment_precreate_failed", time.Now()); disableErr != nil {
return disableErr
}
}
if updateErr := h.markRechargePaymentFailed(resolved.SkipPermissionCtx, payment); updateErr != nil {
h.logger.Warn("标记支付宝支付单 failed 失败",
zap.String("payment_no", paymentNo),
zap.Error(updateErr),
)
h.logger.Warn("标记支付宝支付单 failed 失败", zap.String("payment_no", paymentNo), zap.Error(updateErr))
}
return err
}