Skip to content

W
wenHuaBu_adminServer
Commit ed379596 by chenjinjing
Options

会员管理

parent c24b76f7
Showing with 228 additions and 73 deletions
src/biz/member/authority.ts 0 → 100644
/**
* 会员管理
*/
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
......@@ -11,13 +11,17 @@ 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 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;
......@@ -35,8 +39,8 @@ export async function pendingReviewList({unitName, joinTime, memberType, sheng,
dbList.forEach(info => {
let item:any = extractData(info, selectConf);
if (!item.userRegisterState) item.userRegisterState = "待审核";
else changeEnumValue(USERREGISTERSTATE, item.userRegisterState);
changeEnumValue(MEMBERLEVEL, item.memberLevel);
else item.userRegisterState = changeEnumValue(USERREGISTERSTATE, item.userRegisterState);
item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel);
dataList.push(item);
});
......@@ -111,7 +115,7 @@ export async function approvalHistoryList({userId}) {
if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
let dataList:any = extractData(oldInfo, ["operationTime", "operationBehavior", "remarks"]);
changeEnumValue(OPERATIONREHAVIOR, dataList.operationBehavior);
dataList.operationBehavior = changeEnumValue(OPERATIONREHAVIOR, dataList.operationBehavior);
return dataList;
}
......@@ -121,6 +125,10 @@ export async function approvalHistoryList({userId}) {
* 待支付列表
*/
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;
......@@ -134,8 +142,8 @@ export async function toBePaidList({unitName, joinTime, memberType, paymentStatu
let dataList = [];
dbList.forEach(info => {
let item:any = extractData(info, selectConf);
changeEnumValue(MEMBERTYPE, item.memberType);
changeEnumValue(PAYMENTSTATUS, item.paymentStatus);
item.memberType = changeEnumValue(MEMBERTYPE, item.memberType);
item.paymentStatus = changeEnumValue(PAYMENTSTATUS, item.paymentStatus);
dataList.push(item);
});
......@@ -158,20 +166,6 @@ export async function passThroughPaid({userId}) {
}
/**
* 获取届次
* @param year 入会年份
......@@ -200,32 +194,3 @@ export async function getEdition(year, month) {
src/biz/member/member.ts
......@@ -19,14 +19,22 @@ import { deleteManyData, deleteOneData } from "../../data/delete";
/**
* 单位会员列表
* @param param0
* @param unitName 单位名称
* @param joinTime 入会时间
* @param unitMemberType 单位会员所属类型 UNITMEMBERTYPE
* @param memberLevel 会员等级 职务 MEMBERLEVEL
* @param session 届次
* @param sheng 省
* @param shi 市
* @param qu 区
* @param pageNumber 当前页
*/
export async function unitMemberList({unitName, joinTime, unitMemberType, workDuties, session, sheng, shi, qu, pageNumber}) {
export async function unitMemberList({unitName, joinTime, unitMemberType, memberLevel, session, sheng, shi, qu, pageNumber}) {
let selectParam:any = {};
if (unitName) selectParam.unitName = unitName;
if (joinTime) selectParam.joinTime = joinTime;
if (unitMemberType) selectParam.unitMemberType = unitMemberType;
if (workDuties) selectParam.workDuties = workDuties;
if (memberLevel) selectParam.memberLevel = memberLevel;
if (session) selectParam.session = session;
if (sheng) selectParam.sheng = sheng;
if (shi) selectParam.shi = shi;
......@@ -41,9 +49,9 @@ export async function unitMemberList({unitName, joinTime, unitMemberType, workDu
let dataList = [];
dbList.forEach(info => {
let item:any = extractData(info, selectConf);
changeEnumValue(MEMBERSTATE, item.memberState);
item.memberState = changeEnumValue(MEMBERSTATE, item.memberState);
if (!item.memberLevel) item.memberLevel = "未选择";
else changeEnumValue(MEMBERLEVEL, item.memberLevel);
else item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel);
dataList.push(item);
});
......@@ -67,7 +75,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"]);
changeEnumValue(MEMBERLEVEL, topInfo.memberLevel);
topInfo.memberLevel = changeEnumValue(MEMBERLEVEL, topInfo.memberLevel);
let basicInfo = extractData(oldInfo, UnitBasicConfig);
let unitInfo = extractData(oldInfo, UnitConfig);
......@@ -88,8 +96,8 @@ export async function unitMemberUpdate({form, keyanForm, userId}) {
let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
/**校验枚举 */
changeEnumValue(UNITINFOTYPE, form.unitInfoType);
changeEnumValue(UNITINFOTYPE, form.unitInfoType);
const EccFuncName = '单位会员修改';
eccEnumValue(EccFuncName, '单位信息类型', UNITINFOTYPE, form.unitInfoType);
if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
......@@ -162,13 +170,13 @@ export async function memberRegisterSendCode({loginId, phone, codeType}) {
* 个人会员列表
* @param param0
*/
export async function individualMemberList({name, documentId, phone, memberLevel, workDuties, session, joinTime, auditTime, memberState, pageNumber}) {
export async function individualMemberList({name, documentId, phone, individualMemberType, memberLevel, session, joinTime, auditTime, memberState, pageNumber}) {
let selectParam:any = {};
if (name) selectParam.name = name;
if (documentId) selectParam.documentId = documentId;
if (phone) selectParam.phone = phone;
if (individualMemberType) selectParam.individualMemberType = individualMemberType;
if (memberLevel) selectParam.memberLevel = memberLevel;
if (workDuties) selectParam.workDuties = workDuties;
if (session) selectParam.session = session;
if (joinTime) selectParam.joinTime = joinTime;
if (auditTime) selectParam.auditTime = auditTime;
......@@ -183,9 +191,9 @@ export async function individualMemberList({name, documentId, phone, memberLevel
let dataList = [];
dbList.forEach(info => {
let item:any = extractData(info, selectConf);
changeEnumValue(MEMBERSTATE, item.memberState);
item.memberState = changeEnumValue(MEMBERSTATE, item.memberState);
if (!item.memberLevel) item.memberLevel = "未选择";
else changeEnumValue(MEMBERLEVEL, item.memberLevel);
else item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel);
dataList.push(item);
});
......@@ -200,21 +208,21 @@ export async function individualMemberList({name, documentId, phone, memberLevel
*/
const IndividualBasicConfig = ["name", "sex", "nation", "birth", "documentType", "documentId", "sheng", "shi", "qu", "addres", "photoUrl"];
const SpecialityConfig = ["unitName", "workDuties", "workTitle", "profCategory", "studyResume", "workResume", "profAchievement", "otherEMP", "otherPROF"];
const SpecialityConfig = ["unitName", "memberLevel", "workTitle", "profCategory", "studyResume", "workResume", "profAchievement", "otherEMP", "otherPROF"];
export async function individualMemberDetails({userId}) {
let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
let topInfo:any = extractData(oldInfo, ["session", "memberLevel"]);
changeEnumValue(MEMBERLEVEL, topInfo.memberLevel);
topInfo.memberLevel = changeEnumValue(MEMBERLEVEL, topInfo.memberLevel);
let basicInfo:any = extractData(oldInfo, IndividualBasicConfig);
changeEnumValue(DOCUMENTTYPE, basicInfo.documentType);
changeEnumValue(NATION, basicInfo.nation);
basicInfo.documentType = changeEnumValue(DOCUMENTTYPE, basicInfo.documentType);
basicInfo.nation = changeEnumValue(NATION, basicInfo.nation);
let specialityInfo:any = extractData(oldInfo, SpecialityConfig);
changeEnumValue(PROFCATEGORY, basicInfo.profCategory);
basicInfo.profCategory = changeEnumValue(PROFCATEGORY, basicInfo.profCategory);
let otherAttachment:any = extractData(oldInfo, ["cardUrl", "academicCERTUrl", "professionalCERTUrl", "auxiliaryMaterial"]);
......@@ -295,6 +303,7 @@ export async function memberRegister2({form, userId}) {
eccEnumValue(EccFuncName, '证件类型', DOCUMENTTYPE, form.documentType);
eccEnumValue(EccFuncName, '民族', NATION, form.nation);
eccEnumValue(EccFuncName, '专业类别', PROFCATEGORY, form.profCategory);
eccEnumValue(EccFuncName, '会员等级职务', MEMBERLEVEL, form.memberLevel);
form.registerFlow = REGISTERFLOW.个人会员注册2; //todo 审核成功后修改
await updateOneData(TABLEENUM.用户表, {userId}, form);
......
src/biz/member/memberFees.ts 0 → 100644
/**
* 会费管理逻辑
*/
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
......@@ -335,7 +335,7 @@ export enum INDIVIDUALMEMBERTYPE {
/**
* 会员等级
* 会员等级 会员职务
*/
export enum MEMBERLEVEL {
普通会员 = 1,
......
src/data/models/model.ts
......@@ -86,6 +86,7 @@ enum TABLEENUM {
单位所获得科研成果表 = "scientificResearch",
验证码表 = "code",
审批历史表 = "approvalHistory",
权限表 = "authority",
}
const ModelArray = [
......@@ -353,7 +354,6 @@ const ModelArray = [
addres:'String',//通信地址
photoUrl:'String',//证件照图片地址 蓝底证件照
workUnit:'String',//工作单位
workDuties:'String',//职务
workTitle:'String',//职称
userRegisterState:{type:'Number', default:USERREGISTERSTATE.待审核, index:true},//用户注册状态 枚举
registerFlow:'Number',//会员注册流程 枚举
......@@ -362,7 +362,7 @@ const ModelArray = [
askForTime:'Number',//申请时间
joinTime:'Number',//入会时间
session:'String',//届次
memberLevel:'Number',//会员等级 枚举
memberLevel:'Number',//会员等级、职务 枚举
lifespanStartTime:'Number',//会员有效期开始时间 时间戳
lifespanEndTime:'Number',//会员有效期结束时间 时间戳
isGracePeriod:{type:'Number', default:0},//是否宽限期 0：否， 1：是
......@@ -470,7 +470,7 @@ const ModelArray = [
operationBehavior:{ type:'Number', index:true },//操作行为 枚举
remarks:{ type:'String', index:true },//备注
}
}
},
];
......
src/routers/public/router.ts
......@@ -126,6 +126,24 @@ export const Config = {
param:[],
bindBiz:setEnumInterface(enumConfig.CODETYPE)
},
{
apiName:"单位会员类别",
subUrl:'/unitMemberType',
param:[],
bindBiz:setEnumInterface(enumConfig.UNITMEMBERTYPE)
},
{
apiName:"个人会员类别",
subUrl:'/individualMemberType',
param:[],
bindBiz:setEnumInterface(enumConfig.INDIVIDUALMEMBERTYPE)
},
{
apiName:"会员职务",
subUrl:'/memberLevel',
param:[],
bindBiz:setEnumInterface(enumConfig.MEMBERLEVEL)
},
],
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment