Explorar o código

前台去除判断用户专业版状态和发送降级短信方法

laiguoran %!s(int64=4) %!d(string=hai) anos
pai
achega
3d8fc7a129

+ 4 - 1
modules/all_models/user.js

@@ -30,7 +30,10 @@ let upgrade = mongoose.Schema({
     upgrade_time:Number,
     isUpgrade:Boolean,
     remark:String,// 描述:广东办刘飞 2018-06-17 启用/关闭
-    deadline: String,
+    deadline: {
+        type:String,
+        default: '',
+    },
 }, { _id: false })
 
 const userdList = mongoose.Schema({

+ 0 - 52
modules/users/controllers/cld_controller.js

@@ -13,7 +13,6 @@ import UserModel from "../models/user_model"
 import CompilationModel from "../models/compilation_model";
 let online_facade = require('../facade/online_facade')
 const SMS = require('../models/sms');
-const moment = require('moment');
 
 class CLDController {
 
@@ -312,57 +311,6 @@ class CLDController {
         }
         response.json(responseData);
     }
-
-    async checkUserCompilationStatus(request, response) {
-        try {
-            let today = moment(new Date()-86400*1000).format('YYYY-MM-DD');
-            let userModel = new UserModel();
-            let userList = await userModel.getDeadlineList({upgrade_list: {$elemMatch:{ deadline: today }}});
-            if (userList.length > 0) {
-                for (let user of userList) {
-                    for (let cul of user.upgrade_list) {
-                        if (cul.deadline === today) {
-                            // cul.deadline = '';
-                            cul.isUpgrade = false;
-                        }
-                    }
-                    let condition = {ssoId: user.ssoId};
-                    await userModel.updateUser(condition, {upgrade_list: user.upgrade_list});
-                }
-            }
-            response.json({error: 0, msg: 'success', data: userList});
-        } catch (error) {
-            response.json({error: 1, msg: error});
-        }
-    }
-
-    async sendCompilationStatusSms(request, response) {
-        try {
-            let today = moment(new Date()-86400*1000).format('YYYY-MM-DD');
-            let userModel = new UserModel();
-            let userList = await userModel.getDeadlineList({upgrade_list: {$elemMatch:{ deadline: today }}});
-            if (userList.length > 0) {
-                let compilationModel = new CompilationModel();
-                const Sms = new SMS();
-                for (let user of userList) {
-                    for (let cul of user.upgrade_list) {
-                        if (cul.deadline === today) {
-                            cul.deadline = '';
-                            // cul.isUpgrade = false;
-                            // 发送短信
-                            let compilationData = await compilationModel.getCompilationById(cul.compilationID);
-                            await Sms.sendProductMsg(user.mobile, 2, user.real_name, compilationData.name, '');
-                        }
-                    }
-                    let condition = {ssoId: user.ssoId};
-                    await userModel.updateUser(condition, {upgrade_list: user.upgrade_list});
-                }
-            }
-            response.json({error: 0, msg: 'success', data: userList});
-        } catch (error) {
-            response.json({error: 1, msg: error});
-        }
-    }
 }
 
 export default CLDController;

+ 0 - 16
modules/users/models/user_model.js

@@ -523,22 +523,6 @@ class UserModel extends BaseModel {
     getDayMsg(index){
         return this.dayMsg[index];
     }
-
-    /**
-     * 获取usercompilation到期列表
-     *
-     * @param {object} condition
-     * @param {number} page
-     * @param {Number} pageSize
-     * @return {promise}
-     */
-    async getDeadlineList(condition = null) {
-
-        let userList = await this.db.find(condition);
-        userList = userList.length > 0 ? userList : [];
-
-        return userList;
-    }
 }
 
 export default UserModel;

+ 0 - 4
modules/users/routes/cld_route.js

@@ -30,9 +30,5 @@ module.exports = function (app) {
 
     router.post('/getUserOnlineInfo', cldController.getUserOnlineInfo);
 
-    router.get('/checkUserCompilationStatus', cldController.checkUserCompilationStatus);
-
-    router.get('/sendCompilationStatusSms', cldController.sendCompilationStatusSms);
-
     app.use('/cld',router)
 };

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 14297
package-lock.json