Merge branch 'newfunc_0321_game_postthread'

app/controllers/admin/forumThread.js

@@ -1698,3 +1698,94 @@ router.post('/thread/:tid/unEssence', function(req, res, next) {
         res.json(returnCode.WRONG_PARAM);
     }
 });
+
+
+
+
+
+//H5创建子话题文章
+router.post('/h5/thread/create', function(req, res, next) {
+    var pid = req.body.pid;
+    var title = req.body.title;
+    var content = req.body.content;
+    var images = req.body.images;
+    var ent_code = req.body.ent_code;
+    var nickName = req.body.nickName;
+    var uid = req.body.openId;
+    var mid = req.body.mid;
+    var icon = req.body.icon;
+
+    var thread_entity = {
+        pid : pid,
+        title : title,
+        content : content,
+        ent_code: ent_code,
+        images: images,
+        type : 1,
+        level : 2
+    }
+
+    if(pid && title && content && ent_code && uid && mid){
+        async.waterfall([
+            function(callback) {
+                forumUserService.getUserByUid(uid, callback);
+            },
+            function(user, callback) { //创建用户
+                if (user) {
+                    callback(null, user);
+                } else {
+                    var entity = {
+                        mid: mid,
+                        uid: uid,
+                        ent_code: ent_code,
+                        nickName: nickName,
+                        icon: icon
+                    };
+                    forumUserService.createUser(entity, function(err, doc) {
+                        if (err) {
+                            console.error(err);
+                            callback(err, null);
+                        } else {
+                            callback(null, doc);
+                        }
+                    });
+                }
+            },
+            function(user, callback) {//获取板块信息
+                forumThreadService.getByConditionsSelectyField({_id: new mongoose.Types.ObjectId(pid), ent_code: ent_code}, "info", function(err, doc) {
+                    if (err || !doc) {
+                        console.error(err);
+                        callback(err, null, null);
+                    } else {
+                        callback(err, user, doc.info);
+                    }
+                });
+            },
+            function(user, infoId, callback) {//创建文章
+                thread_entity.from = user._id;
+                thread_entity.info = infoId
+                forumThreadService.createThread(thread_entity, function(err, entity) {
+                    if (err) {
+                        console.error(err);
+                        callback(err, null);
+                    } else {
+                        httpService.sendRequest(ent_code, mid, 'post');
+                        forumAboutMEService.saveThread(entity);
+                        callback(null, entity);
+                    }
+                });
+            }
+        ], function(err, thread) {
+            if(err){
+                res.json(returnCode.BUSY);
+            }else{
+                var rs = {
+                    data:thread
+                }
+                res.json(_.assign(rs, returnCode.SUCCESS));
+            }
+        });
+    }else{
+        res.json(returnCode.WRONG_PARAM);
+    }
+});
\ No newline at end of file

app/controllers/mobile/forumThread.js

@@ -4,6 +4,7 @@ var express = require('express'),
     returnCode = require('../../utils/returnCode'),
     util = require('../../utils/util'),
     loadUserLevel = require('../../utils/loadUserLevel'),
+    async = require('async'),
     _ = require('lodash');
 var mongoose = require('mongoose');
 var ForumThread = mongoose.model('ForumThread');
@@ -17,6 +18,7 @@ var forumCommentService = require('../../service/forumCommentService');
 var forumUserThreadControlService = require('../../service/forumUserThreadControlService');
 var forumLimitOperationService = require('../../service/forumLimitOperationService');
 var forumThreadAttendService = require('../../service/forumThreadAttendService');
+var forumUserService = require('../../service/forumUserService');
 var commentTips = require('../../utils/commentTips');
 var redisPraiseLog = require('../../utils/redisPraiseLog');
 var httpService = require('../../service/httpService');
@@ -27,6 +29,7 @@ var async = require('async');
 var ForumModeratorApply = mongoose.model('ForumModeratorApply');
 var forumModeratorApplyService = require('../../service/forumModeratorApplyService');
 var redisThreadList = require('../../utils/redisThreadList');
+
 module.exports = function(app) {
     app.use('/v1/forum', router);
 };