Merge branch 'Notice' of git.wxpai.cn:scrmgroup/pisns-forum-api into Notice

Conflicts:
	app/controllers/mobile/forumThread.js

app/controllers/mobile/commentTips.js

@@ -17,7 +17,7 @@ router.get('/commentTips', function(req, res, next) {
 		if(err){
 			res.json(returnCode.UNCHECK_ERROR(err));
 		}else{
-			res.json(_.assign(result, returnCode.SUCCESS));
+			res.json(_.assign({data:result}, returnCode.SUCCESS));
 		}
 	});
 });
@@ -29,19 +29,19 @@ router.put('/commentTips/:id', function(req, res, next) {
 		if(err){
 			res.json(returnCode.UNCHECK_ERROR(err));
 		}else{
-			res.json(_.assign(result, returnCode.SUCCESS));
+			res.json(_.assign({data:result}, returnCode.SUCCESS));
 		}
 	});
 });
 
-router.put('/commentTips/del', function(req, res, next) {
+router.post('/commentTips/del', function(req, res, next) {
 	var userId = user.getMobileUser(req);
 	var entcode = req.session.user.ent_code;
 	commentTips.clear(entcode,userId,function(err,result){
 		if(err){
 			res.json(returnCode.UNCHECK_ERROR(err));
 		}else{
-			res.json(_.assign(result, returnCode.SUCCESS));
+			res.json(_.assign({data:result}, returnCode.SUCCESS));
 		}
 	});
 });
\ No newline at end of file

app/controllers/mobile/forumThread.js

@@ -14,7 +14,7 @@ var forumShareLogService = require('../../service/forumShareLogService');
 var forumCommentService = require('../../service/forumCommentService');
 var forumUserThreadControlService = require('../../service/forumUserThreadControlService');
 var forumLimitActionRefService = require('../../service/forumLimitActionRefService');
-
+var commentTips = require('../../utils/commentTips');
 var httpService = require('../../service/httpService');
 
 var user = require('../../utils/user');
@@ -506,6 +506,9 @@ router.post('/thread/:tid/comment/add', function(req, res, next) {
                                                                 if (err) {
                                                                     callback(err, null);
                                                                 } else {
+																	if(user.getMobileUser(req) !== thread.from){//文章的作者不等于评论的作者才增加消息数
+																		commentTips.incrTips(req.session.user.ent_code,thread.from);
+																	}
                                                                     var comments = thread.comments;
                                                                     // console.log('=========');
                                                                     // console.log(comments);
@@ -650,6 +653,9 @@ router.post('/thread/:tid/comment/create', function(req, res, next) {
                                                                 if (err) {
                                                                     callback(err, null);
                                                                 } else {
+																	if(user.getMobileUser(req) !== thread.from){//文章的作者不等于评论的作者才增加消息数
+																		commentTips.incrTips(req.session.user.ent_code,thread.from);
+																	}
                                                                     var comments = thread.comments;
                                                                     // console.log('=========');
                                                                     // console.log(comments);
@@ -808,6 +814,9 @@ router.post('/thread/:tid/comment/:cid/create', function(req, res, next) {
                                                         if (err) {
                                                             callback(err, null);
                                                         } else {
+															if(user.getMobileUser(req) !== req.body.to){//被评论人 和评论人不是同一个
+																commentTips.incrTips(req.session.user.ent_code,req.body.to);
+															}
                                                             var comments = comment.comments;
                                                             var array = [];
                                                             if (comments && comments.length > 0) {

app/service/forumCommentService.js

@@ -301,3 +301,95 @@ exports.getPopulateCommentById=function(cid,callback){
     	}
 	});
 };
+
+
+
+//我的评论
+var countMyComment = function(conditions,callback) {
+	ForumComment.find(conditions)
+	.count(conditions, function (err, count) {
+	   if(err){
+	   		console.error(err);
+			callback(err,null);
+	   }else{
+	   		callback(null,count);
+	   }
+	});
+};
+
+function populateParentComment(doc, callback){
+	if (doc && doc._id && doc.level === 2) {
+		ForumComment.findOne({comments: { $elemMatch : doc._id },status:1}).exec(function(err,c){
+			if (err) {
+				console.error(err);
+				callback(null, null);
+			} else{
+				if(c){
+					callback(null ,c);		
+				}else{
+					callback(null);		
+				}
+			}
+		});
+	} else{
+		callback(null, null);
+	}
+}
+//我的评论
+exports.getMyComment = function(conditions,pageNo,pageSize,callback){
+	countMyComment(conditions,function(err,count){
+		if(err){
+			callback(err);
+		}else{
+			var skip = (pageNo - 1) * pageSize;
+		    var limit = count - skip > pageSize ? pageSize : (count - skip);
+
+		    ForumComment.find(conditions)
+			.populate({
+				path: 'thread',
+				select: '_id content title type level tag'
+			}).populate({path:'from to', select:'uid nickName icon'}).limit(limit).skip(skip).sort('-created').exec(function(err, docs) {
+		    	if (err) {
+					console.error(err);
+					callback(err,null);
+				} else {
+					var obj={};
+					obj.total=count;
+					obj.pageNo=pageNo;
+					obj.pageSize=pageSize;
+					obj.items=docs;
+					
+					if (docs && docs.length > 0) {
+						var asyncTasks = [];
+						docs.forEach(function(doc){
+							asyncTasks.push(function(callback) {
+				                populateParentComment(doc, function(err,c){
+				                	if(err){
+				                		callback(err,null);
+				                	}else{
+				                		var newobj = doc.toObject();
+	                					newobj.parent = c;
+										delete newobj.comments;
+	                					callback(null,newobj);
+				                	}
+				                });
+				            });
+						});
+						async.parallel(asyncTasks, function(err, results) {
+						    if (err) {
+						        console.log(err);
+						        callback(null, null);
+						    } else {
+						    	obj.items=results;
+						        callback(null,obj);
+						    }
+						});
+						
+					}else{
+						callback(null,obj);
+					}
+				}
+		    });
+		}
+	});
+};
\ No newline at end of file