Merge remote-tracking branch 'origin/master'

src/main/java/com/jpsoft/making_friends/modules/mobile/controller/ActivityApiController.java

@@ -103,13 +103,15 @@ public class ActivityApiController {
                 throw new Exception("未找到活动!");
             }
 
-            String memberId = JwtUtil.decodeToken(jwtSecret,token);
-            if(StringUtils.isNotEmpty(memberId)){
-                MemberInfo memberInfo = memberInfoService.get(memberId);
-                if(memberInfo != null){
-                    ActivityMember activityMember = activityMemberService.findByMIdAndAId(memberInfo.getId(),activityInfo.getId());
-                    if(activityMember != null){
-                        activityInfo.setIsJoin(true);
+            if (StringUtils.isNotEmpty(token)){
+                String memberId = JwtUtil.decodeToken(jwtSecret,token);
+                if(StringUtils.isNotEmpty(memberId)){
+                    MemberInfo memberInfo = memberInfoService.get(memberId);
+                    if(memberInfo != null){
+                        ActivityMember activityMember = activityMemberService.findByMIdAndAId(memberInfo.getId(),activityInfo.getId());
+                        if(activityMember != null){
+                            activityInfo.setIsJoin(true);
+                        }
                     }
                 }
             }
@@ -138,7 +140,7 @@ public class ActivityApiController {
         return msgResult;
     }
 
-    @GetMapping("save")
+    @RequestMapping(value = "save",method = RequestMethod.POST)
     @ApiOperation(value = "保存报名信息")
     public MessageResult<String> save(String id,@RequestAttribute String subject){
         MessageResult<String> msgResult = new MessageResult<>();
@@ -149,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);