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

src/biz/member/authority.ts

 /**
- * 会员管理 【权限管理】
+ * 会员管理 【权限管理】success
  */
 
 import { INDIVIDUALMEMBERTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, UNITMEMBERTYPE } from "../../config/enum";

src/biz/member/examine.ts

 /**
- * 审批逻辑
+ * 审批逻辑 success
  */
 
 import { INDIVIDUALMEMBERTYPE, MEMBERLEVEL, MEMBERTYPE, OPERATIONREHAVIOR, PAYMENTSTATUS, REGISTERFLOW, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../../config/enum";
@@ -11,7 +11,7 @@ import { updateOneData } from "../../data/update";
 import { generateSystemId, successResult } from "../../tools/system";
 import { BizError } from "../../util/bizError";
 import { extractData } from "../../util/piecemeal";
-import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
+import { changeEnumValue } from "../../util/verificationEnum";
 import { createOrder } from "./order";
 
 /**

src/biz/member/member.ts

 /**
- * 会员逻辑
+ * 会员管理逻辑
  */
 
 import { MEMBERSTATE, MEMBERLEVEL, DOCUMENTTYPE, NATION, PROFCATEGORY, CODETYPE, MEMBERTYPE, REGISTERFLOW, SEX, USERREGISTERSTATE, OPERATIONREHAVIOR, STATE, BANXUELEIXING, UNITMEMBERTYPE } from "../../config/enum";
@@ -11,13 +11,12 @@ import { generateSystemId, successResult } from "../../tools/system";
 import { BizError } from "../../util/bizError";
 import { extractData } from "../../util/piecemeal";
 import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
-import * as sysTools from "../../tools/system";
 import { addManyData, addOneData } from "../../data/add";
 import { deleteManyData, deleteOneData } from "../../data/delete";
 
 
 /**
- * 单位会员列表
+ * 单位会员列表 success
  * @param unitName 单位名称 
  * @param joinTime 入会时间
  * @param unitMemberType 单位会员所属类型 UNITMEMBERTYPE
@@ -29,7 +28,7 @@ import { deleteManyData, deleteOneData } from "../../data/delete";
  * @param pageNumber 当前页
  */
 export async function unitMemberList({unitName, joinTime, unitMemberType, memberLevel, session, sheng, shi, qu, pageNumber}) {
-    let selectParam:any = {};
+    let selectParam:any = {isAdmin:STATE.否};
     if (unitName) selectParam.unitName = unitName;
     if (joinTime) selectParam.joinTime = joinTime;
     if (unitMemberType) selectParam.unitMemberType = unitMemberType;
@@ -41,13 +40,13 @@ export async function unitMemberList({unitName, joinTime, unitMemberType, member
     selectParam.memberType = MEMBERTYPE.单位会员;
     selectParam.userRegisterState = USERREGISTERSTATE.通过;
 
-    let selectConf = ["userId", "memberState", "unitName", "loginId", "phone", "joinTime", "unitMemberLevel", "sheng", "shi", "qu"];
-    let dbList = await findToPage(TABLEENUM.用户表, selectParam, selectConf, pageNumber);
+    const SelectFiles = ["userId", "memberState", "unitName", "loginId", "phone", "joinTime", "unitMemberLevel", "sheng", "shi", "qu"];
+    let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber);
     let dataCount = await findCount(TABLEENUM.用户表, selectParam);
 
     let dataList = [];
     dbList.forEach(info => {
-        let item:any = extractData(info, selectConf);
+        let item:any = extractData(info, SelectFiles);
         item.memberState = changeEnumValue(MEMBERSTATE, item.memberState);
         if (!item.memberLevel) item.memberLevel = "未选择";
         else item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel);
@@ -59,7 +58,7 @@ export async function unitMemberList({unitName, joinTime, unitMemberType, member
 
 
 /**
- * 单位会员详情
+ * 单位会员详情 
  * @param userId 
  * @returns {顶部数据, 基本信息, 单位信息, 单位所获得科研成果}
  */
@@ -70,8 +69,8 @@ const UnitConfig = ["unitMemberType", "yuanXiaoBanXueLeiXing", "yuanXiaoZhuGuanB
 "yuanXiaoBanGongFuZeRenZhiWu", "yuanXiaoBanGongFuZeRenDianHua", "yuanXiaoXueShengZongRenShu", "yuanXiaoJiaoZhiGongZongRenShu", "yuanXiaoJianZhuMianJi",
 "yuanXiaoKeYanFuZeRen", "yuanXiaoKeYanFuZeRenDianHua", "jiaoXueFuZeRenXinMing", "jiaoXueFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang"];
 
-export async function unitMemberDetails({userId}) {
-    let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
+export async function unitMemberDetails({id}) {
+    let oldInfo = await findOnce(TABLEENUM.用户表, {userId:id});
     if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
     let topInfo:any = extractData(oldInfo, ["session", "memberLevel"]);
     /**处理枚举值 */
@@ -79,7 +78,7 @@ export async function unitMemberDetails({userId}) {
     let basicInfo = extractData(oldInfo, UnitBasicConfig);
     let unitInfo = extractData(oldInfo, UnitConfig);
     
-    let oldKeYanInfo = await findOnce(TABLEENUM.单位所获得科研成果表, {userId});
+    let oldKeYanInfo = await findOnce(TABLEENUM.单位所获得科研成果表, {userId:id});
     let scientificResearch = extractData(oldKeYanInfo, ["id", "startTime", "endTime", "describe"]);
     
     return {topInfo, basicInfo, unitInfo, scientificResearch};
@@ -93,27 +92,27 @@ export async function unitMemberDetails({userId}) {
  * @param userId 
  * @returns 
  */
-export async function unitMemberUpdate({form, keyanForm, userId}) {
-    let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
+export async function unitMemberUpdate({form, keyanForm, id}) {
+    let oldInfo = await findOnce(TABLEENUM.用户表, {userId:id});
+    if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
 
     /**校验枚举 */
     const EccFuncName = '单位会员修改';
     eccEnumValue(EccFuncName, '单位信息类型', UNITMEMBERTYPE, form.unitMemberType);
-
-    if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
+    
     /**修改会员用户信息 */
-    await updateOneData(TABLEENUM.用户表, {userId}, form);
+    await updateOneData(TABLEENUM.用户表, {userId:id}, form);
 
     /**删除对应userId科研成果 */
-    let oldKeYanInfo = await find(TABLEENUM.单位所获得科研成果表, {userId});
+    let oldKeYanInfo = await find(TABLEENUM.单位所获得科研成果表, {userId:id});
     if (!oldKeYanInfo || !oldKeYanInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
-    await deleteManyData(TABLEENUM.单位所获得科研成果表, {userId});
+    await deleteManyData(TABLEENUM.单位所获得科研成果表, {userId:id});
 
     /**添加新的科研信息 */
     let addList = [];
     for (let i = 0; i < keyanForm.length; i++) {
-        keyanForm[i].id = generateSystemId(TABLEENUM.单位所获得科研成果表, userId);
-        keyanForm[i].userId = userId;
+        keyanForm[i].id = generateSystemId(TABLEENUM.单位所获得科研成果表, id);
+        keyanForm[i].userId = id;
         addList.push(keyanForm);
     }
     await addManyData(TABLEENUM.单位所获得科研成果表, addList);
@@ -181,8 +180,8 @@ export async function individualMemberList({name, documentId, phone, individualM
 const IndividualBasicConfig = ["name", "sex", "nation", "birth", "documentType", "documentId", "sheng", "shi", "qu", "addres", "photoUrl"];
 const SpecialityConfig = ["unitName", "memberLevel", "workTitle", "profCategory", "studyResume", "workResume", "profAchievement", "otherEMP", "otherPROF"];
 
-export async function individualMemberDetails({userId}) {
-    let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
+export async function individualMemberDetails({id}) {
+    let oldInfo = await findOnce(TABLEENUM.用户表, {userId:id});
     if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
 
     let topInfo:any = extractData(oldInfo, ["session", "memberLevel"]);
@@ -207,10 +206,10 @@ export async function individualMemberDetails({userId}) {
  * @param form
  * @returns 
  */
- export async function individualMemberUpdate({form, userId}) {
-    let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
+ export async function individualMemberUpdate({form, id}) {
+    let oldInfo = await findOnce(TABLEENUM.用户表, {userId:id});
     if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
-    await updateOneData(TABLEENUM.用户表, {userId}, form);
+    await updateOneData(TABLEENUM.用户表, {userId:id}, form);
 
     return successResult();
 }

src/biz/member/order.ts

 /**
- * 订单相关
+ * 订单相关 success
  */
 import moment = require("moment");
 import { COSTTYPE, INDIVIDUALMEMBERTYPE, INVOICESTATUS, ISPAYENUM, MEMBERLEVEL, MEMBERTYPE, ORDERSTATE, PAYMENTSTATUS, PAYMENTTYPE, RECEIPTCONFIRMATION, STATE, UNITMEMBERTYPE } from "../../config/enum";
@@ -61,7 +61,8 @@ export async function createOrder(userId:string, unitName:string, orderStartMs:n
         paymentNum:0,
         invoiceAdd:'',
         state:ORDERSTATE.未支付,
-        isFirst
+        isFirst,
+        ct:new Date().valueOf()
     };
 
     await addOneData(TABLEENUM.订单表, addInfo);

src/biz/member/rightsMgmt.ts

@@ -2,7 +2,7 @@
  * 权限管理
  */
 
-import { ADMINLV, ADMINTYPE, MEMBERSTATE, STATE } from "../../config/enum";
+import { ADMINFIRSTDIR, ADMINLV, ADMINTYPE, MEMBERSTATE, STATE } from "../../config/enum";
 import { ERRORENUM } from "../../config/errorEnum";
 import { TABLEENUM } from "../../data/models/model";
 import { findOnce, findToPage } from "../../data/select";
@@ -10,6 +10,7 @@ import { BizError } from "../../util/bizError";
 import { changeEnumValue, eccEnumValue } from "../../util/verificationEnum";
 import * as sysTools from "../../tools/system";
 import { addOneData } from "../../data/add";
+import { updateOneData } from "../../data/update";
 
 /**
  * 管理员列表
@@ -62,20 +63,88 @@ export async function addAdmin({userId, form}) {
     return sysTools.successResult();
 }
 
-
+/**
+ * 修改密码
+ * @param param0 
+ * @returns 
+ */
 export async function changeAdminPwd({userId, form}) {
     let {pwd, confirmation} = form;
 
-    let userInfo = await findOnce(TABLEENUM.用户表, {userId:form.userId});
+    let userInfo = await findOnce(TABLEENUM.用户表, {userId:form.userId}, ["id"]);
+    if (!userInfo || !userInfo.id) 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.两次密码不一致);
 
-    
+    await updateOneData(TABLEENUM.用户表, {userId:form.userId}, {pwd:form.pwd});
+
+    return sysTools.successResult();
+}
 
 
+/**
+ * 修改权限
+ */
+export async function updateMGMT({id, adminLv}) {
+    eccEnumValue("修改管理员权限权限", "权限列表", ADMINLV, adminLv);
+    let userInfo = await findOnce(TABLEENUM.用户表, {userId:id}, ["adminLv", "userId", "loginId"]);
+    if (!userInfo || !userInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
 
+    await updateOneData(TABLEENUM.用户表, {userId:id}, {adminLv});    
 
+    return sysTools.successResult();
+}
 
+
+/**
+ * 回显
+ */
+export async function info({id}) {
+    let userInfo = await findOnce(TABLEENUM.用户表, {userId:id}, ["adminLv", "userId", "loginId"]);
+    if (!userInfo || !userInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
+
+    let dataInfo = {
+        adminLv:userInfo.adminLv,
+        loginId:userInfo.loginId
+    };
+
+    return {dataInfo}
+}
+
+/**
+ * 权限下拉列表
+ */
+export async function mgmtSelectList() {
+   
+    let distinctMap = {};//去重
+    for (let key in ADMINFIRSTDIR) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) {//字符
+            let keyStr = key;
+            let value = ADMINFIRSTDIR[key];
+            distinctMap[value] = {
+                key:keyStr,
+                value,
+                subList:[]
+            }
+        }
+    }
+    
+    for (let key in ADMINLV) {
+        let anyKey:any = key;
+        if (isNaN(anyKey)) {//字符
+            let keyStr = key;
+            let value:any = ADMINFIRSTDIR[key];
+            let firstKey = Math.floor(value/100);
+            distinctMap[firstKey].subList.push({
+                key:keyStr,
+                value
+            });
+        }
+    }
+    let dataList = Object.values(distinctMap);
+   
+    return {dataList};
 }
\ No newline at end of file

src/biz/register.ts

 /**
- * 注册流程
+ * 注册流程 success
  */
 
 import { BANXUELEIXING, CODETYPE, DOCUMENTTYPE, MEMBERLEVEL, MEMBERTYPE, NATION, OPERATIONREHAVIOR, PROFCATEGORY, REGISTERFLOW, SEX, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../config/enum";

src/config/errorEnum.ts

@@ -33,7 +33,9 @@ export enum ERRORENUM {
     流程3不支持会员身份非单位会员,
     数据状态错误,
     用户已注册成功,
-    不具备审批条件
+    不具备审批条件,
+    该用户已在宽限期内,
+    该订单已支付
 }
 
 export enum ERRORCODEENUM {

src/data/models/model.ts

@@ -336,12 +336,12 @@ const ModelArray = [
             auditTime:'Number',//审核时间 会员审核列表审核时间
             joinTime:'Number',//入会时间 审核通过时间
             memberType:{type:'Number'},//会员类型 枚举MEMBERTYPE
-            lifespanStartTime:'Number',//会员有效期开始时间 时间戳 每次缴费成功更新
-            lifespanEndTime:'Number',//会员有效期结束时间 时间戳  每次缴费成功更新
+            lifespanStartTime:{type:'Number'},//会员有效期开始时间 时间戳 每次缴费成功更新
+            lifespanEndTime:{type:'Number', index:true},//会员有效期结束时间 时间戳  每次缴费成功更新
             token:{type:'String', default:''},//token
             tokenMs:{type:'Number', default:0},//token过期时间
             session:'String',//届次
-            paymentStatus:'Number',//支付状态
+            paymentStatus:'Number',//支付状态 PAYMENTSTATUS 
             /**管理员字段 */
             adminType:{type:'Number'},//管理员类别 ADMINTYPE
             adminLv:"[Number]",//管理员等级 多选 ADMINLV
@@ -349,7 +349,7 @@ const ModelArray = [
             registerFlow:{type:'Number', default:REGISTERFLOW.未注册},//会员注册流程 枚举
             isAdmin:{ type:'Number', index:true, default:STATE.否},//是否是管理员
             userRegisterState:{type:'Number', default:USERREGISTERSTATE.待审核},//用户注册状态 枚举USERREGISTERSTATE
-            memberState:{type:'Number', default:MEMBERSTATE.正常},//会员状态 枚举MEMBERSTATE
+            memberState:{type:'Number', default:MEMBERSTATE.正常},//会员状态 枚举 MEMBERSTATE
             certificateType:'Number',//证书类型 枚举CERTIFICATETYPE
             individualMemberType:{type: 'Number'},//个人会员类型 枚举INDIVIDUALMEMBERTYPE
             memberLevel:'Number',//会员等级、职务 枚举MEMBERLEVEL【会员管理用】
@@ -441,13 +441,14 @@ const ModelArray = [
             unitName:'String',//单位名称
             orderCycleStart:'Number',//订单周期开始时间
             orderCycleEnd:'Number',//订单周期结束时间
-            money:'String',//金额
+            money:'Number',//金额
             userId:{type:'String', index:true},//会员id
             loginId:{type:'String', index:true},//登陆名
             phone:"String",//登陆手机号
-            paymentNum:'String',//支付单号（与订单号不一样）
+            paymentNum:{type:'String', default:""},//支付单号（与订单号不一样） 线下付款时录入
+            offlinePaymentUrl:{type:'String', default:""},//转账图片
             memberCategory:'Number',//会员类别 枚举  MEMBERTYPE
-            weChartPR:"String",//微信订单号 微信支付用
+            weChartPR:{type:'String', default:""},//微信订单号 微信支付用
             // membershipFeesType:'Number',//会费类别 枚举
             invoiceAdd:'String',//发票图片地址
             isFirst:{type:'Boolean', default:true},//首次订单
@@ -459,6 +460,8 @@ const ModelArray = [
             advanceInvoice:{type:'Boolean', default:false},//是否提前开票 【个人列表页提交开发票按钮】
             newUnitName:'String',//单位名称，新发票抬头【变更发票抬头使用】
             newUscc:'String',//新统一信用代码【变更发票信用代码使用】
+            ct:'Number',//订单创建时间
+            payTime:'Number',//支付时间
         }
     },
     {

src/routers/member/router.ts

@@ -223,7 +223,7 @@ export const Config = {
             apiName:"单位会员详情",
             subUrl:'/memberdb/unitmemberdetails',
             param:[
-                {key:"userId", type:"String", desc:"用户id"}
+                {key:"id", type:"String", desc:"用户id"}
             ],
             bindBiz:memberBiz.unitMemberDetails
         },
@@ -231,7 +231,7 @@ export const Config = {
             apiName:"个人会员详情",
             subUrl:'/memberdb/individualmemberdetails',
             param:[
-                {key:"userId", type:"String", desc:"用户id"}
+                {key:"id", type:"String", desc:"用户id"}
             ],
             bindBiz:memberBiz.individualMemberDetails
         },
@@ -293,7 +293,7 @@ export const Config = {
                     desc:"单位所获得科研成果表单"
                 },
                 {
-                    key:"userId", type:"String", desc:"用户id"
+                    key:"id", type:"String", desc:"用户id"
                 }
             ],
             bindBiz:memberBiz.unitMemberUpdate
@@ -335,7 +335,7 @@ export const Config = {
                     }
                 },
                 {
-                    key:"userId", type:"String", desc:"用户id"
+                    key:"id", type:"String", desc:"用户id"
                 }
             ],
             bindBiz:memberBiz.individualMemberUpdate