增加采血报名验证

src/main/java/com/qiankun/controller/mdp/MdpController.java

@@ -217,6 +217,16 @@ public class MdpController {
             return result;
         }
 
+        if (!userInfoisComplete(user)){
+            result.put("userInfoStatus","unComplete");
+        }else{
+            result.put("userInfoStatus","complete");
+        }
+        result.put("points",getUserPoints(user));
+        result.put("status","ok");
+        return result;
+    }
+    private boolean userInfoisComplete(User user){
         if (Strings.isNullOrEmpty(user.getName()) ||
                 Strings.isNullOrEmpty(user.getBirthday()) ||
                 Strings.isNullOrEmpty(user.getPaperType()) ||
@@ -227,16 +237,11 @@ public class MdpController {
                 Strings.isNullOrEmpty(user.getAddr()) ||
                 Strings.isNullOrEmpty(user.getMobile()) ||
                 Strings.isNullOrEmpty(user.getQq()) ||
-                !validateContacts(user)){
-            result.put("userInfoStatus","unComplete");
-        }else{
-            result.put("userInfoStatus","complete");
+                !validateContacts(user)) {
+            return false;
         }
-        result.put("points",getUserPoints(user));
-        result.put("status","ok");
-        return result;
+        return true;
     }
-
     /**
      * 获取用户积分
      * @param user
@@ -309,6 +314,14 @@ public class MdpController {
             result.put("errorMsg","活动报名人数已达上限");
             return result;
         }
+        if (activity.getType().equals("1")){
+            //采血活动，需验证个人信息是否已完善
+            if (!userInfoisComplete(user)){
+                result.put("status","error");
+                result.put("errorMsg","请先完善个人信息后再报名");
+                return result;
+            }
+        }
         ActivityReg reg = new ActivityReg();
         reg.setUser(user);
         reg.setActivity(activity);