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

src/biz/member/examine.ts

@@ -14,7 +14,7 @@ import { extractData } from "../../util/piecemeal";
 import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
 
 /**
- * 待审核列表
+ * 待审核列表 success
  * @param unitName 单位名称
  * @param joinTime 入会时间
  * @param memberType 会员类型 MEMBERTYPE
@@ -29,7 +29,7 @@ export async function pendingReviewList({unitName, joinTime, memberType, sheng,
     eccEnumValue(EccFuncName, '会员类型', MEMBERTYPE, memberType);
 
     /**查询条件 */
-    let selectParam:any = {userRegisterState:USERREGISTERSTATE.待审核};
+    let selectParam:any = {userRegisterState:{"$not": USERREGISTERSTATE.通过}}; //审批列表展示状态除通过外的数据
     if (unitName) selectParam.unitName = unitName;
     if (joinTime) selectParam.joinTime = joinTime;
     if (memberType) selectParam.memberType = memberType;
@@ -37,13 +37,13 @@ export async function pendingReviewList({unitName, joinTime, memberType, sheng,
     if (shi) selectParam.shi = shi;
     if (qu) selectParam.qu = qu;
 
-    let selectConf = ["userId", "userRegisterState", "unitName", "loginId", "phone", "askForTime", "memberLevel", "sheng", "shi", "qu"];
-    let dbList = await findToPage(TABLEENUM.用户表, selectParam, selectConf, pageNumber);
+    const SelectConf = ["userId", "userRegisterState", "unitName", "loginId", "phone", "askForTime", "memberLevel", "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, selectConf);
+        let item:any = extractData(info, SelectConf);
         /**处理枚举值 */
         if (!item.userRegisterState) item.userRegisterState = USERREGISTERSTATE.待审核;
         else item.userRegisterState = changeEnumValue(USERREGISTERSTATE, item.userRegisterState);
@@ -56,8 +56,8 @@ export async function pendingReviewList({unitName, joinTime, memberType, sheng,
 
 
 /**
- * 通过审核
- * @param param0 
+ * 通过审核 success
+ * @param userId 
  * @returns 
  */
 export async function adopt({userId}) {
@@ -66,11 +66,12 @@ export async function adopt({userId}) {
 
     await updateOneData(TABLEENUM.用户表, {userId}, {userRegisterState:USERREGISTERSTATE.通过});
 
-    let now = new Date().valueOf(); 
+    /**提交审批历史信息 */
+    const NowMs = new Date().valueOf(); 
     let addApprovalHistory = {
         id:generateSystemId(TABLEENUM.审批历史表, userId),
         userId,
-        operationTime:now,
+        operationTime:NowMs,
         operationBehavior:OPERATIONREHAVIOR.通过,
         remarks:""
     };
@@ -81,30 +82,28 @@ export async function adopt({userId}) {
 
 
 /**
- * 驳回
- * @param param0 
+ * 驳回 success
+ * @param userId 
+ * @param remarks 驳回理由
  * @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}
+    /**驳回修改，修改该会员注册流程回到第二步 */
+    let updateParam = {
+        userRegisterState:USERREGISTERSTATE.驳回修改, 
+        registerFlow:REGISTERFLOW.完成第二步
     }
-
-    await updateOneData(TABLEENUM.用户表, {userId}, selectParam);
+    await updateOneData(TABLEENUM.用户表, {userId}, updateParam);
     
-    let now = new Date().valueOf(); 
+    /**提交审批历史信息 */
+    const NowMs = new Date().valueOf(); 
     let addApprovalHistory = {
         id:generateSystemId(TABLEENUM.审批历史表, userId),
         userId,
-        operationTime:now,
+        operationTime:NowMs,
         operationBehavior:OPERATIONREHAVIOR.驳回修改,
         remarks
     };
@@ -115,7 +114,9 @@ export async function reject({userId, remarks}) {
 
 
 /**
- * 审核历史
+ * 审核历史 success
+ * @param userId
+ * @returns 
  */
 export async function approvalHistoryList({userId}) {
     let oldInfo = await find(TABLEENUM.审批历史表, {userId});
@@ -130,11 +131,18 @@ export async function approvalHistoryList({userId}) {
 
 /**
  * 待支付列表
+ * @param unitName 单位名称
+ * @param joinTime 入会时间
+ * @param memberType 会员类型 MEMBERTYPE
+ * @param paymentStatus 支付状态
+ * @param pageNumber 当前页
+ * @returns 
  */
 export async function toBePaidList({unitName, joinTime, memberType, paymentStatus, pageNumber}) {
     /**校验枚举 */
     const EccFuncName = '待审核列表';
     eccEnumValue(EccFuncName, '会员类型', MEMBERTYPE, memberType);
+    eccEnumValue(EccFuncName, '支付状态', PAYMENTSTATUS, paymentStatus);
 
     let selectParam:any = {};
     if (unitName) selectParam.unitName = unitName;
@@ -142,19 +150,27 @@ export async function toBePaidList({unitName, joinTime, memberType, paymentStatu
     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);
+    const 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);
+        let item:any = extractData(info, SelectConf);
         item.memberType = changeEnumValue(MEMBERTYPE, item.memberType);
         item.paymentStatus = changeEnumValue(PAYMENTSTATUS, item.paymentStatus);
         dataList.push(item);
     });
 
-    return {dataList, dataCount};;
+    return {dataList, dataCount};
+
+
+
+
+
+
+
+    
 }
 
 

src/biz/member/member.ts

@@ -60,7 +60,7 @@ export async function unitMemberList({unitName, joinTime, unitMemberType, member
 
 /**
  * 单位会员详情
- * @param param0 
+ * @param userId 
  * @returns {顶部数据, 基本信息, 单位信息, 单位所获得科研成果}
  */
 
@@ -74,6 +74,7 @@ export async function unitMemberDetails({userId}) {
     let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
     if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
     let topInfo:any = extractData(oldInfo, ["session", "memberLevel"]);
+    /**处理枚举值 */
     topInfo.memberLevel = changeEnumValue(MEMBERLEVEL, topInfo.memberLevel);
     let basicInfo = extractData(oldInfo, UnitBasicConfig);
     let unitInfo = extractData(oldInfo, UnitConfig);
@@ -87,8 +88,9 @@ export async function unitMemberDetails({userId}) {
 
 /**
  * 单位会员 修改
- * @param userId
- * @param form
+ * @param form 修改信息表单
+ * @param keyanForm 修改科研信息表单
+ * @param userId 
  * @returns 
  */
 export async function unitMemberUpdate({form, keyanForm, userId}) {
@@ -99,7 +101,7 @@ export async function unitMemberUpdate({form, keyanForm, userId}) {
     eccEnumValue(EccFuncName, '单位信息类型', UNITINFOTYPE, form.unitInfoType);
 
     if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
-
+    /**修改会员用户信息 */
     await updateOneData(TABLEENUM.用户表, {userId}, form);
 
     /**删除对应userId科研成果 */
@@ -107,6 +109,7 @@ export async function unitMemberUpdate({form, keyanForm, userId}) {
     if (!oldKeYanInfo || !oldKeYanInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
     await deleteManyData(TABLEENUM.单位所获得科研成果表, {userId});
 
+    /**添加新的科研信息 */
     let addList = [];
     for (let i = 0; i < keyanForm.length; i++) {
         keyanForm[i].id = generateSystemId(TABLEENUM.单位所获得科研成果表, userId);
@@ -325,7 +328,6 @@ export async function memberRegister2({form, userId}) {
 /**
  * 会员注册【单位会员】【流程一】success
  * @param form 
- * @param codeId 
  */
  export async function unitMemberRegister1({form}) {
     let {loginId, mail, pwd, confirmation, phone, codeNum} = form;

src/config/enum.ts

@@ -504,6 +504,7 @@ export enum PAYMENTSTATUS {
     已支付 = 1,
     未支付,
     银行转账,
+    线下付款
 }
 
 

src/data/models/model.ts

@@ -341,7 +341,6 @@ const ModelArray = [
             token:{type:'String', default:''},//token
             tokenMs:{type:'Number', default:0},//token过期时间
             session:'String',//届次
-            applicationForm:'String',//入会申请表
             paymentStatus:'Number',//支付状态
             /**管理员字段 */
             adminType:{type:'Number'},//管理员类别 ADMINTYPE
@@ -356,7 +355,7 @@ const ModelArray = [
             memberLevel:'Number',//会员等级、职务 枚举MEMBERLEVEL
             unitMemberType:{type: 'Number'},//单位会员类型 枚举UNITMEMBERTYPE
             profCategory:'Number',//专业类别 枚举PROFCATEGORY
-            certificateType:'Number',//证书类型 枚举
+            certificateType:'Number',//证书类型 枚举CERTIFICATETYPE
             /**宽限期状态 */
             isGracePeriod:{type:'Number', default:0},//是否宽限期 0：否， 1：是
             gracePeriodEndTime:'Number',//宽限期到期时间 时间戳
@@ -390,11 +389,6 @@ const ModelArray = [
             academicCERTUrl:'String',//学历证明图片地址
             professionalCERTUrl:'String',//工作证明图片地址
             auxiliaryMaterial:{type:'[String]', default:[]},//其他辅助材料
-            /**发票信息【新加 待定】 */
-            //原社会信用代码
-            //原发票抬头
-            //新社会信用代码
-            //新发票抬头
             /**第二步流程表单（单位）【基础信息】 */
             unitName:'String',//单位名称
             uscc:'String',//统一信用代码
@@ -422,6 +416,8 @@ const ModelArray = [
             yuanXiaoXueShengZongRenShu:'String',//院校学生总人数
             yuanXiaoJiaoZhiGongZongRenShu:'String',//教职工总人数
             jiaoXueFuZeRenDianHua:'String',//教学负责人电话
+            /**第三步流程表单（单位）【申请表上传】 */
+            applicationForm:'String',//入会申请表
             
         }
     },
@@ -461,6 +457,8 @@ const ModelArray = [
             confirmReceipt:{type:'Number', default:RECEIPTCONFIRMATION.待确认},//收款确认【财务核对页收款确认】
             invoiceStatus:{type:'Number', default:INVOICESTATUS.不具备开票条件, index:true},//发票状态 枚举 INVOICESTATUS 【待开发票页上传发票之后更新状态】
             advanceInvoice:{type:'Boolean', default:false},//是否提前开票 【个人列表页提交开发票按钮】
+            newUnitName:'String',//单位名称，新发票抬头【变更发票抬头使用】
+            newUscc:'String',//新统一信用代码【变更发票信用代码使用】
         }
     },
     {