From 815d8a436a30d572ebf09817402bf35beb929aea Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期三, 16 九月 2026 00:43:46 +0800
Subject: [PATCH] feat(merchant): 分阶段刷新先推进开通步骤，重复提交前先查通道
---
talent-card-server/src/main/java/com/talentcard/server/business/admin/MerchantSettlementAdminService.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/talent-card-server/src/main/java/com/talentcard/server/business/admin/MerchantSettlementAdminService.java b/talent-card-server/src/main/java/com/talentcard/server/business/admin/MerchantSettlementAdminService.java
index cef62c4..c3f187f 100644
--- a/talent-card-server/src/main/java/com/talentcard/server/business/admin/MerchantSettlementAdminService.java
+++ b/talent-card-server/src/main/java/com/talentcard/server/business/admin/MerchantSettlementAdminService.java
@@ -34,9 +34,12 @@
private com.talentcard.server.business.merchant.MerchantOnboardingProgressService progressService;
@org.springframework.beans.factory.annotation.Autowired
private com.talentcard.server.business.merchant.MerchantRealnameService realnameService;
+ @org.springframework.beans.factory.annotation.Autowired
+ private com.talentcard.server.business.merchant.MerchantSettlementService settlementService;
public Map<String,Object> onboardingProgress(Long id) { return progressService.view(id); }
- public Map<String,Object> refreshOnboarding(Long id, boolean retry) { return progressService.refresh(id, retry); }
+ /** 后台刷新与商户端走同一条路径：先推进已满足前置条件的开通步骤，再查询回报结果。 */
+ public Map<String,Object> refreshOnboarding(Long id, boolean retry) { return settlementService.refreshProgress(id, retry); }
/** 微信实名认证：平台运营可在后台代为发起；未决申请不会重复提交。 */
public Map<String,Object> submitRealname(Long id, boolean retry) { return realnameService.submit(id, retry); }
public MerchantSettlementAdminService(JdbcTemplate jdbc, SensitiveDataCrypto sensitiveDataCrypto, MerchantPaymentReadinessService readinessService, HuifuSettlementRecordGateway settlementRecordGateway) { this.jdbc = jdbc; this.sensitiveDataCrypto = sensitiveDataCrypto; this.readinessService = readinessService; this.settlementRecordGateway = settlementRecordGateway; }
--
Gitblit v1.7.1