From f2cca8fe463efe96ad8d949a40bbee52baf89d8c Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期一, 12 十月 2026 14:28:20 +0800
Subject: [PATCH] fix(admin): 精简纳管对话框的文字
---
talent-card-server/src/test/java/com/talentcard/server/business/admin/MerchantManagedOnboardingTests.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/talent-card-server/src/test/java/com/talentcard/server/business/admin/MerchantManagedOnboardingTests.java b/talent-card-server/src/test/java/com/talentcard/server/business/admin/MerchantManagedOnboardingTests.java
index 291be6d..371c846 100644
--- a/talent-card-server/src/test/java/com/talentcard/server/business/admin/MerchantManagedOnboardingTests.java
+++ b/talent-card-server/src/test/java/com/talentcard/server/business/admin/MerchantManagedOnboardingTests.java
@@ -159,9 +159,13 @@
stubConvergedChannel(huifuId, "622200001234", "external-card-token");
service.adopt(first.merchantId(), huifuId, APPLY_NO, true);
+ // 门店名与商家名一样时不重复印一遍——多数门店就是这样，列表里不该出现「某某商户（某某商户）」。
+ jdbc.update("update merchant_store set store_name = ? where id = ?", first.key(), first.storeId());
Map<String, Object> preview = service.preview(second.merchantId(), huifuId);
- assertThat((List<?>) preview.get("boundMerchants")).anySatisfy(name -> assertThat(String.valueOf(name)).contains(first.key()));
+ assertThat(preview.get("boundMerchants"))
+ .asInstanceOf(org.assertj.core.api.InstanceOfAssertFactories.list(String.class))
+ .containsExactly(first.key());
assertThat((List<?>) preview.get("blockers")).as("已被其他商家绑定只是提示，不能拦").isEmpty();
assertThat(service.adopt(second.merchantId(), huifuId, APPLY_NO, true)).containsEntry("status", "approved");
assertThat(readinessService.requireCollectingMerchant(second.merchantId(), second.storeId()).huifuId()).isEqualTo(huifuId);
--
Gitblit v1.7.1