no message

src/biz/member/examine.ts

@@ -2,7 +2,7 @@
  * 审批逻辑
  */
 
-import { MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, OPERATIONREHAVIOR, PAYMENTSTATUS, REGISTERFLOW, USERREGISTERSTATE } from "../../config/enum";
+import { MEMBERLEVEL, MEMBERTYPE, OPERATIONREHAVIOR, PAYMENTSTATUS, REGISTERFLOW, USERREGISTERSTATE } from "../../config/enum";
 import { ERRORENUM } from "../../config/errorEnum";
 import { addManyData } from "../../data/add";
 import { TABLEENUM } from "../../data/models/model";
@@ -15,30 +15,37 @@ import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
 
 /**
  * 待审核列表
- * @param param0 
+ * @param unitName 单位名称
+ * @param joinTime 入会时间
+ * @param memberType 会员类型 MEMBERTYPE
+ * @param sheng 省
+ * @param shi 市
+ * @param qu 区
+ * @param pageNumber 当前页 
  */
 export async function pendingReviewList({unitName, joinTime, memberType, sheng, shi, qu, pageNumber}) {
     /**校验枚举 */
     const EccFuncName = '待审核列表';
     eccEnumValue(EccFuncName, '会员类型', MEMBERTYPE, memberType);
 
-    let selectParam:any = {};
+    /**查询条件 */
+    let selectParam:any = {userRegisterState:USERREGISTERSTATE.待审核};
     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 dbList = await findToPage(TABLEENUM.用户表, selectParam, selectConf, pageNumber);
     let dataCount = await findCount(TABLEENUM.用户表, selectParam);
 
     let dataList = [];
     dbList.forEach(info => {
         let item:any = extractData(info, selectConf);
-        if (!item.userRegisterState) item.userRegisterState = "待审核";
+        /**处理枚举值 */
+        if (!item.userRegisterState) item.userRegisterState = USERREGISTERSTATE.待审核;
         else item.userRegisterState = changeEnumValue(USERREGISTERSTATE, item.userRegisterState);
         item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel);
         dataList.push(item);

src/biz/member/member.ts

@@ -248,11 +248,11 @@ export async function individualMemberDetails({userId}) {
     if (pwd != confirmation)  throw new BizError(ERRORENUM.两次密码不一致);
     
     /**校验去重 */
-    let oldData = await findOnce(TABLEENUM.用户表, {"$or":[{loginId:form.loginId}, {phone:form.phone}, {mail:form.mail}] });
+    let oldData = await findOnce(TABLEENUM.用户表, {"$or":[{loginId:loginId}, {phone:phone}, {mail:mail}] });
     if (oldData && oldData.userId) {
-        if (oldData.loginId == loginId) throw new BizError(ERRORENUM.用户名重复, form.loginId );
-        if (oldData.phone == phone) throw new BizError(ERRORENUM.联系人手机号重复, form.phone );
-        if (oldData.mail == form.mail) throw new BizError(ERRORENUM.邮箱重复, form.loginId );
+        if (oldData.loginId == loginId) throw new BizError(ERRORENUM.用户名重复, loginId );
+        if (oldData.phone == phone) throw new BizError(ERRORENUM.联系人手机号重复, phone );
+        if (oldData.mail == mail) throw new BizError(ERRORENUM.邮箱重复, loginId );
     }
 
     /**比对验证码 */
@@ -288,6 +288,7 @@ export async function individualMemberDetails({userId}) {
 export async function memberRegister2({form, userId}) {
     let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
     if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
+    const NowMs = new Date().valueOf();
     
     /**校验枚举 */
     const EccFuncName = '注册个人会员流程2';
@@ -308,11 +309,10 @@ export async function memberRegister2({form, userId}) {
     else operationBehavior = OPERATIONREHAVIOR.用户提交;
 
     /**提交审批历史信息 */
-    let now = new Date().valueOf(); 
     let addApprovalHistory = {
         id:generateSystemId(TABLEENUM.审批历史表, userId),
         userId,
-        operationTime:now,
+        operationTime:NowMs,
         operationBehavior:operationBehavior,
         remarks:""
     };
@@ -331,15 +331,15 @@ export async function memberRegister2({form, userId}) {
     let {loginId, mail, pwd, confirmation, phone, codeNum} = form;
     const NowMs = new Date().valueOf();
     /**校验密码 */
-    if (form.pwd.search(/^[A-Za-z0-9]{6,18}$/) < 0) throw new BizError(ERRORENUM.密码只能由6至18位字符和数字组成);
-    if (form.pwd != form.confirmation)  throw new BizError(ERRORENUM.两次密码不一致);
+    if (pwd.search(/^[A-Za-z0-9]{6,18}$/) < 0) throw new BizError(ERRORENUM.密码只能由6至18位字符和数字组成);
+    if (pwd != confirmation)  throw new BizError(ERRORENUM.两次密码不一致);
 
     /**校验去重 */
-    let oldData = await findOnce(TABLEENUM.用户表, {"$or":[{loginId:form.loginId}, {phone:form.phone}, {mail:form.mail}] });
+    let oldData = await findOnce(TABLEENUM.用户表, {"$or":[{loginId:loginId}, {phone:phone}, {mail:mail}] });
     if (oldData && oldData.userId) {
-        if (oldData.loginId == form.loginId) throw new BizError(ERRORENUM.用户名重复, form.loginId );
-        if (oldData.phone == form.phone) throw new BizError(ERRORENUM.联系人手机号重复, form.phone );
-        if (oldData.mail == form.mail) throw new BizError(ERRORENUM.邮箱重复, form.loginId );
+        if (oldData.loginId == loginId) throw new BizError(ERRORENUM.用户名重复, loginId );
+        if (oldData.phone == phone) throw new BizError(ERRORENUM.联系人手机号重复, phone );
+        if (oldData.mail == mail) throw new BizError(ERRORENUM.邮箱重复, loginId );
     }
     
     /**比对验证码 */
@@ -390,6 +390,7 @@ export async function unitMemberRegister2({form, keyanForm, userId}) {
     form.registerFlow = REGISTERFLOW.完成第二步;
     await updateOneData(TABLEENUM.用户表, {userId}, form);
 
+    /**注册提交单位科研成果信息 */
     let addList = [];
     for (let i = 0; i < keyanForm.length; i++) {
         keyanForm[i].id = generateSystemId(TABLEENUM.单位所获得科研成果表, userId);
@@ -403,26 +404,30 @@ export async function unitMemberRegister2({form, keyanForm, userId}) {
 
 
 /**
- * 单位入会流程3
- * @param param0 
+ * 会员注册【单位会员】【流程3】success
+ * @param application 入会申请表
+ * @param userId 
  */
-export async function unitMemberRegister3({applicationForm, userId}) {
+export async function unitMemberRegister3({application, userId}) {
     let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
     if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
+    const NowMs = new Date().valueOf();
 
-    await updateOneData(TABLEENUM.用户表, {userId}, {applicationForm, registerFlow:REGISTERFLOW.单位会员注册3});
+    if (oldInfo.memberType != MEMBERTYPE.单位会员) throw new BizError(ERRORENUM.流程3不支持会员身份非单位会员);
+    await updateOneData(TABLEENUM.用户表, {userId}, {application, registerFlow:REGISTERFLOW.完成第三步});
 
     /**用户提交注册申请，等待审核 */
     let approvalHistoryInfo = await find(TABLEENUM.审批历史表, {userId});
     let operationBehavior;
+    /**判断是否第一次提交审核 */
     if(approvalHistoryInfo.length>1) operationBehavior = OPERATIONREHAVIOR.重新提交;
     else operationBehavior = OPERATIONREHAVIOR.用户提交;
 
-    let now = new Date().valueOf(); 
+    /**提交审批历史信息 */
     let addApprovalHistory = {
         id:generateSystemId(TABLEENUM.审批历史表, userId),
         userId,
-        operationTime:now,
+        operationTime:NowMs,
         operationBehavior:operationBehavior,
         remarks:""
     };
@@ -442,17 +447,16 @@ export async function downloadApplication() {
 
 /**
  * 获取当前会员注册流程
+ * registerFlow：注册流程状态 REGISTERFLOW 会员注册流程步骤
+ * userRegisterState：用户注册状态 USERREGISTERSTATE 会员注册是否已审批通过
+ * 前端通过该方法获取注册流程状态，流程1通过返回状态【完成第一步】，流程2通过返回状态【完成第二步】，流程3通过返回状态【完成第三步】
  */
  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});
-        }
+        await updateOneData(TABLEENUM.用户表, {userId}, {registerFlow:REGISTERFLOW.未注册});
     }
 
     let dataInfo = await findOnce(TABLEENUM.用户表, {userId});

src/config/errorEnum.ts

@@ -29,7 +29,8 @@ export enum ERRORENUM {
     无法获取未来届次,
     微信支付无法被退回,
     订单状态无法开具发票,
-    微信支付无法退回发票请求
+    微信支付无法退回发票请求,
+    流程3不支持会员身份非单位会员
 }
 
 export enum ERRORCODEENUM {

src/routers/member/router.ts

@@ -138,7 +138,7 @@ export const Config = {
             subUrl:'/memberdb/unitmemberregister2',
             param:[
                 {
-                    key:"applicationForm", type:"String", desc:"入会申请表"
+                    key:"application", type:"String", desc:"入会申请表"
                 },
                 {
                     key:"userId", type:"String", desc:"用户id"