From 391f7be9bfb7aa474c3b76980a6ee5e30cd6f8bd Mon Sep 17 00:00:00 2001 From: zk Date: Fri, 15 May 2026 16:32:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=20=E8=83=BD=E5=90=A6?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=AE=80=E5=8E=86=20=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jiayunet/service/MemberGrantService.java | 4 +- .../jiayunet/service/UserResumeService.java | 38 ++++++++----------- 2 files changed, 16 insertions(+), 26 deletions(-) diff --git a/client-api/src/main/java/org/jiayunet/service/MemberGrantService.java b/client-api/src/main/java/org/jiayunet/service/MemberGrantService.java index 2f3952f..2a31c02 100644 --- a/client-api/src/main/java/org/jiayunet/service/MemberGrantService.java +++ b/client-api/src/main/java/org/jiayunet/service/MemberGrantService.java @@ -64,9 +64,7 @@ public class MemberGrantService { memberUserMapper.insert(newMember); } else { Instant baseTime = memberUser.getExpireTime().isAfter(Instant.now()) ? memberUser.getExpireTime() : Instant.now(); - memberUserMapper.update(null, new LambdaUpdateWrapper() - .eq(MemberUser::getId, memberUser.getId()) - .set(MemberUser::getExpireTime, baseTime.plus(days, ChronoUnit.DAYS))); + memberUserMapper.update(null, new LambdaUpdateWrapper().eq(MemberUser::getId, memberUser.getId()).set(MemberUser::getExpireTime, baseTime.plus(days, ChronoUnit.DAYS))); } // 2. 发放功能权限 diff --git a/client-api/src/main/java/org/jiayunet/service/UserResumeService.java b/client-api/src/main/java/org/jiayunet/service/UserResumeService.java index 59e97c2..471ae98 100644 --- a/client-api/src/main/java/org/jiayunet/service/UserResumeService.java +++ b/client-api/src/main/java/org/jiayunet/service/UserResumeService.java @@ -34,6 +34,9 @@ public class UserResumeService { @Autowired private UserResumeMapper userResumeMapper; + @Autowired + private MemberUserMapper memberUserMapper; + @Value("${app.resume.max-count:5}") private int maxResumeCount; @@ -56,10 +59,14 @@ public class UserResumeService { /** * 判断当前用户是否还能创建简历 - *

统计用户已有简历数量，与配置的最大数量比较

+ *

1. 会员有效期内不限制数量 2. 非会员按配置的最大数量限制

*/ public boolean canCreateResume() { Long userId = UserSecurityTool.getUserId(); + MemberUser memberUser = memberUserMapper.selectOne(new LambdaQueryWrapper().eq(MemberUser::getUserId, userId)); + if (memberUser != null && memberUser.getExpireTime().isAfter(Instant.now())) { + return true; + } Long count = userResumeMapper.selectCount(new LambdaQueryWrapper().eq(UserResume::getUserId, userId)); return count < maxResumeCount; } @@ -70,10 +77,7 @@ public class UserResumeService { */ public List listResume() { Long userId = UserSecurityTool.getUserId(); - return userResumeMapper.selectList(new LambdaQueryWrapper() - .eq(UserResume::getUserId, userId) - .orderByAsc(UserResume::getSortOrder) - .orderByDesc(UserResume::getCreateTime)); + return userResumeMapper.selectList(new LambdaQueryWrapper().eq(UserResume::getUserId, userId).orderByAsc(UserResume::getSortOrder).orderByDesc(UserResume::getCreateTime)); } // ==================== 主表 ==================== @@ -147,9 +151,7 @@ public class UserResumeService { /** 查询简历的教育经历列表 */ public List listEducation(Long resumeId) { checkResumeOwnership(resumeId); - return educationMapper.selectList(new LambdaQueryWrapper() - .eq(UserResumeEducation::getResumeId, resumeId) - .orderByAsc(UserResumeEducation::getSortOrder)); + return educationMapper.selectList(new LambdaQueryWrapper().eq(UserResumeEducation::getResumeId, resumeId).orderByAsc(UserResumeEducation::getSortOrder)); } /** @@ -183,9 +185,7 @@ public class UserResumeService { /** 查询简历的工作经历列表 */ public List listWork(Long resumeId) { checkResumeOwnership(resumeId); - return workMapper.selectList(new LambdaQueryWrapper() - .eq(UserResumeWork::getResumeId, resumeId) - .orderByAsc(UserResumeWork::getSortOrder)); + return workMapper.selectList(new LambdaQueryWrapper().eq(UserResumeWork::getResumeId, resumeId).orderByAsc(UserResumeWork::getSortOrder)); } /** @@ -219,9 +219,7 @@ public class UserResumeService { /** 查询简历的实习经历列表 */ public List listInternship(Long resumeId) { checkResumeOwnership(resumeId); - return internshipMapper.selectList(new LambdaQueryWrapper() - .eq(UserResumeInternship::getResumeId, resumeId) - .orderByAsc(UserResumeInternship::getSortOrder)); + return internshipMapper.selectList(new LambdaQueryWrapper().eq(UserResumeInternship::getResumeId, resumeId).orderByAsc(UserResumeInternship::getSortOrder)); } /** @@ -255,9 +253,7 @@ public class UserResumeService { /** 查询简历的项目经历列表 */ public List listProject(Long resumeId) { checkResumeOwnership(resumeId); - return projectMapper.selectList(new LambdaQueryWrapper() - .eq(UserResumeProject::getResumeId, resumeId) - .orderByAsc(UserResumeProject::getSortOrder)); + return projectMapper.selectList(new LambdaQueryWrapper().eq(UserResumeProject::getResumeId, resumeId).orderByAsc(UserResumeProject::getSortOrder)); } /** @@ -291,9 +287,7 @@ public class UserResumeService { /** 查询简历的竞赛经历列表 */ public List listCompetition(Long resumeId) { checkResumeOwnership(resumeId); - return competitionMapper.selectList(new LambdaQueryWrapper() - .eq(UserResumeCompetition::getResumeId, resumeId) - .orderByAsc(UserResumeCompetition::getSortOrder)); + return competitionMapper.selectList(new LambdaQueryWrapper().eq(UserResumeCompetition::getResumeId, resumeId).orderByAsc(UserResumeCompetition::getSortOrder)); } /** @@ -606,9 +600,7 @@ public class UserResumeService { *

子表保存后调用，确保主表update_time反映简历整体最后修改时间

*/ private void touchResumeUpdateTime(Long resumeId) { - userResumeMapper.update(null, new LambdaUpdateWrapper() - .eq(UserResume::getId, resumeId) - .set(UserResume::getUpdateTime, Instant.now())); + userResumeMapper.update(null, new LambdaUpdateWrapper().eq(UserResume::getId, resumeId).set(UserResume::getUpdateTime, Instant.now())); } /**