From 3e9fdf05842e0a297056f1aa14b34af1ac77dc31 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Thu, 16 Jul 2026 11:31:48 +0800 Subject: [PATCH] commit --- .../process/TheRapyRecuperationEnrollController.java | 7 ++++++- .../service/impl/TheRapyRecuperationEnrollServiceImpl.java | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationEnrollController.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationEnrollController.java index c6dff08..3535ae0 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationEnrollController.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/controller/process/TheRapyRecuperationEnrollController.java @@ -254,8 +254,13 @@ public class TheRapyRecuperationEnrollController { Map resultMap = new HashMap<>(); if("zjxu".equals(config.getConfigValue())) { resultMap = enrollService.validSignUpInfoForZJXU((String) ShiroUtil.getPrincipalProperty("loginname"), enrollInfo); - } else { + } else if("zjiet".equals(config.getConfigValue())) { resultMap = enrollService.validSignUpInfo((String) ShiroUtil.getPrincipalProperty("loginname"), enrollInfo); + } else if("zjnu".equals(config.getConfigValue())) { + resultMap = enrollService.validSignUpInfoForZJNU((String) ShiroUtil.getPrincipalProperty("loginname"), enrollInfo); + } else if("hmc".equals(config.getConfigValue())) { + // HMC酒店提交必须在行锁范围内重新校验名额，避免并发报名超过酒店最大人数。 + resultMap = enrollService.validSignUpInfoForHMC((String) ShiroUtil.getPrincipalProperty("loginname"), enrollInfo); } if (resultMap.containsKey(false)) { return Result.error(resultMap.get(false)); diff --git a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationEnrollServiceImpl.java b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationEnrollServiceImpl.java index 150e674..5bff829 100644 --- a/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationEnrollServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/therapyRecuperation/service/impl/TheRapyRecuperationEnrollServiceImpl.java @@ -1075,7 +1075,8 @@ public class TheRapyRecuperationEnrollServiceImpl extends ViServiceImpl oneYear = this.validCountOneYear(loginName, travelFrequency, editOther); - if (oneYear != null) { + // 酒店年度报名校验仅在失败时提前返回；校验成功后继续判断酒店最大报名人数。 + if (oneYear != null && oneYear.containsKey(false)) { return oneYear; } }