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

app/controllers/admin/forumThread.js

@@ -259,13 +259,13 @@ router.get('/thread/:tid/comment/list', function(req, res, next) {
 	}
 });
 
-// 更新评论
+// 更新评论状态
 router.post('/thread/comment/update/:cid',function(req,res,next){
 	var cid = req.params.cid || null;
 	var status = req.body.status;
 
 	if(cid){
-		forumCommentService.updateCommentById(cid, status, function(err,result){
+		forumCommentService.updateCommentStatusById(cid, status, function(err,result){
 			if(err){
 				res.json(returnCode.BUSY);
 			}else{
@@ -278,6 +278,35 @@ router.post('/thread/comment/update/:cid',function(req,res,next){
 });
 
 
+// 更新回复评论
+router.post('/thread/comment/update/:cid/comments',function(req,res,next){
+	var cid = req.params.cid || null;
+	var replayComment_id = req.body.replayComment_id;
+	// 获取评论的子评论列表
+	forumCommentService.getCommentById(cid,function(err, result){
+		if (err) {
+			console.error(err);
+			callback(err,null);
+		} else {
+			var commentList = result.comments;
+			console.log('准备插入：' + replayComment_id);
+			console.log(result._id);
+
+			result.comments.push(replayComment_id);
+
+			forumCommentService.updateCommentById(cid, result, function(err,result){
+				if(err){
+					res.json(returnCode.BUSY);
+				}else{
+					res.json(returnCode.SUCCESS);
+				}
+			});
+
+		}
+	});
+
+});
+
 //添加评论
 router.post('/thread/comment/add', function(req, res, next) {
 	var tid = req.body.tid || null;
@@ -292,9 +321,12 @@ router.post('/thread/comment/add', function(req, res, next) {
 			if(err){
 				res.json(returnCode.BUSY);
 			}else{
-				res.json(returnCode.SUCCESS);
+				var returnData = {
+					// returnCode.SUCCESS,
+					comment :　result
+				}
+				res.json(returnData);
 			}
 		});
 	}
-	
 });
\ No newline at end of file

app/controllers/mobile/forumThread.js

@@ -687,8 +687,15 @@ router.post('/thread/:tid/comment/:cid/delete', function(req, res, next) {
 
 //评论列表
 router.get('/thread/:tid/comment/list', function(req, res, next) {
+<<<<<<< HEAD
+
+
+	var tid=req.params.tid || null;
+	var pageNo = req.query.pageNo || 1;
+=======
     var tid = req.params.tid || null;
     var pageNo = req.query.pageNo || 1;
+>>>>>>> f2a61e4b468be1158deee3015cb171b0bede90e4
     var pageSize = req.query.pageSize || 10;
 
     var conditions = {

app/models/forumComment.js

@@ -50,6 +50,11 @@ var ForumCommentSchema = new Schema({
 		require: true,
 		default: 0
 	},
+	status: { //文章状态，1启用，0禁用，2需审核
+		type: Number,
+		require: true,
+		default: 1
+	},
 	created: { //评论时间
 		type: Date,
 		require: true,

app/service/forumCommentService.js

+
+
 'use strict';
 var mongoose = require('mongoose');
 var ForumComment = mongoose.model('ForumComment');
@@ -30,18 +32,33 @@ exports.getCommentById=function(cid,callback){
 };
 
 //根据ID更新评论
+exports.updateCommentStatusById=function(cid,status,callback){
+	ForumComment.update({ _id: cid}, {"status" : status},null,function(err,result){
+		if (err) {
+			console.error(err);
+			callback(err,null);
+		} else {
+			console.log(result);
+			callback(null,null);
+		}
+	});
+};
+
+//根据ID更新评论 entity
 exports.updateCommentById=function(cid,entity,callback){
-	ForumComment.update({ _id: cid}, entity,null,function(err,result){
+	ForumComment.update({ _id: cid}, entity, null, function(err,result){
 		if (err) {
 			console.error(err);
 			callback(err,null);
 		} else {
+			console.log(result);
 			callback(null,null);
 		}
 	});
 };
 
-//根据ID更新评论
+
+//根据ID删除评论
 exports.deleteCommentById=function(cid,callback){
 	ForumComment.remove({ _id: cid},function(err,result){
 		if (err) {
@@ -74,7 +91,7 @@ exports.getAllComment= function(conditions,pageNo,pageSize,callback) {
 		}else{
 			var skip = (pageNo - 1) * pageSize;
 		    var limit = count - skip > pageSize ? pageSize : (count - skip);
-		    
+		    console.log("count:" + count);
 		    ForumComment.find(conditions).populate('from').populate('to').limit(limit).skip(skip).sort('-created').exec(function(err, docs) {
 		    	if (err) {
 					console.error(err);