From 9d994ea0eee51dbc87fe83ead985580545926b8a Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期二, 15 九月 2026 21:41:58 +0800
Subject: [PATCH] feat(merchant): 完善存量商户微信开通进度闭环
---
talent-card-server/src/main/java/com/talentcard/server/business/admin/MerchantSettlementAdminService.java | 6 ++++++
1 files changed, 6 insertions(+), 0 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 9fc86e8..7bf7c74 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
@@ -30,6 +30,11 @@
private final SensitiveDataCrypto sensitiveDataCrypto;
private final MerchantPaymentReadinessService readinessService;
private final HuifuSettlementRecordGateway settlementRecordGateway;
+ @org.springframework.beans.factory.annotation.Autowired
+ private com.talentcard.server.business.merchant.MerchantOnboardingProgressService progressService;
+
+ 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 MerchantSettlementAdminService(JdbcTemplate jdbc, SensitiveDataCrypto sensitiveDataCrypto, MerchantPaymentReadinessService readinessService, HuifuSettlementRecordGateway settlementRecordGateway) { this.jdbc = jdbc; this.sensitiveDataCrypto = sensitiveDataCrypto; this.readinessService = readinessService; this.settlementRecordGateway = settlementRecordGateway; }
/**
@@ -123,6 +128,7 @@
List<Map<String, Object>> rows = rows("select a.*, a.merchant_name as onboarding_merchant_name, m.merchant_name, m.merchant_type, m.contact_mobile, s.store_name from merchant_onboarding_application a join merchant m on m.id = a.merchant_id join merchant_store s on s.id = a.store_id where a.id = ?", id);
if (rows.isEmpty()) throw new BusinessException(ErrorCode.NOT_FOUND, "商户进件不存在");
Map<String, Object> result = rows.get(0);
+ if (progressService.supports(result)) result.put("progress", progressService.view(result));
// 个人主体的历史记录可能使用 individual、personal 或中文类型值；
// 只要已保存加密身份证号，后台详情均应解密后完整展示。
String encrypted = String.valueOf(result.get("subjectIdNoEncrypted"));
--
Gitblit v1.7.1