44

app/controllers/admin/forumIdentifyUser.js

@@ -10,6 +10,7 @@ var forumUserService=require('../../service/forumUserService');
 var forumThreadService=require('../../service/forumThreadService');
 var httpService=require('../../service/httpService');
 var forumLimitActionRefService=require('../../service/forumLimitActionRefService');
+var forumLimitActionConfigService=require('../../service/forumLimitActionConfigService');
 
 var async=require('async');
 
@@ -59,9 +60,6 @@ var checkLimitAction = function(req, res) {
 	                    array.push(obj);
 	                }
 	                req.session.mobileForumUser.limit_actions = array;
-	                console.log('------------');
-	                console.log(req.session.mobileForumUser);
-	                console.log('------------');
 	                res.json('success');
 				}else{
 					req.session.mobileForumUser.limit_actions = null;
@@ -142,43 +140,52 @@ router.post('/user/checkLimitAction', function(req, res, next) {
 	var entity=req.body;
 	var mid = entity.mid;
 	if(mid){
-		var array = [];
-		forumLimitActionRefService.getLimitActionRefByMid(mid,function(err,forumLimitActionRef){
-			if (err) {
+		forumLimitActionConfigService.getAllLimitActionConfig(function(err,configs){
+			if(err){
 				console.error(err);
-				res.json('success');
-			} else {
-				// 获取到用户行为限制记录
-				if(forumLimitActionRef){
-					var limit_actions = forumLimitActionRef.limit_actions;
-	                for (var i = 0; i < limit_actions.length; i += 1) {
-	                    var limit_action = limit_actions[i];
-	                    var flag = compareTime(new Date(), limit_action.begin_time, limit_action.end_time);
-	                    //把flag和limit_action_type 放进session
-	                    var obj = {
-	                    	result : flag,
-	                    	code : limit_action.limit_action_type
-	                    }
-	                    array.push(obj);
-	                }
-
-	                var returnObject = {
-	                	errcode:'success',
-	                	data:array
-	                }
-	                res.json(returnObject);
-				}else{
-					var returnObject = {
-	                	errcode:'success',
-	                	data:[]
-	                }
-					res.json(returnObject);
-				}
+				res.json(returnCode.BUSY);
+			}else{
+				var array = [];
+				forumLimitActionRefService.getLimitActionRefByMid(mid,function(err,forumLimitActionRef){
+					if (err) {
+						console.error(err);
+						res.json('success');
+					} else {
+						// 获取到用户行为限制记录
+						if(forumLimitActionRef){
+							var limit_actions = forumLimitActionRef.limit_actions;
+			                for (var i = 0; i < limit_actions.length; i += 1) {
+			                    var limit_action = limit_actions[i];
+			                    var flag = compareTime(new Date(), limit_action.begin_time, limit_action.end_time);
+			                    //把flag和limit_action_type 放进session
+			                    var obj = {
+			                    	result : flag,
+			                    	code : limit_action.limit_action_type
+			                    }
+			                    array.push(obj);
+			                }
+			                var returnObject = {
+			                	errcode:'success',
+			                	configs:configs,
+			                	data:array
+			                }
+			                res.json(returnObject);
+						}else{
+							var returnObject = {
+			                	errcode:'success',
+			                	configs:configs,
+			                	data:[]
+			                }
+							res.json(returnObject);
+						}
+					}
+				});
 			}
 		});
 	}else{
 		var returnObject = {
         	errcode:'success',
+        	configs:configs,
         	data:[]
         }
 		res.json(returnObject);