martial/martial-master
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 优化重复报名检查逻辑 - 只检查registration_status=1的记录，跳过而非拒绝重复报名

Browse Source
This commit is contained in:
hongjianli
2026-01-15 17:30:01 +08:00
parent b9d1d2987e
commit 254b22c969
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/springblade/modules/martial/controller/MartialRegistrationOrderController.java
+9 -7
View File
@@ -334,12 +334,13 @@ public class MartialRegistrationOrderController extends BladeController {
teamCheckWrapper.eq(MartialAthlete::getCompetitionId, dto.getCompetitionId()) teamCheckWrapper.eq(MartialAthlete::getCompetitionId, dto.getCompetitionId())
.eq(MartialAthlete::getProjectId, projectId) .eq(MartialAthlete::getProjectId, projectId)
.eq(MartialAthlete::getTeamName, team.getTeamName()) .eq(MartialAthlete::getTeamName, team.getTeamName())
.eq(MartialAthlete::getIsDeleted, 0); .eq(MartialAthlete::getIsDeleted, 0)
.eq(MartialAthlete::getRegistrationStatus, 1);
MartialAthlete existingTeamRecord = athleteService.getOne(teamCheckWrapper, false); MartialAthlete existingTeamRecord = athleteService.getOne(teamCheckWrapper, false);
if (existingTeamRecord != null) { if (existingTeamRecord != null) {
log.warn("集体重复报名: teamName={}, projectId={}", team.getTeamName(), projectId); log.warn("集体重复报名，已跳过: teamName={}, projectId={}", team.getTeamName(), projectId);
return R.fail("集体 " + team.getTeamName() + " 已报名该项目，请勿重复报名"); continue;
} }
MartialAthlete teamAthlete = new MartialAthlete(); MartialAthlete teamAthlete = new MartialAthlete();
@@ -377,13 +378,14 @@ public class MartialRegistrationOrderController extends BladeController {
checkWrapper.eq(MartialAthlete::getCompetitionId, dto.getCompetitionId()) checkWrapper.eq(MartialAthlete::getCompetitionId, dto.getCompetitionId())
.eq(MartialAthlete::getProjectId, projectId) .eq(MartialAthlete::getProjectId, projectId)
.eq(MartialAthlete::getIdCard, existingAthlete.getIdCard()) .eq(MartialAthlete::getIdCard, existingAthlete.getIdCard())
.eq(MartialAthlete::getIsDeleted, 0); .eq(MartialAthlete::getIsDeleted, 0)
.eq(MartialAthlete::getRegistrationStatus, 1);
MartialAthlete existingRecord = athleteService.getOne(checkWrapper, false); MartialAthlete existingRecord = athleteService.getOne(checkWrapper, false);
if (existingRecord != null) { if (existingRecord != null) {
// Reject duplicate registration // Skip duplicate registration
log.warn("选手重复报名: playerName={}, projectId={}", existingAthlete.getPlayerName(), projectId); log.warn("选手重复报名，已跳过: playerName={}, projectId={}", existingAthlete.getPlayerName(), projectId);
return R.fail("选手 " + existingAthlete.getPlayerName() + " 已报名该项目，请勿重复报名"); continue;
} else { } else {
// Create new record // Create new record
MartialAthlete newRecord = new MartialAthlete(); MartialAthlete newRecord = new MartialAthlete();