From 609bcde92512168ad67e05493a6dd8a72253379d Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期二, 15 九月 2026 10:08:46 +0800
Subject: [PATCH] fix(merchant): 进件回调不再拿着数据库事务去等汇付 HTTP
---
talent-card-server/src/main/resources/application.yml | 7 +++++++
talent-card-server/src/main/java/com/talentcard/server/business/merchant/MerchantSettlementService.java | 49 +++++++++++++++++++++++++++++++++++++------------
2 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/talent-card-server/src/main/java/com/talentcard/server/business/merchant/MerchantSettlementService.java b/talent-card-server/src/main/java/com/talentcard/server/business/merchant/MerchantSettlementService.java
index 9e55e3d..1d413cc 100644
--- a/talent-card-server/src/main/java/com/talentcard/server/business/merchant/MerchantSettlementService.java
+++ b/talent-card-server/src/main/java/com/talentcard/server/business/merchant/MerchantSettlementService.java
@@ -366,7 +366,7 @@
jdbc.update("update merchant_onboarding_application set status='pending', wechat_config_status='failed', wechat_config_response_code=?, wechat_config_response_message=?, reject_reason=?, reviewed_at=null where id=?", code, message, "微信商户配置失败：" + reason, application.get("id"));
} else {
jdbc.update("update merchant_onboarding_application set wechat_config_status='approved', wechat_config_response_code=?, wechat_config_response_message=?, reject_reason=null where id=?", code, message, application.get("id"));
- continuePostOnboardingProvisioning(clean(application.get("applicationNo")));
+ continueProvisioningAfterCommit(clean(application.get("applicationNo")));
}
return true;
}
@@ -390,7 +390,7 @@
jdbc.update("update merchant_onboarding_application set status='pending', business_open_status='failed', business_open_apply_no=coalesce(nullif(?,''),business_open_apply_no), business_open_response_code=?, business_open_response_message=?, reject_reason=?, reviewed_at=null where id=?", applyNo, code, message, "商户业务开通失败：" + reason, application.get("id"));
} else if ("S".equalsIgnoreCase(businessStatus)) {
jdbc.update("update merchant_onboarding_application set business_open_status='approved', business_open_apply_no=coalesce(nullif(?,''),business_open_apply_no), business_open_response_code=?, business_open_response_message=?, reject_reason=null where id=?", applyNo, code, message, application.get("id"));
- completePostOnboardingProvisioning(application.get("id"));
+ completeProvisioningAfterCommit(application.get("id"));
} else {
jdbc.update("update merchant_onboarding_application set business_open_status='processing', business_open_apply_no=coalesce(nullif(?,''),business_open_apply_no), business_open_response_code=?, business_open_response_message=? where id=?", applyNo, code, message, application.get("id"));
}
@@ -474,6 +474,40 @@
}
/**
+ * 把「继续做后续配置」推迟到当前事务提交之后。
+ *
+ * <p>两个回调都是先 {@code select ... for update} 锁住进件记录，再走到后续配置；而后续配置会
+ * **同步调用汇付的 HTTP 接口**（微信小程序配置、商户业务开通）。在事务里调外部接口意味着：
+ * 拿着这条进件记录的行锁和一条数据库连接，去等一个不受控的网络响应。慢一点就把连接池占住，
+ * 进而让**整张 merchant_onboarding_application 上的查询全部排队**——2026-09-15 后台全站
+ * 不可用就是这个形态（一个空闲未提交事务持着元数据锁，DDL 无限等锁，10 条连接被借光）。
+ *
+ * <p>提交后再做还有第二个好处：回调只负责把通道结果落库，后续配置自己有重试入口
+ * （业务开通回调、主动轮询），不会被回调事务的成败牵连。
+ */
+ private void continueProvisioningAfterCommit(String applicationNo) {
+ runAfterCommit(() -> continuePostOnboardingProvisioning(applicationNo));
+ }
+
+ private void completeProvisioningAfterCommit(Object applicationId) {
+ runAfterCommit(() -> completePostOnboardingProvisioning(applicationId));
+ }
+
+ /** 有活动事务就注册 afterCommit，否则立即执行（例如被非事务入口直接调用）。 */
+ private void runAfterCommit(Runnable task) {
+ if (!TransactionSynchronizationManager.isSynchronizationActive()) {
+ task.run();
+ return;
+ }
+ TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
+ @Override
+ public void afterCommit() {
+ task.run();
+ }
+ });
+ }
+
+ /**
* 进件审核通过后补一次收款能力快照。
*
* <p>必须在当前事务提交之后再刷新：能力快照用 {@code REQUIRES_NEW} 在独立事务里写，而微信商户配置
@@ -482,16 +516,7 @@
* {@code CannotAcquireLockException} 失败，快照永远补不上，商户虽然进件通过却始终无法收款。
*/
private void refreshCapabilityAfterCommit(Long applicationId) {
- if (!TransactionSynchronizationManager.isSynchronizationActive()) {
- paymentReadinessService.refreshQuietly(applicationId);
- return;
- }
- TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
- @Override
- public void afterCommit() {
- paymentReadinessService.refreshQuietly(applicationId);
- }
- });
+ runAfterCommit(() -> paymentReadinessService.refreshQuietly(applicationId));
}
@SuppressWarnings("unchecked")
diff --git a/talent-card-server/src/main/resources/application.yml b/talent-card-server/src/main/resources/application.yml
index 4aeeec1..f2fdfb3 100644
--- a/talent-card-server/src/main/resources/application.yml
+++ b/talent-card-server/src/main/resources/application.yml
@@ -14,6 +14,13 @@
username: ${MYSQL_USERNAME:root}
password: ${MYSQL_PASSWORD:123456}
driver-class-name: com.mysql.cj.jdbc.Driver
+ hikari:
+ # 池只有 10 条连接，任何一条被长期占用都足以让整个后台排队到超时
+ # （2026-09-15 的事故：一个空闲未提交事务持着元数据锁，ALTER 无限等锁，
+ # 该表所有查询跟着排队，10 条连接很快被借光，健康检查都超时）。
+ # 超过这个时间还没归还的连接，Hikari 会连调用栈一起打进日志——
+ # 这是定位「谁在长事务里等外部 HTTP」最直接的手段。
+ leak-detection-threshold: 10000
data:
redis:
host: ${REDIS_HOST:localhost}
--
Gitblit v1.7.1