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

src/biz/member/examine.ts

+/**
+ * 审批逻辑
+ */
+
+import { MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, USERREGISTERSTATE } 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";
+
+/**
+ * 待审核
+ * @param param0 
+ */
+export async function auditList({unitName, joinTime, memberType, sheng, shi, qu, pageNumber}) {
+    let selectParam:any = {};
+    if (unitName) selectParam.unitName = unitName;
+    if (joinTime) selectParam.joinTime = joinTime;
+    if (memberType) selectParam.memberType = memberType;
+    if (sheng) selectParam.sheng = sheng;
+    if (shi) selectParam.shi = shi;
+    if (qu) selectParam.qu = qu;
+    selectParam.userRegisterState = USERREGISTERSTATE.待审核;
+
+    let selectConf = ["userId", "userRegisterState", "unitName", "loginId", "phone", "askForTime", "memberLevel", "sheng", "shi", "qu"];
+    let dbList = await findToPage(TABLEENUM.用户表, selectParam, selectConf, pageNumber, 10);
+    let dataCount = await findCount(TABLEENUM.用户表, selectParam);
+
+    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);
+        dataList.push(item);
+    });
+
+    return {dataList, dataCount};
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

src/biz/member/member.ts

@@ -2,7 +2,7 @@
  * 会员逻辑
  */
 
-import { MEMBERSTATE, MEMBERLEVEL, DOCUMENTTYPE, NATION, PROFCATEGORY, CODETYPE, UNITINFOTYPE, MEMBERTYPE, REGISTERFLOW, SEX } from "../../config/enum";
+import { MEMBERSTATE, MEMBERLEVEL, DOCUMENTTYPE, NATION, PROFCATEGORY, CODETYPE, UNITINFOTYPE, MEMBERTYPE, REGISTERFLOW, SEX, USERREGISTERSTATE } from "../../config/enum";
 import { ERRORENUM } from "../../config/errorEnum";
 import { TABLEENUM } from "../../data/models/model";
 import { find, findCount, findOnce, findToPage } from "../../data/select";
@@ -31,13 +31,16 @@ export async function unitMemberList({unitName, joinTime, unitMemberType, workDu
     if (sheng) selectParam.sheng = sheng;
     if (shi) selectParam.shi = shi;
     if (qu) selectParam.qu = qu;
+    selectParam.memberType = MEMBERTYPE.单位会员;
+    selectParam.userRegisterState = USERREGISTERSTATE.通过;
 
-    let dbList = await findToPage(TABLEENUM.用户表, selectParam, [], pageNumber);
+    let selectConf = ["userId", "memberState", "unitName", "loginId", "phone", "joinTime", "unitMemberLevel", "sheng", "shi", "qu"];
+    let dbList = await findToPage(TABLEENUM.用户表, selectParam, selectConf, pageNumber);
     let dataCount = await findCount(TABLEENUM.用户表, selectParam);
 
     let dataList = [];
     dbList.forEach(info => {
-        let item:any = extractData(info, ["userId", "memberState", "unitName", "loginId", "phone", "joinTime", "unitMemberLevel", "sheng", "shi", "qu"]);
+        let item:any = extractData(info, selectConf);
         changeEnumValue(MEMBERSTATE, item.memberState);
         if (!item.memberLevel) item.memberLevel = "未选择";
         else changeEnumValue(MEMBERLEVEL, item.memberLevel);
@@ -171,6 +174,8 @@ export async function individualMemberList({name, documentId, phone, memberLevel
     if (joinTime) selectParam.joinTime = joinTime;
     if (auditTime) selectParam.auditTime = auditTime;
     if (memberState) selectParam.memberState = memberState;
+    selectParam.memberType = MEMBERTYPE.个人会员;
+    selectParam.userRegisterState = USERREGISTERSTATE.通过;
 
     let selectConf = ["userId", "memberState", "unitName", "name", "sex", "nation", "loginId", "phone", "joinTime", "memberLevel", "sheng", "shi", "qu"];
     let dbList = await findToPage(TABLEENUM.用户表, selectParam, selectConf, pageNumber, 10);
@@ -252,7 +257,7 @@ export async function individualMemberDetails({userId}) {
     form.userId = sysTools.generateUserId();
     form.memberType = MEMBERTYPE.个人会员;
     form.isAdmin = 0;
-    form.registerFlow = REGISTERFLOW.个人会员注册1;
+    form.registerFlow = REGISTERFLOW.个人会员注册1; //会员注册流程状态，审核通过后修改为流程2
 
     // let todayMs = sysTools.getTodayMs();
     let codeList = await findOnce(TABLEENUM.验证码表, {codeId});
@@ -272,10 +277,10 @@ export async function individualMemberDetails({userId}) {
     await addOneData(TABLEENUM.用户表, form);
 
     /**注册成功，返回userId和会员注册流程字段 */
-    let oldInfo = await findOnce(TABLEENUM.用户表, {userId:form.userId});
-    let dataList = extractData(oldInfo, ["userId", "registerFlow"]);
+    // let oldInfo = await findOnce(TABLEENUM.用户表, {userId:form.userId});
+    // let dataList = extractData(oldInfo, ["userId", "registerFlow"]);
 
-    return dataList;
+    return successResult();
 }
 
 
@@ -296,18 +301,16 @@ export async function memberRegister2({form, userId}) {
     eccEnumValue(EccFuncName, '民族', NATION, form.nation);
     eccEnumValue(EccFuncName, '专业类别', PROFCATEGORY, form.profCategory);
     
-    form.registerFlow = REGISTERFLOW.个人会员注册2;
+    form.registerFlow = REGISTERFLOW.个人会员注册2;  //todo 审核成功后修改
     await updateOneData(TABLEENUM.用户表, {userId}, form);
     
-    let unitInfo = await findOnce(TABLEENUM.用户表, {userId});
-    let dataList = extractData(unitInfo, ["userId", "registerFlow"]);
+    // let unitInfo = await findOnce(TABLEENUM.用户表, {userId});
+    // let dataList = extractData(unitInfo, ["userId", "registerFlow"]);
 
-    return dataList;
+    return successResult();
 }
 
 
-
-
 /**
  * 单位入会流程1
  * @param secureArgs 
@@ -327,7 +330,7 @@ export async function memberRegister2({form, userId}) {
     form.userId = sysTools.generateUserId();
     form.memberType = MEMBERTYPE.单位会员;
     form.isAdmin = 0;
-    form.registerFlow = REGISTERFLOW.单位会员注册1;
+    form.registerFlow = REGISTERFLOW.单位会员注册1; //todo 会员注册流程状态，审核通过后修改为流程2
 
     // let todayMs = sysTools.getTodayMs();
 
@@ -348,10 +351,10 @@ export async function memberRegister2({form, userId}) {
     await addOneData(TABLEENUM.用户表, form);
 
     /**注册成功，返回userId和会员注册流程字段 */
-    let oldInfo = await findOnce(TABLEENUM.用户表, {userId:form.userId});
-    let dataList = extractData(oldInfo, ["userId", "registerFlow"]);
+    // let oldInfo = await findOnce(TABLEENUM.用户表, {userId:form.userId});
+    // let dataList = extractData(oldInfo, ["userId", "registerFlow"]);
 
-    return dataList;
+    return successResult();
 }
 
 
@@ -365,17 +368,93 @@ export async function unitMemberRegister2({form, keyanForm, userId}) {
     let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
     if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
     
-    form.registerFlow = REGISTERFLOW.单位会员注册2;
+    // form.registerFlow = REGISTERFLOW.单位会员注册2; //todo 审核成功后修改
     await updateOneData(TABLEENUM.用户表, {userId}, form);
     
-    let unitInfo = await findOnce(TABLEENUM.用户表, {userId});
-    let dataList = extractData(unitInfo, ["userId", "registerFlow"]);
+    // let unitInfo = await findOnce(TABLEENUM.用户表, {userId});
+    // let dataList = extractData(unitInfo, ["userId", "registerFlow"]);
+
+    let addList = [];
+    for (let i = 0; i < keyanForm.length; i++) {
+        keyanForm[i].id = generateSystemId(TABLEENUM.单位所获得科研成果表, userId);
+        keyanForm[i].userId = userId;
+        addList.push(keyanForm[i]);
+    }
+    await addManyData(TABLEENUM.单位所获得科研成果表, addList);
+    
+    return successResult();
+}
+
+
+
+
+
+
+
+
+
+
+
+/**
+ * 获取当前会员注册流程
+ */
+export async function registerFlowType({userId}) {
+    let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
+    if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
+
+    if (!oldInfo.registerFlow) {
+        if (oldInfo.memberType == MEMBERTYPE.个人会员) {
+            await updateOneData(TABLEENUM.用户表, {userId}, {registerFlow:REGISTERFLOW.个人会员注册1});
+        } else {
+            await updateOneData(TABLEENUM.用户表, {userId}, {registerFlow:REGISTERFLOW.单位会员注册1});
+        }
+    }
+
+    let dataInfo = await findOnce(TABLEENUM.用户表, {userId});
+    let dataList:any = extractData(dataInfo, ["userId", "registerFlow", "userRegisterState"]);
 
     return dataList;
 }
 
 
 
+/**
+ * 模拟审核通过，修改审核状态
+ */
+export async function examine({userId}) {
+    let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
+    if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
+    let memberList:any = extractData(oldInfo, ["userId", "registerFlow", "memberType"]);
+
+    let selectParam = {registerFlow:memberList.registerFlow, userRegisterState:USERREGISTERSTATE.待审核};
+
+    if (memberList.memberType == MEMBERTYPE.个人会员) { //个人会员
+        switch (memberList.registerFlow) {
+            case REGISTERFLOW.个人会员注册1:
+                selectParam.registerFlow = REGISTERFLOW.个人会员注册2;
+            break;
+            case REGISTERFLOW.个人会员注册2:
+                selectParam.userRegisterState = USERREGISTERSTATE.通过;
+            break;
+        }
+    } else { //单位会员
+        switch (memberList.registerFlow) {
+            case REGISTERFLOW.单位会员注册1:
+                selectParam.registerFlow = REGISTERFLOW.单位会员注册2;
+            break;
+            case REGISTERFLOW.单位会员注册2:
+                selectParam.registerFlow = REGISTERFLOW.单位会员注册3;
+            break;
+            case REGISTERFLOW.单位会员注册3:
+                selectParam.userRegisterState = USERREGISTERSTATE.通过;
+            break;
+        }
+    }
+
+    await updateOneData(TABLEENUM.用户表, {userId}, selectParam);
+
+    return successResult();
+}
 
 
 

src/data/models/model.ts

@@ -358,6 +358,7 @@ const ModelArray = [
             registerFlow:'Number',//会员注册流程 枚举
             auditTime:'Number',//审核时间
             memberState:{type:'Number', default:MEMBERSTATE.正常, index:true},//会员状态 枚举
+            askForTime:'Number',//申请时间
             joinTime:'Number',//入会时间
             session:'String',//届次
             memberLevel:'Number',//会员等级 枚举

src/routers/member/router.ts

@@ -399,19 +399,29 @@ export const Config = {
                     }
                 },
                 {
-                    key:"keyanForm", type:"Object", sub:
-                    {
-                        startTime:{type:'Number', desc:'开始时间'},
-                        endTime:{type:'Number', desc:'结束时间'},
-                        describe:{type:'String', desc:'科研描述'},
-                    },
-                    desc:"单位所获得科研成果表单"
+                    key:"keyanForm", type:"[Object]", desc:"单位所获得科研成果表单"
                 },
                 {
                     key:"userId", type:"String", desc:"用户id"
                 }
             ],
             bindBiz:memberBiz.unitMemberRegister2
+        },
+        {
+            apiName:"模拟审核通过修改会员注册流程",
+            subUrl:'/memberdb/examine',
+            param:[
+                {key:"userId", type:"String", desc:"用户id"},
+            ],
+            bindBiz:memberBiz.examine
+        },
+        {
+            apiName:"获取当前会员注册流程",
+            subUrl:'/memberdb/registerflowtype',
+            param:[
+                {key:"userId", type:"String", desc:"用户id"},
+            ],
+            bindBiz:memberBiz.registerFlowType
         }
     ]
 }