From e528e66851ea030e3b144760ef8d5a12e752eb3f Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期四, 17 九月 2026 12:37:34 +0800
Subject: [PATCH] feat(merchant): 新增商户端收款能力自查与手动核实接口
---
talent-card-server/src/main/java/com/talentcard/server/business/merchant/MerchantSettlementService.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 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 69b9b99..547179a 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
@@ -94,6 +94,29 @@
return realnameService.submit(((Number)records.get(0).get("id")).longValue(),retry);
}
+ /**
+ * 商户端「收款能力」自查：能不能收款、为什么不能、最近什么时候核实过。
+ *
+ * <p>判定与下单闸门同源同文案，只读不查通道——商户在页面上看到的失败原因，必须和下单被拒时
+ * 看到的是同一句话，否则同一个事实会有两套口径。
+ */
+ @Transactional(readOnly = true)
+ public Map<String, Object> paymentReadiness(MerchantPrincipal principal) {
+ store(principal);
+ return paymentReadinessService.merchantView(principal.merchantId(), principal.storeId());
+ }
+
+ /**
+ * 商户端「立即核实」：主动查一次通道刷新能力快照，受冷却保护。
+ *
+ * <p>这里刻意不加 {@code @Transactional}：冷却窗口要在通道查询之前落库，而查询本身不能在持有
+ * 该行锁的事务里进行，见 {@code MerchantPaymentReadinessService.merchantVerify}。
+ */
+ public Map<String, Object> verifyPaymentReadiness(MerchantPrincipal principal) {
+ store(principal);
+ return paymentReadinessService.merchantVerify(principal.merchantId(), principal.storeId());
+ }
+
public MerchantSettlementService(JdbcTemplate jdbc, SensitiveDataCrypto sensitiveDataCrypto, HuifuIndividualOnboardingGateway individualOnboardingGateway, HuifuEnterpriseOnboardingGateway enterpriseOnboardingGateway, HuifuMerchantWechatConfigGateway merchantWechatConfigGateway, HuifuMerchantBusinessOpenGateway merchantBusinessOpenGateway, HuifuUserBusinessOpenGateway userBusinessOpenGateway, HuifuPaymentProperties huifuPaymentProperties, HuifuPictureUploadGateway pictureUploadGateway, MerchantPaymentReadinessService paymentReadinessService) {
this.jdbc = jdbc;
this.sensitiveDataCrypto = sensitiveDataCrypto;
--
Gitblit v1.7.1