Skip to content

P
pisns-forum-api
Commit f57a25d0 authored by 陈志良's avatar 陈志良
Browse files
Options

Merge branch 'remould_0727_topic_cache' into SANDBOX

parents f9c2f53e 4aeec207
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 78 deletions
app/service/forumThreadService.js
View file @ f57a25d0
...@@ -328,79 +328,80 @@ exports.getThreadById = function(tid, callback) { ...@@ -328,79 +328,80 @@ exports.getThreadById = function(tid, callback) {
} }
}); });
}, },
function(cb) { // function(cb) {
//获取话题子文章列表 // //获取话题子文章列表
var conditions ={} // var conditions ={}
if(doc.type == 2){ // if(doc.type == 2){
conditions = { // conditions = {
pid: tid, // pid: tid,
type: 2, // type: 2,
status:1 // status:1
}; // };
}else if(doc.type == 3){ // }else if(doc.type == 3){
conditions = { // conditions = {
pid: tid, // pid: tid,
type: 3, // type: 3,
status:1, // status:1,
images: {$exists: true, $not: {$size: 0}} // images: {$exists: true, $not: {$size: 0}}
}; // };
}else{ // }else{
cb(null, null); // cb(null, null);
return; // return;
} // }
getAllThreadByFidHelp(conditions, 1, 10, null, function(err, threads) { // getAllThreadByFidHelp(conditions, 1, 10, null, function(err, threads) {
if (err) { // if (err) {
console.error(err); // console.error(err);
cb(err, null); // cb(err, null);
} else { // } else {
cb(null, threads); // cb(null, threads);
} // }
}); // });
}, // },
function(cb) { // function(cb) {
//获取照片墙最新文章列表 //获取照片墙最新文章列表
if (doc.type !== 3) { // if (doc.type !== 3) {
cb(null, null); // cb(null, null);
return; // return;
} // }
var conditions = { // var conditions = {
pid: tid, // pid: tid,
type: 3, // type: 3,
status:1, // status:1,
images: {$exists: true, $not: {$size: 0}} // images: {$exists: true, $not: {$size: 0}}
}; // };
getAllThreadByFidHelp(conditions, 1, 10, '-created', function(err, threads) { // getAllThreadByFidHelp(conditions, 1, 10, '-created', function(err, threads) {
if (err) { // if (err) {
console.error(err); // console.error(err);
cb(err, null); // cb(err, null);
} else { // } else {
cb(null, threads); // cb(null, threads);
} // }
}); // });
},
function(cb) { // },
// function(cb) {
//获取照片墙最热文章列表 //获取照片墙最热文章列表
if (doc.type !== 3) { // if (doc.type !== 3) {
cb(null, null); // cb(null, null);
return; // return;
} // }
var conditions = { // var conditions = {
pid: tid, // pid: tid,
type: 3, // type: 3,
status:1, // status:1,
images: {$exists: true, $not: {$size: 0}} // images: {$exists: true, $not: {$size: 0}}
}; // };
getAllThreadByFidHelp(conditions, 1, 10, '-praise_count', function(err, threads) { // getAllThreadByFidHelp(conditions, 1, 10, '-praise_count', function(err, threads) {
if (err) { // if (err) {
console.error(err); // console.error(err);
cb(err, null); // cb(err, null);
} else { // } else {
cb(null, threads); // cb(null, threads);
} // }
}); // });
}, // },
function(cb) { function(cb) {
//获取发帖人数 //获取发帖人数
var key = 'pisns-forum-thread:' + tid + ':amount'; var key = 'pisns-forum-thread:' + tid + ':amount';
...@@ -460,16 +461,16 @@ exports.getThreadById = function(tid, callback) { ...@@ -460,16 +461,16 @@ exports.getThreadById = function(tid, callback) {
} else { } else {
var thread = doc; var thread = doc;
var comments = results[0] || []; var comments = results[0] || [];
var subThreads = results[1] || []; //话题子文章列表 // var subThreads = results[1] || []; //话题子文章列表
var latestPhotos = results[2] || []; //最新照片墙列表 // var latestPhotos = results[2] || []; //最新照片墙列表
var hotPhotos = results[3] || []; //最热照片墙列表 // var hotPhotos = results[3] || []; //最热照片墙列表
var canyuPeopleCount = results[4] || 0; //参与人数 var canyuPeopleCount = results[1] || 0; //参与人数
var threadObj = thread && thread.toObject() || {}; var threadObj = thread && thread.toObject() || {};
threadObj.comments = comments; threadObj.comments = comments;
threadObj.subThreads = subThreads; // threadObj.subThreads = subThreads;
threadObj.latestPhotos = latestPhotos; // threadObj.latestPhotos = latestPhotos;
threadObj.hotPhotos = hotPhotos; // threadObj.hotPhotos = hotPhotos;
threadObj.canyuPeopleCount = canyuPeopleCount; threadObj.canyuPeopleCount = canyuPeopleCount;
callback(null, threadObj); callback(null, threadObj);
......
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