Merge branch 'master' of http://123.207.147.179:8888/node_server/wenHuaBu_adminServer

# Conflicts:
#	src/config/errorEnum.ts
#	src/routers/public/router.ts

src/biz/member/authority.ts

+/**
+ * 会员管理
+ */
+
+import { INDIVIDUALMEMBERTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, UNITMEMBERTYPE } from "../../config/enum";
+import { ERRORENUM } from "../../config/errorEnum";
+import { TABLEENUM } from "../../data/models/model";
+import { findCount, findOnce, findToPage } from "../../data/select";
+import { updateOneData } from "../../data/update";
+import { successResult } from "../../tools/system";
+import { BizError } from "../../util/bizError";
+import { extractData } from "../../util/piecemeal";
+import { changeEnumValue } from "../../util/verificationEnum";
+
+
+
+/**
+ * 会员权限列表
+ * @param unitName 单位名称
+ * @param memberLevel 会员等级、职务 MEMBERLEVEL
+ * @param memberCategory 会员类别、会员级别  UNITMEMBERTYPE、INDIVIDUALMEMBERTYPE
+ * @param pageNumber 当前页
+ */
+ export async function getAuthority({unitName, memberLevel, memberCategory, pageNumber}) {
+    let selectParam:any = {};
+
+    if (unitName) selectParam.unitName = unitName;
+    if (memberLevel) selectParam.memberLevel = memberLevel;
+    if (memberCategory || memberCategory>=9) selectParam.unitMemberType = memberCategory;
+    if (memberCategory || memberCategory<9) selectParam.individualMemberType = memberCategory;
+
+    let selectConf = ["userId", "memberState", "unitName", "memberLevel"];
+    let dbList = await findToPage(TABLEENUM.用户表, selectParam, [], pageNumber, 10);
+    let dataCount = await findCount(TABLEENUM.用户表, selectParam);
+
+    let dataList = [];
+    dbList.forEach(info => {
+        if (info.memberType == MEMBERTYPE.个人会员) {
+            selectConf.push("individualMemberType");
+        } else {
+            selectConf.push("unitMemberType");
+        }
+        let item:any = extractData(info, selectConf);
+
+        item.memberState = changeEnumValue(MEMBERSTATE, item.memberState);
+        item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel);
+        if(item.individualMemberType) item.individualMemberType = changeEnumValue(INDIVIDUALMEMBERTYPE, item.individualMemberType);
+        if(item.unitMemberType) item.unitMemberType = changeEnumValue(UNITMEMBERTYPE, item.unitMemberType);
+        
+        dataList.push(item);
+    });
+
+    return {dataList, dataCount};
+}
+
+
+/**
+ * 变更权限
+ * @param param0 
+ */
+export async function updateAuthority({form, userId}) {
+    let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
+    if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
+    await updateOneData(TABLEENUM.用户表, {userId}, form);
+
+    return successResult();
+
+}
+
+
+/**
+ * 冻结
+ * @param param0 
+ */
+export async function freeze({userId}) {
+    let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
+    if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
+    await updateOneData(TABLEENUM.用户表, {userId}, {memberState:MEMBERSTATE.冻结});
+
+    return successResult();
+
+}
+
+
+
+
+
+
+
+
+
+

src/biz/member/examine.ts

@@ -2,17 +2,26 @@
  * 审批逻辑
  */
 
-import { MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, USERREGISTERSTATE } from "../../config/enum";
+import { MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, OPERATIONREHAVIOR, PAYMENTSTATUS, REGISTERFLOW, USERREGISTERSTATE } from "../../config/enum";
+import { ERRORENUM } from "../../config/errorEnum";
+import { addManyData } from "../../data/add";
 import { TABLEENUM } from "../../data/models/model";
-import { findCount, findToPage } from "../../data/select";
+import { find, findCount, findOnce, findToPage } from "../../data/select";
+import { updateOneData } from "../../data/update";
+import { generateSystemId, successResult } from "../../tools/system";
+import { BizError } from "../../util/bizError";
 import { extractData } from "../../util/piecemeal";
-import { changeEnumValue } from "../../util/verificationEnum";
+import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
 
 /**
- * 待审核
+ * 待审核列表
  * @param param0 
  */
-export async function auditList({unitName, joinTime, memberType, sheng, shi, qu, pageNumber}) {
+export async function pendingReviewList({unitName, joinTime, memberType, sheng, shi, qu, pageNumber}) {
+    /**校验枚举 */
+    const EccFuncName = '待审核列表';
+    eccEnumValue(EccFuncName, '会员类型', MEMBERTYPE, memberType);
+
     let selectParam:any = {};
     if (unitName) selectParam.unitName = unitName;
     if (joinTime) selectParam.joinTime = joinTime;
@@ -29,9 +38,9 @@ export async function auditList({unitName, joinTime, memberType, sheng, shi, qu,
     let dataList = [];
     dbList.forEach(info => {
         let item:any = extractData(info, selectConf);
-        changeEnumValue(USERREGISTERSTATE, item.userRegisterState);
-        if (!item.memberLevel) item.memberLevel = "未选择";
-        else changeEnumValue(MEMBERLEVEL, item.memberLevel);
+        if (!item.userRegisterState) item.userRegisterState = "待审核";
+        else item.userRegisterState = changeEnumValue(USERREGISTERSTATE, item.userRegisterState);
+        item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel);
         dataList.push(item);
     });
 
@@ -39,50 +48,148 @@ export async function auditList({unitName, joinTime, memberType, sheng, shi, qu,
 }
 
 
+/**
+ * 通过审核
+ * @param param0 
+ * @returns 
+ */
+export async function adopt({userId}) {
+    let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
+    if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
+
+    await updateOneData(TABLEENUM.用户表, {userId}, {userRegisterState:USERREGISTERSTATE.通过});
+
+    let now = new Date().valueOf(); 
+    let addApprovalHistory = {
+        id:generateSystemId(TABLEENUM.审批历史表, userId),
+        userId,
+        operationTime:now,
+        operationBehavior:OPERATIONREHAVIOR.通过,
+        remarks:""
+    };
+    await addManyData(TABLEENUM.审批历史表, addApprovalHistory);
+
+    return successResult();
+}
 
 
+/**
+ * 驳回
+ * @param param0 
+ * @returns 
+ */
+export async function reject({userId, remarks}) {
+    let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
+    if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
+
+    await updateOneData(TABLEENUM.用户表, {userId}, {userRegisterState:USERREGISTERSTATE.驳回修改});
+    
+    let selectParam = {};
+    if (oldInfo.memberType == MEMBERTYPE.个人会员) {
+        selectParam = {registerFlow:REGISTERFLOW.个人会员注册2}
+    } else {
+        selectParam = {registerFlow:REGISTERFLOW.单位会员注册2}
+    }
+
+    await updateOneData(TABLEENUM.用户表, {userId}, selectParam);
+    
+    let now = new Date().valueOf(); 
+    let addApprovalHistory = {
+        id:generateSystemId(TABLEENUM.审批历史表, userId),
+        userId,
+        operationTime:now,
+        operationBehavior:OPERATIONREHAVIOR.驳回修改,
+        remarks
+    };
+    await addManyData(TABLEENUM.审批历史表, addApprovalHistory);
+
+    return successResult();
+}
 
 
+/**
+ * 审核历史
+ */
+export async function approvalHistoryList({userId}) {
+    let oldInfo = await find(TABLEENUM.审批历史表, {userId});
+    if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
 
+    let dataList:any = extractData(oldInfo, ["operationTime", "operationBehavior", "remarks"]);
+    dataList.operationBehavior = changeEnumValue(OPERATIONREHAVIOR, dataList.operationBehavior);
 
+    return dataList;
+}
 
 
+/**
+ * 待支付列表
+ */
+export async function toBePaidList({unitName, joinTime, memberType, paymentStatus, pageNumber}) {
+    /**校验枚举 */
+    const EccFuncName = '待审核列表';
+    eccEnumValue(EccFuncName, '会员类型', MEMBERTYPE, memberType);
 
+    let selectParam:any = {};
+    if (unitName) selectParam.unitName = unitName;
+    if (joinTime) selectParam.joinTime = joinTime;
+    if (memberType) selectParam.memberType = memberType;
+    if (paymentStatus) selectParam.paymentStatus = paymentStatus;
 
+    let selectConf = ["userId", "状态", "unitName", "loginId", "phone", "joinTime", "memberType", "lifespanStartTime", "lifespanEndTime", "paymentStatus"];
+    let dbList = await findToPage(TABLEENUM.用户表, selectParam, selectConf, pageNumber);
+    let dataCount = await findCount(TABLEENUM.用户表, selectParam);
 
+    let dataList = [];
+    dbList.forEach(info => {
+        let item:any = extractData(info, selectConf);
+        item.memberType = changeEnumValue(MEMBERTYPE, item.memberType);
+        item.paymentStatus = changeEnumValue(PAYMENTSTATUS, item.paymentStatus);
+        dataList.push(item);
+    });
 
+    return {dataList, dataCount};;
+}
 
 
+/**
+ * 待支付通过
+ * @param param0 
+ * @returns 
+ */
+export async function passThroughPaid({userId}) {
+    let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
+    if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
 
+    await updateOneData(TABLEENUM.用户表, {userId}, {paymentStatus:PAYMENTSTATUS.已支付});
 
+    return successResult();
+}
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+/**
+ * 获取届次
+ * @param year 入会年份 
+ * @param month 入会月份
+ * @returns 
+ */
+export async function getEdition(year, month) {
+    //起始年份和月份
+    const startYear = 2018;
+    const startMonth = 1;
+
+    let currentYear = new Date().getFullYear();
+    if (year > currentYear) throw new BizError(ERRORENUM.无法获取未来届次);
+
+    //计算从起始时间给定时间的总月份数
+    let totalMonth = (year - startYear) * 12 + month;
+    //每届是6个月
+    let sessions = Math.ceil(totalMonth / 6);
+    //每10届一次
+    let times = Math.ceil(sessions / 10);
+    let sessionNumber = sessions - (times - 1) * 10 //届次是从第一次第一届开始，所以需要减一
+
+    return {frequency:"第"+times+"次", session:"第"+sessionNumber+"届"};
+}
 
 
 

src/biz/member/memberFees.ts

+/**
+ * 会费管理逻辑
+ */
+
+import { MEMBERSTATE, MEMBERTYPE, PAYMENTSTATUS } from "../../config/enum";
+import { TABLEENUM } from "../../data/models/model";
+import { findCount, findToPage } from "../../data/select";
+import { extractData } from "../../util/piecemeal";
+import { changeEnumValue } from "../../util/verificationEnum";
+
+
+
+/**
+ * 已缴费列表
+ */
+export async function getPaid({unitName, joinTime, memberType, pageNumber}) {
+    let now = new Date().valueOf();
+    let selectParam:any = {"$and":[
+        {lifespanStartTime:{"$lt":now}},
+        {lifespanEndTime:{"$gt":now}}
+    ]};
+
+    if (unitName) selectParam.unitName = unitName;
+    if (joinTime) selectParam.joinTime = joinTime;
+    if (memberType) selectParam.memberType = memberType;
+
+    let selectConf = ["userId", "memberState", "unitName", "loginId", "phone", "joinTime", "memberType"];
+    let dbList = await findToPage(TABLEENUM.用户表, selectParam, [], pageNumber, 10);
+    let dataCount = await findCount(TABLEENUM.用户表, selectParam);
+
+    let dataList = [];
+    dbList.forEach(info => {
+        let item:any = extractData(info, selectConf);
+        item.lifespanTime = item.lifespanStartTime + "至" + item.lifespanEndTime;
+        item.nextLifespanTime = "";
+        
+        if (item.lifespanEndTime - now > 90) item.nextLifespanTime = "大于90天";
+
+        item.memberState = changeEnumValue(MEMBERSTATE, item.memberState);
+        item.memberType = changeEnumValue(MEMBERTYPE, item.memberType);
+        dataList.push(item);
+    });
+
+    return {dataList, dataCount};
+}
+
+
+/**
+ * 续费期
+ */
+export async function getRenewalPeriod() {
+    
+}
+
+
+/**
+ * 欠费
+ */
+export async function getArrearsFees() {
+    
+}
+
+
+/**
+ * 宽限期
+ */
+export async function getGracePeriod() {
+    
+}
\ No newline at end of file

src/biz/member/user.ts

@@ -2,7 +2,7 @@
  * 用户逻辑
  */
 
-import { DOCUMENTTYPE, MEMBERTYPE, NATION, PROFCATEGORY, SEX, UNITINFOTYPE } from "../../config/enum";
+import { DOCUMENTTYPE, MEMBERLEVEL, MEMBERTYPE, NATION, PROFCATEGORY, SEX, UNITINFOTYPE } from "../../config/enum";
 import { ERRORCODEENUM, ERRORENUM } from "../../config/errorEnum";
 import { addOneData } from "../../data/add";
 import { TABLEENUM } from "../../data/models/model";
@@ -24,6 +24,7 @@ export async function signInOfEntity({form}) {
     eccEnumValue(EccFuncName, '证件类型', DOCUMENTTYPE, form.documentType);
     eccEnumValue(EccFuncName, '民族', NATION, form.nation);
     eccEnumValue(EccFuncName, '专业类别', PROFCATEGORY, form.profCategory);
+    eccEnumValue(EccFuncName, '会员等级职务', MEMBERLEVEL, form.memberLevel);
 
     let oldData = await findOnce(TABLEENUM.用户表, {"$or":[{loginId:form.loginId}, {phone:form.phone}, {mail:form.mail}] });
     if (oldData && oldData.userId) {

src/biz/portal/dangJianGonZuo/wenZiZiLiao.ts

@@ -36,7 +36,7 @@ export async function list({userId, type}) {
     dbList.forEach(info => {
         let item:any = extractData(info, ["id", "title", "rank", "position", "articleTitle" ]);
         if (!item.position) item.position = "未选择";
-        else changeEnumValue(ARTICLEPOSITION, item.position);
+        else item.position = changeEnumValue(ARTICLEPOSITION, item.position);
         dataList.push(item);
     });
 

src/biz/portal/shouYe/zhuanTiXiLie.ts

@@ -35,7 +35,7 @@ export async function list({userId}) {
     dbList.forEach(info => {
         let item:any = extractData(info, ["id", "title", "articleUrl", "position", "articleTitle", "imgUrl"]);
         if (!item.position) item.position = "未选择";
-        else changeEnumValue(ARTICLEPOSITION, item.position);
+        else item.position = changeEnumValue(ARTICLEPOSITION, item.position);
         dataList.push(item);
     });
 

src/config/enum.ts

@@ -338,7 +338,7 @@ export enum INDIVIDUALMEMBERTYPE {
 
 
 /**
- * 会员等级
+ * 会员等级 会员职务
  */
 export enum MEMBERLEVEL {
     普通会员 = 1,
@@ -447,3 +447,38 @@ export enum PAYMENTTYPE {
     银行转账,
     线下支付
 }
+
+
+/**
+ * 院校办学类型 yuanXiaoBanXueLeiXing
+ */
+export enum BANXUELEIXING {
+    中职 = 1,
+    高职,
+    本科,
+    社会培训,
+    非教学
+}
+
+
+/**
+ * 审批历史操作行为
+ */
+export enum OPERATIONREHAVIOR {
+    待审核 = 1,
+    重新提交,
+    驳回修改,
+    通过,
+    用户提交
+}
+
+
+/**
+ * 支付状态
+ */
+export enum PAYMENTSTATUS {
+    已支付 = 1,
+    未支付,
+    银行转账,
+}
+

src/config/errorEnum.ts

@@ -25,7 +25,8 @@ export enum ERRORENUM {
     验证码错误,
     验证码失效,
     验证码过期,
-    重复提交
+    重复提交,
+    无法获取未来届次
 }
 
 export enum ERRORCODEENUM {

src/data/models/model.ts

@@ -85,6 +85,8 @@ enum TABLEENUM {
     订单表 = 'order',
     单位所获得科研成果表 = "scientificResearch",
     验证码表 = "code",
+    审批历史表 = "approvalHistory",
+    权限表 = "authority",
 }
 
 const ModelArray = [
@@ -352,7 +354,6 @@ const ModelArray = [
             addres:'String',//通信地址
             photoUrl:'String',//证件照图片地址 蓝底证件照
             workUnit:'String',//工作单位
-            workDuties:'String',//职务
             workTitle:'String',//职称
             userRegisterState:{type:'Number', default:USERREGISTERSTATE.待审核, index:true},//用户注册状态 枚举
             registerFlow:'Number',//会员注册流程 枚举
@@ -361,43 +362,42 @@ const ModelArray = [
             askForTime:'Number',//申请时间
             joinTime:'Number',//入会时间
             session:'String',//届次
-            memberLevel:'Number',//会员等级 枚举
+            memberLevel:'Number',//会员等级、职务 枚举
             lifespanStartTime:'Number',//会员有效期开始时间 时间戳
             lifespanEndTime:'Number',//会员有效期结束时间 时间戳
             isGracePeriod:{type:'Number', default:0},//是否宽限期 0：否， 1：是
             gracePeriodEndTime:'Number',//宽限期到期时间 时间戳
             certificateType:'Number',//证书类型 枚举
+            education:'Number',//学历
+            applicationForm:'String',//入会申请表
 
             unitName:'String',//单位名称
-            officialWebsite:'String',//官网 单位网址
             uscc:'String',//统一信用代码
             legalPerson:'String',//法人
+            legalPersonMail:'String',//法人邮箱
             legalPersonPhone:'String',//法人代表联系电话
-            gongZhongHao:'String',//单位公众号
-            unitPhone:'Number',//单位电话
             contactPerson:'String',//日常联系人
             contactPersonDuties:'String',//日常联系人职务
+            contactPersonPhone:'String',//日常联系人手机
+            unitMail:'String',//单位电子邮箱
             uusinessLicenseUrl:'String',//营业执照 图片地址
-            personInChargeDesc:'String',//单位主要负责人或负责人集体描述
 
             /**单位会员信息 */
             unitInfoType:'Number',//单位信息类型 枚举
-            yuanXiaoBanXueLeiXing:'String',//院校办学类型
+            yuanXiaoBanXueLeiXing:'Number',//院校办学类型 枚举
             yuanXiaoZhuGuanBuMen:'String',//院校主管部门
             yuanXiaoFuZeRen:'String',//院校主要负责人
             yuanXiaoFuZeRenZhiWu:'String',//院校主要负责人职务
             yuanXiaoFuZeRenDianHua:'String',//院校主要负责人电话
             yuanXiaoBanGongFuZeRen:'String',//院校办公负责人
-            yuanXiaoBanGongFuZeRenZhiWu:'String',//院校办公负责人职务
             yuanXiaoBanGongFuZeRenDianHua:'String',//院校办公负责人电话
-            yuanXiaoKeYanFuZeRen:'String',//院校办公负责人
-            yuanXiaoKeYanFuZeRenZhiWu:'String',//院校办公负责人职务
-            yuanXiaoKeYanFuZeRenDianHua:'String',//院校办公负责人电话
+            yuanXiaoKeYanFuZeRen:'String',//院校科研负责人
+            yuanXiaoKeYanFuZeRenDianHua:'String',//院校科研负责人电话
             yuanXiaoXueShengZongRenShu:'String',//学生总人数
             yuanXiaoJiaoZhiGongZongRenShu:'String',//教职工总人数
-            yuanXiaoJianZhuMianJi:'String',//院校建筑面积
-            yuanXiaoGaoJiZhiCheng:'String',// 院校职称
-            yuanXiaoKaiSheZhuanYe:'String',//院校开设专业数
+            jiaoXueFuZeRenXinMing:'String',//教学负责人姓名
+            jiaoXueFuZeRenDianHua:'String',//教学负责人电话
+            ZhuYaoFuZeRenYouXiang:'String',//主要负责人邮箱
             
             /**个人会员信息 */
             cardUrl:{type:'[String]', default:[]},//身份证正反面图片地址
@@ -411,6 +411,7 @@ const ModelArray = [
             otherEMP:'String',//其他任职情况
             otherPROF:'String',//其他专业情况
 
+            paymentStatus:'Number',//支付状态
         }
     },
     {
@@ -462,6 +463,17 @@ const ModelArray = [
             isUse:{type:'Boolean', default:false},//是否使用 默认false
         }
     },
+    {
+        tableName:TABLEENUM.审批历史表,
+        source:TABLESOURCEENUM.mongo,
+        schema:{
+            id:{ type:'String', index:true },
+            userId:'String',//用户id 外键
+            operationTime:{ type:'Number', index:true },//操作时间
+            operationBehavior:{ type:'Number', index:true },//操作行为 枚举
+            remarks:{ type:'String', index:true },//备注
+        }
+    },
 ];
 
 

src/main.ts

+import { getEdition } from "./biz/member/examine";
 import { initConfig, systemConfig} from "./config/serverConfig";
 import { initDataBaseModel } from "./data/db/db";
 import { httpServer } from "./net/http_server";
@@ -14,4 +15,4 @@ async function lanuch() {
     console.log('This indicates that the server is started successfully.');
 }
 
-lanuch();
+lanuch();
\ No newline at end of file

src/routers/public/router.ts

@@ -138,7 +138,7 @@ export const Config = {
             bindBiz:publicBiz.setEnumInterface
         },
         {
-            apiName:"验证码类型",
+            apiName:"验证码类型", 
             subUrl:'/codetype', 
             param:[],
             defaultParam:enumConfig.CODETYPE,
@@ -177,8 +177,28 @@ export const Config = {
             subUrl:'/orderstate', 
             param:[],
             defaultParam:enumConfig.ORDERSTATE,
-            bindBiz:publicBiz.setEnumInterface     
-        }
+            bindBiz:publicBiz.setEnumInterface
+        },
+        {    
+            apiName:"单位会员类别", 
+            subUrl:'/unitMemberType', 
+            param:[],
+            defaultParam:enumConfig.UNITMEMBERTYPE,
+            bindBiz:publicBiz.setEnumInterface
+        },
+        {
+            apiName:"个人会员类别", 
+            subUrl:'/individualMemberType', 
+            param:[],
+            defaultParam:enumConfig.INDIVIDUALMEMBERTYPE,
+            bindBiz:publicBiz.setEnumInterface
+        },
+        {
+            apiName:"会员职务", 
+            subUrl:'/memberLevel', 
+            param:[],
+            defaultParam:enumConfig.MEMBERLEVEL,
+            bindBiz:publicBiz.setEnumInterface
+        },
     ],
 }
-