|
@@ -151,11 +151,22 @@ public class ActivityApiController {
|
|
|
if(activityInfo == null){
|
|
|
throw new Exception("未找到活动!");
|
|
|
}
|
|
|
+
|
|
|
+ if (activityInfo.getStartTime().compareTo(new Date())>0 || activityInfo.getEndTime().compareTo(new Date())<0){
|
|
|
+ throw new Exception("不在报名时段内!");
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
MemberInfo memberInfo = memberInfoService.get(subject);
|
|
|
if(memberInfo == null){
|
|
|
throw new Exception("未找到用户!");
|
|
|
}
|
|
|
|
|
|
+ ActivityMember joinMember = activityMemberService.findByMIdAndAId(memberInfo.getId(),activityInfo.getId());
|
|
|
+ if(joinMember != null){
|
|
|
+ throw new Exception("已报名!");
|
|
|
+ }
|
|
|
+
|
|
|
ActivityMember activityMember = new ActivityMember();
|
|
|
activityMember.setId(UUID.randomUUID().toString());
|
|
|
activityMember.setDelFlag(false);
|