Commit 4f2e1269 authored by 陈家荣's avatar 陈家荣

update

parent 1b2d342f
...@@ -516,7 +516,6 @@ router.get('/user/getUserFavorWithThreadAndInfo', function(req, res, next) { ...@@ -516,7 +516,6 @@ router.get('/user/getUserFavorWithThreadAndInfo', function(req, res, next) {
router.get('/user/exp/topChart', function(req, res, next) { router.get('/user/exp/topChart', function(req, res, next) {
var userId = user.getMobileUser(req); var userId = user.getMobileUser(req);
var ent_code = req.session.user.ent_code; var ent_code = req.session.user.ent_code;
forumUserService.getByConditionsSelectyField({ forumUserService.getByConditionsSelectyField({
_id:userId _id:userId
}, 'mid', function(err, doc){ }, 'mid', function(err, doc){
...@@ -529,7 +528,7 @@ router.get('/user/exp/topChart', function(req, res, next) { ...@@ -529,7 +528,7 @@ router.get('/user/exp/topChart', function(req, res, next) {
}else{ }else{
async.parallel([ async.parallel([
function(cb) { function(cb) {
user.getMemberExp(ent_code, doc.mid, function(err, entity) { user.getMemberExp(ent_code, doc.mid, 3, function(err, entity) {
cb(err, entity); cb(err, entity);
}); });
}, },
...@@ -559,7 +558,6 @@ router.get('/user/exp/topChart', function(req, res, next) { ...@@ -559,7 +558,6 @@ router.get('/user/exp/topChart', function(req, res, next) {
router.get('/user/exp/topMonthChart', function(req, res, next) { router.get('/user/exp/topMonthChart', function(req, res, next) {
var userId = user.getMobileUser(req); var userId = user.getMobileUser(req);
var ent_code = req.session.user.ent_code; var ent_code = req.session.user.ent_code;
forumUserService.getByConditionsSelectyField({ forumUserService.getByConditionsSelectyField({
_id:userId _id:userId
}, 'mid', function(err, doc){ }, 'mid', function(err, doc){
...@@ -572,7 +570,7 @@ router.get('/user/exp/topMonthChart', function(req, res, next) { ...@@ -572,7 +570,7 @@ router.get('/user/exp/topMonthChart', function(req, res, next) {
}else{ }else{
async.parallel([ async.parallel([
function(cb) { function(cb) {
user.getMemberExp(ent_code, doc.mid, function(err, entity) { user.getMemberExp(ent_code, doc.mid, 1, function(err, entity) {
cb(err, entity); cb(err, entity);
}); });
}, },
...@@ -602,7 +600,6 @@ router.get('/user/exp/topMonthChart', function(req, res, next) { ...@@ -602,7 +600,6 @@ router.get('/user/exp/topMonthChart', function(req, res, next) {
router.get('/user/exp/topWeekChart', function(req, res, next) { router.get('/user/exp/topWeekChart', function(req, res, next) {
var userId = user.getMobileUser(req); var userId = user.getMobileUser(req);
var ent_code = req.session.user.ent_code; var ent_code = req.session.user.ent_code;
forumUserService.getByConditionsSelectyField({ forumUserService.getByConditionsSelectyField({
_id:userId _id:userId
}, 'mid', function(err, doc){ }, 'mid', function(err, doc){
...@@ -615,7 +612,7 @@ router.get('/user/exp/topWeekChart', function(req, res, next) { ...@@ -615,7 +612,7 @@ router.get('/user/exp/topWeekChart', function(req, res, next) {
}else{ }else{
async.parallel([ async.parallel([
function(cb) { function(cb) {
user.getMemberExp(ent_code, doc.mid, function(err, entity) { user.getMemberExp(ent_code, doc.mid, 2,function(err, entity) {
cb(err, entity); cb(err, entity);
}); });
}, },
......
...@@ -115,11 +115,11 @@ exports.findMember=function(ent_code, mid, callback){ ...@@ -115,11 +115,11 @@ exports.findMember=function(ent_code, mid, callback){
exports.getMemberExp=function(ent_code,mid,callback){ exports.getMemberExp=function(ent_code,mid,type,callback){
if(!ent_code || !mid){ if(!ent_code || !mid){
return callback && callback(null,null); return callback && callback(null,null);
} }
var url = API_ADDRESS + '/v1.0/internal/member/exp/getMemberInfo?mid='+mid+'&entCode='+ent_code; var url = API_ADDRESS + '/v1.0/internal/member/exp/getMemberInfo?mid='+mid+'&entCode='+ent_code+'&type='+type;
request.get({ request.get({
url: url, url: url,
json: {} json: {}
......
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