From ac44d2c693c433ed230652ed3f1f6516042309c5 Mon Sep 17 00:00:00 2001
From: shinnosuke <tantao@1hoper.com>
Date: 星期三, 19 八月 2026 11:02:25 +0800
Subject: [PATCH] fix: complete merchant portal and login account setup
---
talent-card-server/src/main/java/com/talentcard/server/service/ServiceAppointmentApplicationService.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/talent-card-server/src/main/java/com/talentcard/server/service/ServiceAppointmentApplicationService.java b/talent-card-server/src/main/java/com/talentcard/server/service/ServiceAppointmentApplicationService.java
index 1495ae6..7cff961 100644
--- a/talent-card-server/src/main/java/com/talentcard/server/service/ServiceAppointmentApplicationService.java
+++ b/talent-card-server/src/main/java/com/talentcard/server/service/ServiceAppointmentApplicationService.java
@@ -360,7 +360,9 @@
String actualType = text(merchant, "merchantType", "merchant_type");
boolean medicalType = "medical".equalsIgnoreCase(expectedType)
&& ("medical".equalsIgnoreCase(actualType) || "healthCheck".equalsIgnoreCase(actualType) || "免费体检".equals(actualType));
- if (expectedType != null && !medicalType && !expectedType.equalsIgnoreCase(actualType)) {
+ boolean hotelType = "hotel".equalsIgnoreCase(expectedType)
+ && ("hotel".equalsIgnoreCase(actualType) || "酒店".equals(actualType) || "酒店服务".equals(actualType));
+ if (expectedType != null && !medicalType && !hotelType && !expectedType.equalsIgnoreCase(actualType)) {
throw new BusinessException(ErrorCode.CONFLICT, message);
}
return merchant;
--
Gitblit v1.7.1