From e19bc11617b9e32da8f5453afa84eae00c9cb615 Mon Sep 17 00:00:00 2001
From: shinnosuke <tantao@1hoper.com>
Date: 星期四, 13 八月 2026 17:33:30 +0800
Subject: [PATCH] fix(merchant): 支持家电商家登录配置
---
talent-card-admin/src/views/MerchantCreateView.vue | 5 +++--
talent-card-server/src/test/java/com/talentcard/server/business/admin/AdminBusinessServiceTests.java | 1 +
talent-card-server/src/main/java/com/talentcard/server/business/admin/AdminBusinessService.java | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/talent-card-admin/src/views/MerchantCreateView.vue b/talent-card-admin/src/views/MerchantCreateView.vue
index e8466e6..1323c2f 100644
--- a/talent-card-admin/src/views/MerchantCreateView.vue
+++ b/talent-card-admin/src/views/MerchantCreateView.vue
@@ -89,8 +89,9 @@
const isSpouseEmploymentMerchant = computed(() => normalizedMerchantType.value === '配偶推荐就业')
const isApprovalMerchant = computed(() => normalizedMerchantType.value === '行政审批')
const isServiceMerchant = computed(() => isFoodMerchant.value || normalizedMerchantType.value === '景区服务')
-const merchantAppLoginOptionalTypes = ['数码服务', '文化服务', '电信服务', '口腔治疗保健']
-const usesSimplifiedMerchantSettings = computed(() => merchantAppLoginOptionalTypes.includes(normalizedMerchantType.value))
+const merchantAppLoginOptionalTypes = ['数码服务', '文化服务', '电信服务', '口腔治疗保健', '家电服务']
+const simplifiedMerchantSettingsTypes = ['数码服务', '文化服务', '电信服务', '口腔治疗保健']
+const usesSimplifiedMerchantSettings = computed(() => simplifiedMerchantSettingsTypes.includes(normalizedMerchantType.value))
const supportsMerchantAppLogin = computed(() => (
isServiceMerchant.value
|| isApartmentMerchant.value
diff --git a/talent-card-server/src/main/java/com/talentcard/server/business/admin/AdminBusinessService.java b/talent-card-server/src/main/java/com/talentcard/server/business/admin/AdminBusinessService.java
index 3f3f7d5..a787b21 100644
--- a/talent-card-server/src/main/java/com/talentcard/server/business/admin/AdminBusinessService.java
+++ b/talent-card-server/src/main/java/com/talentcard/server/business/admin/AdminBusinessService.java
@@ -27,7 +27,7 @@
public class AdminBusinessService {
private static final Set<String> MERCHANT_APP_LOGIN_TYPES = Set.of(
- "餐饮服务", "景区服务", "数码服务", "文化服务", "电信服务", "口腔治疗保健"
+ "餐饮服务", "景区服务", "数码服务", "文化服务", "电信服务", "口腔治疗保健", "家电服务"
);
private final JdbcTemplate jdbcTemplate;
diff --git a/talent-card-server/src/test/java/com/talentcard/server/business/admin/AdminBusinessServiceTests.java b/talent-card-server/src/test/java/com/talentcard/server/business/admin/AdminBusinessServiceTests.java
index 6dcb3aa..01f5334 100644
--- a/talent-card-server/src/test/java/com/talentcard/server/business/admin/AdminBusinessServiceTests.java
+++ b/talent-card-server/src/test/java/com/talentcard/server/business/admin/AdminBusinessServiceTests.java
@@ -32,6 +32,7 @@
assertThat(service.supportsMerchantAppLogin("文化服务")).isTrue();
assertThat(service.supportsMerchantAppLogin("电信服务")).isTrue();
assertThat(service.supportsMerchantAppLogin("口腔治疗保健")).isTrue();
+ assertThat(service.supportsMerchantAppLogin("家电服务")).isTrue();
}
@Test
--
Gitblit v1.7.1