Commit 32c6b529 authored by 陈家荣's avatar 陈家荣

update

parent 69af64b8
...@@ -24,7 +24,8 @@ var forumThreadService = require('../../service/forumThreadService'), ...@@ -24,7 +24,8 @@ var forumThreadService = require('../../service/forumThreadService'),
forumLimitOperationService = require('../../service/forumLimitOperationService'), forumLimitOperationService = require('../../service/forumLimitOperationService'),
forumAboutMEService = require('../../service/forumAboutMEService'), forumAboutMEService = require('../../service/forumAboutMEService'),
httpService = require('../../service/httpService'), httpService = require('../../service/httpService'),
redisThreadList = require('../../utils/redisThreadList'); redisThreadList = require('../../utils/redisThreadList'),
forumFollowThreadService = require('../../service/forumFollowThreadService');
var userUtil = require('../../utils/user'); var userUtil = require('../../utils/user');
var floorGenerator = require('../../utils/floorGenerator'); var floorGenerator = require('../../utils/floorGenerator');
...@@ -209,6 +210,16 @@ router.get('/thread/:tid/get', function(req, res, next) { ...@@ -209,6 +210,16 @@ router.get('/thread/:tid/get', function(req, res, next) {
}else{ }else{
callback(null, datas); callback(null, datas);
} }
},
function(datas, callback) { //获取收藏数
forumFollowThreadService.count({thread: tid, ent_code: ent_code}, function(err, result){
if (err) {
callback(err, null);
} else {
datas.push(result)
callback(null, datas);
}
});
} }
], function(err, results) { ], function(err, results) {
if (err) { if (err) {
...@@ -225,6 +236,7 @@ router.get('/thread/:tid/get', function(req, res, next) { ...@@ -225,6 +236,7 @@ router.get('/thread/:tid/get', function(req, res, next) {
forumThreadService.getById(results[0].pid, function(err, parentThread) { forumThreadService.getById(results[0].pid, function(err, parentThread) {
rs.data = results[0]; rs.data = results[0];
rs.data.from.exp = results[3] && results[3].allExp ? results[3].allExp : 0; rs.data.from.exp = results[3] && results[3].allExp ? results[3].allExp : 0;
rs.data.followCount = results[4] ? results[4] : 0;
rs.tagList = results[1]; rs.tagList = results[1];
rs.parentThread = parentThread; rs.parentThread = parentThread;
rs.isSameAuthor = isSameAuthor; rs.isSameAuthor = isSameAuthor;
...@@ -233,6 +245,7 @@ router.get('/thread/:tid/get', function(req, res, next) { ...@@ -233,6 +245,7 @@ router.get('/thread/:tid/get', function(req, res, next) {
} else { } else {
rs.data = results[0]; rs.data = results[0];
rs.data.from.exp = results[3] && results[3].allExp ? results[3].allExp : 0; rs.data.from.exp = results[3] && results[3].allExp ? results[3].allExp : 0;
rs.data.followCount = results[4] ? results[4] : 0;
rs.tagList = results[1]; rs.tagList = results[1];
rs.isSameAuthor = isSameAuthor; rs.isSameAuthor = isSameAuthor;
res.json(_.assign(rs, returnCode.SUCCESS)); res.json(_.assign(rs, returnCode.SUCCESS));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment