Merge branch 'forum_moderator_manage'

app/controllers/admin/forumModeratorApply.js

@@ -13,12 +13,52 @@ module.exports = function(app) {
     app.use('/admin/forum', router);
 };
 
+//设置版主
+router.post('/forumModeratorApply/create', function(req, res, next) {
+    var ent_code = req.session.user.ent_code;
+    var fuserId = req.body.uid;
+    if (fuserId) {
+        forumModeratorApplyService.getForumModeratorApplyByFUserId(fuserId, function(err, doc) {
+            if (err) {
+                console.error(err);
+                res.json(returnCode.BUSY);
+            } else if (doc) { //已申请
+                res.json({
+                    errorcode: 0,
+                    errormsg: '已申请,请勿重复申请!'
+                });
+            } else {
+                var conditions = {
+                    ent_code: ent_code,
+                    forumUser: fuserId
+                }
+                var model = {
+                    ent_code: ent_code,
+                    forumUser: fuserId,
+                    status: 1
+                };
+                forumModeratorApplyService.createOrUpdateLimitOperation(conditions, model, function(err, ModeratorApply) {
+                    if (err) {
+                        console.error(err);
+                        res.json(returnCode.BUSY);
+                    } else {
+                        res.json(_.assign(returnCode.SUCCESS));
+                    }
+                });
+            }
+        })
+    } else {
+        res.json(returnCode.WRONG_PARAM);
+    }
+});
+
+
 //新增或更新
 router.post('/forumModeratorApply/createOrUpdate', function(req, res, next) {
     var ent_code = req.session.user.ent_code;
     var fuserId = req.body.fuserId;
-    var applyMsg = req.body.applyMsg;
-    if (fuserId && applyMsg) {
+    var infoIds = req.body.infoIds;
+    if (fuserId) {
         var conditions = {
             ent_code: ent_code,
             forumUser: fuserId
@@ -27,7 +67,8 @@ router.post('/forumModeratorApply/createOrUpdate', function(req, res, next) {
         var model = {
             ent_code: ent_code,
             forumUser: fuserId,
-            applyMsg: applyMsg
+            infoIds: infoIds,
+            status:1
         };
         forumModeratorApplyService.createOrUpdateLimitOperation(conditions, model, function(err, ModeratorApply) {
             if (err) {
@@ -64,7 +105,6 @@ router.post('/forumModeratorApply/updateById', function(req, res, next) {
     }
 });
 
-
 //根据userId获取
 router.get('/forumModeratorApply/get/:fuserId', function(req, res, next) {
     var fuserId = req.params.fuserId;
@@ -101,44 +141,6 @@ router.post('/forumModeratorApply/delete/:id', function(req, res, next) {
     }
 });
 
-
-//列表
-// router.post('/forumModeratorApply/list', function(req, res, next) {
-//     var pageNo = req.body.pageNo || 1;
-//     var pageSize = req.body.pageSize || 10;
-//     var search = req.body.search;
-
-//     var conditions = {
-//         ent_code: req.session.user.ent_code
-//     };
-
-//     if (search) {
-//         if (search.nickName) { //用户昵称
-//             conditions.forumUser.nickName = {
-//                 $regex: search.nickName
-//             };
-//         }
-//         if (search.applyMsg) {
-//             conditions.applyMsg = {
-//                 $regex: search.applyMsg
-//             };
-//         }
-//     }
-
-//     if (search.status && Number(search.status) != 3) {
-//         conditions.status = Number(search.status);
-//     }
-//     forumModeratorApplyService.getForumModeratorApplys(conditions, pageNo, pageSize, null, function(err, results) {
-//         if (err) {
-//             console.error(err);
-//             res.json(returnCode.BUSY);
-//         } else {
-//             res.json(_.assign(results, returnCode.SUCCESS));
-//         }
-//     });
-// });
-
-
 //列表
 router.post('/forumModeratorApply/list', function(req, res, next) {
     var pageNo = req.body.pageNo || 1;
@@ -162,17 +164,17 @@ router.post('/forumModeratorApply/list', function(req, res, next) {
 
 
     if (search.nickName) { //如果有用户昵称
-        forumUserService.searchMembersByNickName(search.nickName,function(err, results){
+        forumUserService.searchMembersByNickName(search.nickName, function(err, results) {
             if (err) {
                 callback(err, null);
             } else {
                 var mids = []
-                if(results && results.length > 0){
-                    results.forEach(function(user){
-                      mids.push(user._id);
+                if (results && results.length > 0) {
+                    results.forEach(function(user) {
+                        mids.push(user._id);
                     });
                 }
-                conditions.forumUser = { 
+                conditions.forumUser = {
                     $in: mids
                 }
                 forumModeratorApplyService.getForumModeratorApplys(conditions, pageNo, pageSize, null, function(err, results) {
@@ -185,7 +187,7 @@ router.post('/forumModeratorApply/list', function(req, res, next) {
                 });
             }
         });
-    }else{
+    } else {
         forumModeratorApplyService.getForumModeratorApplys(conditions, pageNo, pageSize, null, function(err, results) {
             if (err) {
                 console.error(err);
@@ -195,4 +197,4 @@ router.post('/forumModeratorApply/list', function(req, res, next) {
             }
         });
     }
-});
\ No newline at end of file
+});

app/controllers/mobile/forumModerator.js

@@ -12,6 +12,7 @@ var ForumModerator = mongoose.model('ForumModerator');
 var forumThreadService = require('../../service/forumThreadService');
 var forumLimitOperationService = require('../../service/forumLimitOperationService');
 var forumModeratorApplyService = require('../../service/forumModeratorApplyService');
+var httpService = require('../../service/httpService');
 var request=require('request');
 var env = process.env.NODE_ENV;
 var API_ADDRESS='http://localhost:8080';