Skip to content

W
wenHuaBu_adminServer
Commit 2fd40af6 by chenjinjing
Options

no message

parent 05bd5007
Showing with 553 additions and 127 deletions
src/biz/member/examine.ts
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
*/ */
import moment = require("moment"); import moment = require("moment");
import { CERTIFICATETYPE, DOCUMENTTYPE, EDUCATION, INDIVIDUALMEMBERTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, NATION, OPERATIONREHAVIOR, PAYMENTSTATUS, PROFCATEGORY, REGISTERFLOW, SEX, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../../config/enum"; import { CERTIFICATETYPE, DOCUMENTTYPE, EDUCATION, INDIVIDUALMEMBERTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, NATION, OPERATIONREHAVIOR, PAYMENTSTATUS, PROFCATEGORY, REGISTERFLOW, SEX, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../../config/enum";
import { ERRORENUM } from "../../config/errorEnum"; import { ERRORENUM } from "../../config/errorEnum";
import { addManyData } from "../../data/add"; import { addManyData } from "../../data/add";
import { TABLEENUM } from "../../data/models/model"; import { TABLEENUM } from "../../data/models/model";
...@@ -18,35 +18,52 @@ import { getCityNameByCode } from "../../config/cityConfig"; ...@@ -18,35 +18,52 @@ import { getCityNameByCode } from "../../config/cityConfig";
/** /**
* 待审核列表 success * 待审核列表 success
* @param unitName 单位名称 * @param name 名称关键字：个人会员匹配真实姓名，单位会员匹配单位名称
* @param joinTime 入会时间 * @param memberType 会员类别 unitMemberType、individualMemberType
* @param memberType 会员类型 MEMBERTYPE * 会员类别、职务、级别改成多选
* 会员类别：个人【个人会员、专业会员】单位【院校、机构、其他】返回前端枚举：MEMBERTYPEECCENUM
* @param documentId 身份证
* @param phone 登录手机号
* @param mail 单位/个人邮箱
* @param sheng 省 * @param sheng 省
* @param shi 市 * @param shi 市
* @param qu 区
* @param pageNumber 当前页 * @param pageNumber 当前页
*/ */
export async function pendingReviewList({unitName, joinTime, memberType, sheng, shi, qu, pageNumber}) { export async function pendingReviewList({name, memberType, documentId, phone, mail, sheng, shi, pageNumber}) {
/**查询条件 */ /**查询条件 */
let selectParam:any = { let selectParam:any = {
"$or":[ "$and":[{
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第二步 }, "$or":[
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 }, { memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第二步 },
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第二步 }, { memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 },
{ memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第三步 }, { memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第二步 },
{ memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 }, { memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第三步 },
{ memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第三步 }, { memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 },
], { memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第三步 },
]
}],
isAdmin:STATE.否 isAdmin:STATE.否
}; //审批列表展示状态除通过外的数据 }; //审批列表展示状态除通过外的数据
if (unitName) selectParam.unitName = unitName; if (name) selectParam["$and"].push({
if (joinTime) selectParam.joinTime = joinTime; "$or":[
if (memberType) selectParam.memberType = memberType; {unitName:name},
{name},
]
});
if (memberType) {
if (memberType < UNITMEMBERTYPE.院校) {
selectParam.individualMemberType = {"$in":memberType};
} else {
selectParam.unitMemberType = {"$in":memberType};
}
}
if (documentId) selectParam.documentId = documentId;
if (phone) selectParam.phone = phone;
if (mail) selectParam.mail = mail;
if (sheng) selectParam.sheng = sheng; if (sheng) selectParam.sheng = sheng;
if (shi) selectParam.shi = shi; if (shi) selectParam.shi = shi;
if (qu) selectParam.qu = qu;
const SelectFiles = ["userId", "userRegisterState", "unitName", "loginId", "phone", "askForTime", "memberLevel", "sheng", "shi", "qu", "memberType", "mail"]; const SelectFiles = ["userId", "userRegisterState", "unitName", "name", "loginId", "phone", "askForTime", "memberLevel", "sheng", "shi", "qu", "individualMemberType", "unitMemberType", "mail"];
let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber); let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber);
let dataCount = await findCount(TABLEENUM.用户表, selectParam); let dataCount = await findCount(TABLEENUM.用户表, selectParam);
...@@ -60,7 +77,8 @@ export async function pendingReviewList({unitName, joinTime, memberType, sheng, ...@@ -60,7 +77,8 @@ export async function pendingReviewList({unitName, joinTime, memberType, sheng,
item.sheng = getCityNameByCode(item.sheng); item.sheng = getCityNameByCode(item.sheng);
item.shi = getCityNameByCode(item.shi); item.shi = getCityNameByCode(item.shi);
item.qu = getCityNameByCode(item.qu); item.qu = getCityNameByCode(item.qu);
item.memberType = changeEnumValue(MEMBERTYPE, info.memberType); if(item.individualMemberType) item.memberType = changeEnumValue(MEMBERTYPEECCENUM, info.individualMemberType);
if(item.unitMemberType) item.memberType = changeEnumValue(MEMBERTYPEECCENUM, info.unitMemberType);
dataList.push(item); dataList.push(item);
}); });
...@@ -271,8 +289,12 @@ export async function approvalHistoryList({userId}) { ...@@ -271,8 +289,12 @@ export async function approvalHistoryList({userId}) {
} }
/**
export async function outPutPendingReviewList({memberType}) { * 导出
* @param param0
* @returns
*/
export async function outPutPendingReviewList({memberType, exportColumns}) {
let selectParam:any = { let selectParam:any = {
"$or":[], "$or":[],
isAdmin:STATE.否 isAdmin:STATE.否
...@@ -280,23 +302,36 @@ export async function outPutPendingReviewList({memberType}) { ...@@ -280,23 +302,36 @@ export async function outPutPendingReviewList({memberType}) {
let selectTitle = []; let selectTitle = [];
let selectConf = []; let selectConf = [];
if (memberType == MEMBERTYPE.个人会员) { if (memberType == MEMBERTYPE.个人会员) {
selectTitle = ["入会时间", "是否是导入用户", "会员状态", "证书类型", "个人会员类型", "会员等级/职务", "是否处于宽限期", "用户名", "联系电话", "邮箱", "真实姓名", "性别", "证件号码", "证件类型", "出生年月", "民族", "省", "市", "区", "通信地址", "学历", "职务", "职称", "学习简历", "工作简历", "专业成果/教研成果", "其他任职情况", "其他专业情况", "专业类别", "所在单位"]; // selectTitle = ["入会时间", "是否是导入用户", "会员状态", "证书类型", "个人会员类型", "会员等级/职务", "是否处于宽限期", "用户名", "联系电话", "邮箱",
selectConf = ["joinTime", "isInput", "memberState", "certificateType", "individualMemberType", "memberLevel", "isGracePeriod", "loginId", "phone", "mail", "name", "sex", "documentId", "documentType", "birth", "nation", "sheng", "shi", "qu", "addres", "education", "duties", "workTitle", "studyResume", "workResume", "profAchievement", "otherEMP", "otherPROF", "profCategory", "unitName"]; // "真实姓名", "性别", "证件号码", "证件类型", "出生年月", "民族", "省", "市", "区", "通信地址", "学历", "职务", "职称", "学习简历", "工作简历",
// "专业成果/教研成果", "其他任职情况", "其他专业情况", "专业类别", "所在单位"];
// selectConf = ["joinTime", "isInput", "memberState", "certificateType", "individualMemberType", "memberLevel", "isGracePeriod", "loginId", "phone", "mail",
// "name", "sex", "documentId", "documentType", "birth", "nation", "sheng", "shi", "qu", "addres", "education", "duties", "workTitle", "studyResume", "workResume",
// "profAchievement", "otherEMP", "otherPROF", "profCategory", "unitName"];
selectParam["$or"] = [ selectParam["$or"] = [
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第二步 }, { memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第二步 },
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 }, { memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 },
{ memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第二步 } { memberType:MEMBERTYPE.个人会员, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第二步 }
]; ];
} else { } else {
selectTitle = ["入会时间", "是否是导入用户", "会员状态", "证书类型", "个人会员类型", "会员等级/职务", "是否处于宽限期", "用户名", "联系电话", "单位电子邮箱", "单位名称", "统一信用代码", "法人代表", "法人代表联系电话", "法人邮箱", "日常联系人", "日常联系人职务", "日常联系人手机号码", "营业执照", "单位会员类型", "院校办学类型", "院校主管部门", "院校主要负责人", "院校主要负责人职务", "院校主要负责人电话", "院校办公负责人", "院校办公负责人电话", "主要负责人邮箱", "院校科研负责人", "院校科研负责人电话", "教学负责人姓名", "院校学生总人数", "教职工总人数", "教学负责人电话", "开设专业", "单位简介"]; // selectTitle = ["入会时间", "是否是导入用户", "会员状态", "证书类型", "个人会员类型", "会员等级/职务", "是否处于宽限期", "用户名", "联系电话", "单位电子邮箱", "单位名称", "统一信用代码", "法人代表", "法人代表联系电话", "法人邮箱", "日常联系人", "日常联系人职务", "日常联系人手机号码", "营业执照", "单位会员类型", "院校办学类型", "院校主管部门", "院校主要负责人", "院校主要负责人职务", "院校主要负责人电话", "院校办公负责人", "院校办公负责人电话", "主要负责人邮箱", "院校科研负责人", "院校科研负责人电话", "教学负责人姓名", "院校学生总人数", "教职工总人数", "教学负责人电话", "开设专业", "单位简介"];
selectConf = ["joinTime", "isInput", "memberState", "certificateType", "individualMemberType", "memberLevel", "isGracePeriod", "loginId", "phone", "mail", "unitName", "uscc", "legalPerson", "legalPersonPhone", "legalPersonMail", "contactPerson", "contactPersonDuties", "contactPersonPhone", "uusinessLicenseUrl", "unitMemberType", "yuanXiaoBanXueLeiXing", "yuanXiaoZhuGuanBuMen", "yuanXiaoFuZeRen", "yuanXiaoFuZeRenZhiWu", "yuanXiaoFuZeRenDianHua", "yuanXiaoBanGongFuZeRen", "yuanXiaoBanGongFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang", "yuanXiaoKeYanFuZeRen", "yuanXiaoKeYanFuZeRenDianHua", "jiaoXueFuZeRenXinMing", "yuanXiaoXueShengZongRenShu", "yuanXiaoJiaoZhiGongZongRenShu", "jiaoXueFuZeRenDianHua", "kaishezhuanYe", "danWeiJianJie"]; // selectConf = ["joinTime", "isInput", "memberState", "certificateType", "individualMemberType", "memberLevel", "isGracePeriod", "loginId", "phone", "mail", "unitName", "uscc", "legalPerson", "legalPersonPhone", "legalPersonMail", "contactPerson", "contactPersonDuties", "contactPersonPhone", "uusinessLicenseUrl", "unitMemberType", "yuanXiaoBanXueLeiXing", "yuanXiaoZhuGuanBuMen", "yuanXiaoFuZeRen", "yuanXiaoFuZeRenZhiWu", "yuanXiaoFuZeRenDianHua", "yuanXiaoBanGongFuZeRen", "yuanXiaoBanGongFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang", "yuanXiaoKeYanFuZeRen", "yuanXiaoKeYanFuZeRenDianHua", "jiaoXueFuZeRenXinMing", "yuanXiaoXueShengZongRenShu", "yuanXiaoJiaoZhiGongZongRenShu", "jiaoXueFuZeRenDianHua", "kaishezhuanYe", "danWeiJianJie"];
selectParam["$or"] = [ selectParam["$or"] = [
{ memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第三步 }, { memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第三步 },
{ memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 }, { memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 },
{ memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第三步 } { memberType:MEMBERTYPE.单位会员, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第三步 },
]; ];
} }
exportColumns.forEach( info=> {
if (info.key == "省市区") {
selectTitle.push("省", "市", "区");
selectConf.push("sheng", "shi", "qu");
} else {
selectTitle.push(info.key);
selectConf.push(info.value);
}
})
let dbList = await find(TABLEENUM.用户表, selectParam, selectConf); let dbList = await find(TABLEENUM.用户表, selectParam, selectConf);
let timeChnageList = ["joinTime", "birth"]; let timeChnageList = ["joinTime", "birth"];
......
src/biz/member/homePage.ts
...@@ -29,7 +29,7 @@ export async function getMemberData({userId}) { ...@@ -29,7 +29,7 @@ export async function getMemberData({userId}) {
let oldInfo = await findOnce(TABLEENUM.用户表, {userId}); let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在); if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
let topSelectFiles = ["loginId", "memberType", "userRegisterState", "integral", "joinTime", "lifespanStartTime", "lifespanEndTime", "memberLevel"]; let topSelectFiles = ["loginId", "memberType", "userRegisterState", "integral", "joinTime", "lifespanStartTime", "lifespanEndTime", "memberLevel", "isFirstPay", "paymentStatus"];
let baseSelectFiles = []; let baseSelectFiles = [];
let majorSelectFiles = []; let majorSelectFiles = [];
let otherAttachment:any= {}; let otherAttachment:any= {};
...@@ -65,11 +65,14 @@ export async function getMemberData({userId}) { ...@@ -65,11 +65,14 @@ export async function getMemberData({userId}) {
let baseInfo:any = extractData(oldInfo, baseSelectFiles); let baseInfo:any = extractData(oldInfo, baseSelectFiles);
let majorInfo:any = extractData(oldInfo, majorSelectFiles); let majorInfo:any = extractData(oldInfo, majorSelectFiles);
/**处理枚举值 */ /**处理枚举值 */
topInfo.integral = 0; topInfo.integral = 0;
if(topInfo.joinTime) topInfo.joinTime = moment(topInfo.joinTime).format("YYYY-MM-DD"); if(topInfo.joinTime) topInfo.joinTime = moment(topInfo.joinTime).format("YYYY-MM-DD");
if(topInfo.lifespanEndTime) topInfo.lifespanEndTime = moment(topInfo.lifespanEndTime).format("YYYY-MM-DD"); if(topInfo.lifespanEndTime) {
if(topInfo.isFirstPay) topInfo.lifespanEndTime = "欠费中";
else topInfo.lifespanEndTime = moment(topInfo.lifespanEndTime).format("YYYY-MM-DD");
}
if(topInfo.userRegisterState == USERREGISTERSTATE.通过) topInfo.userRegisterState = "已入会"; if(topInfo.userRegisterState == USERREGISTERSTATE.通过) topInfo.userRegisterState = "已入会";
else topInfo.userRegisterState = "未入会"; else topInfo.userRegisterState = "未入会";
// if(topInfo.memberLevel) topInfo.memberLevel = changeEnumValue(MEMBERLEVEL, topInfo.memberLevel); // if(topInfo.memberLevel) topInfo.memberLevel = changeEnumValue(MEMBERLEVEL, topInfo.memberLevel);
......
src/biz/member/member.ts
...@@ -21,27 +21,35 @@ import { eccFormParam } from "../../util/verificationParam"; ...@@ -21,27 +21,35 @@ import { eccFormParam } from "../../util/verificationParam";
/** /**
* 单位会员列表 success * 单位会员列表 success
* @param unitName 单位名称 * @param unitName 单位名称
* @param joinTime 入会时间 * @param mail 单位邮箱
* @param phone 登录手机号
* @param joinStartTime 入会开始时间
* @param joinEndTime 入会结束时间
* @param unitMemberType 单位会员所属类型 UNITMEMBERTYPE * @param unitMemberType 单位会员所属类型 UNITMEMBERTYPE
* @param memberLevel 会员等级 职务 MEMBERLEVEL * @param memberLevel 会员等级 职务 MEMBERLEVEL
* @param session 届次 * @param session 届次
* @param memberState 状态
* @param sheng 省 * @param sheng 省
* @param shi 市 * @param shi 市
* @param qu 区
* @param pageNumber 当前页 * @param pageNumber 当前页
*/ */
export async function unitMemberList({unitName, joinTime, unitMemberType, memberLevel, session, sheng, shi, qu, pageNumber}) { export async function unitMemberList({unitName, mail, phone, joinStartTime, joinEndTime, unitMemberType, memberLevel, session, memberState, sheng, shi, pageNumber}) {
let selectParam:any = {isAdmin:STATE.否}; let selectParam:any = {isAdmin:STATE.否};
if (unitName) selectParam.unitName = unitName; if (unitName) selectParam.unitName = unitName;
if (joinTime) selectParam.joinTime = joinTime; if (mail) selectParam.mail = mail;
if (phone) selectParam.phone = phone;
if (joinStartTime) {
selectParam["$and"].push( { "joinTime":{"$gt":joinStartTime} } )
}
if (joinEndTime) {
selectParam["$and"].push( { "joinTime":{"$lt":joinEndTime} } )
}
if (unitMemberType) selectParam.unitMemberType = {"$in":unitMemberType}; if (unitMemberType) selectParam.unitMemberType = {"$in":unitMemberType};
if (memberLevel) selectParam.memberLevel = {"$in":memberLevel}; if (memberLevel) selectParam.memberLevel = {"$in":memberLevel};
if (session) { if (session) selectParam.session = session;
selectParam.session = session; if (memberState) selectParam.memberState = memberState;
}
if (sheng) selectParam.sheng = sheng; if (sheng) selectParam.sheng = sheng;
if (shi) selectParam.shi = shi; if (shi) selectParam.shi = shi;
if (qu) selectParam.qu = qu;
selectParam.memberType = MEMBERTYPE.单位会员; selectParam.memberType = MEMBERTYPE.单位会员;
selectParam.userRegisterState = USERREGISTERSTATE.通过; selectParam.userRegisterState = USERREGISTERSTATE.通过;
selectParam.isFirstPay = true; selectParam.isFirstPay = true;
...@@ -195,21 +203,39 @@ export async function delResearch({id}) { ...@@ -195,21 +203,39 @@ export async function delResearch({id}) {
/** /**
* 个人会员列表 * 个人会员列表
* @param param0 * @param name 真实姓名
* @param documentId 身份证
* @param phone 登录手机号
* @param mail 个人邮箱
* @param joinStartTime 入会开始时间
* @param joinEndTime 入会结束时间
* @param memberLevel 会员级别/职务 多选
* 会员级别/职务：【普通会员、理事会员、常务理事会员】
* @param session 届次
* @param profCategory 专业 PROFCATEGORY
* @param memberState 状态
* @param sheng 省
* @param shi 市
*/ */
export async function individualMemberList({name, documentId, phone, individualMemberType, memberLevel, session, joinTime, auditTime, memberState, pageNumber}) { export async function individualMemberList({name, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, session, profCategory, memberState, sheng, shi, pageNumber}) {
let selectParam:any = {}; let selectParam:any = {};
if (name) selectParam.name = name; if (name) selectParam.name = name;
if (documentId) selectParam.documentId = documentId; if (documentId) selectParam.documentId = documentId;
if (phone) selectParam.phone = phone; if (phone) selectParam.phone = phone;
if (individualMemberType) selectParam.individualMemberType = {"$in":individualMemberType}; if (mail) selectParam.mail = mail;
if (memberLevel) selectParam.memberLevel = {"$in":memberLevel}; if (joinStartTime) {
if (session) { selectParam["$and"].push( { "joinTime":{"$gt":joinStartTime} } )
selectParam.session = session; }
if (joinEndTime) {
selectParam["$and"].push( { "joinTime":{"$lt":joinEndTime} } )
} }
if (joinTime) selectParam.joinTime = joinTime; if (memberLevel) selectParam.memberLevel = {"$in":memberLevel};
if (auditTime) selectParam.auditTime = auditTime; if (session) selectParam.session = session;
if (profCategory) selectParam.profCategory = {"$in":profCategory};
if (memberState) selectParam.memberState = memberState; if (memberState) selectParam.memberState = memberState;
if (sheng) selectParam.sheng = sheng;
if (shi) selectParam.shi = shi;
selectParam.memberType = MEMBERTYPE.个人会员; selectParam.memberType = MEMBERTYPE.个人会员;
selectParam.userRegisterState = USERREGISTERSTATE.通过; selectParam.userRegisterState = USERREGISTERSTATE.通过;
selectParam.isFirstPay = true; selectParam.isFirstPay = true;
...@@ -330,17 +356,30 @@ export async function systemBase({userId}) { ...@@ -330,17 +356,30 @@ export async function systemBase({userId}) {
* 导出个人会员数据 * 导出个人会员数据
* @param param0 * @param param0
*/ */
export async function outPutIndividualMembers({}) { export async function outPutIndividualMembers({exportColumns}) {
let selectParam = { let selectParam = {
isAdmin:STATE.否, isAdmin:STATE.否,
memberType: MEMBERTYPE.个人会员, memberType: MEMBERTYPE.个人会员,
userRegisterState: USERREGISTERSTATE.通过, userRegisterState: USERREGISTERSTATE.通过,
isFirstPay:true isFirstPay:true
}; };
let selectTitle = ["入会时间", "是否是导入用户", "会员状态", "证书类型", "个人会员类型", "会员等级/职务", "是否处于宽限期", "用户名", "联系电话", "邮箱", "真实姓名", "性别", "证件号码", // let selectTitle = ["入会时间", "是否是导入用户", "会员状态", "证书类型", "个人会员类型", "会员等级/职务", "是否处于宽限期", "用户名", "联系电话", "邮箱", "真实姓名", "性别", "证件号码",
"证件类型", "出生年月", "民族", "省", "市", "区", "通信地址", "学历", "职务", "职称", "学习简历", "工作简历", "专业成果/教研成果", "其他任职情况", "其他专业情况", "专业类别", "工作单位"]; // "证件类型", "出生年月", "民族", "省", "市", "区", "通信地址", "学历", "职务", "职称", "学习简历", "工作简历", "专业成果/教研成果", "其他任职情况", "其他专业情况", "专业类别", "工作单位"];
let selectConf = ["joinTime", "isInput", "memberState", "certificateType", "individualMemberType", "memberLevel", "isGracePeriod", "loginId", "phone", "mail", "name", "sex", "documentId", // let selectConf = ["joinTime", "isInput", "memberState", "certificateType", "individualMemberType", "memberLevel", "isGracePeriod", "loginId", "phone", "mail", "name", "sex", "documentId",
"documentType", "birth", "nation", "sheng", "shi", "qu", "addres", "education", "duties", "workTitle", "studyResume", "workResume", "profAchievement", "otherEMP", "otherPROF", "profCategory", "unitName"]; // "documentType", "birth", "nation", "sheng", "shi", "qu", "addres", "education", "duties", "workTitle", "studyResume", "workResume", "profAchievement", "otherEMP", "otherPROF", "profCategory", "unitName"];
let selectTitle = [];
let selectConf = [];
exportColumns.forEach( info=> {
if (info.key == "省市区") {
selectTitle.push("省", "市", "区");
selectConf.push("sheng", "shi", "qu");
} else {
selectTitle.push(info.key);
selectConf.push(info.value);
}
})
let dbList = await find(TABLEENUM.用户表, selectParam, selectConf); let dbList = await find(TABLEENUM.用户表, selectParam, selectConf);
let timeChnageList = ["joinTime", "birth"]; let timeChnageList = ["joinTime", "birth"];
let addList = ["sheng", "shi", "qu"]; let addList = ["sheng", "shi", "qu"];
...@@ -378,17 +417,29 @@ export async function outPutIndividualMembers({}) { ...@@ -378,17 +417,29 @@ export async function outPutIndividualMembers({}) {
* @param param0 * @param param0
* @returns * @returns
*/ */
export async function outPutUnitMembers({}) { export async function outPutUnitMembers({exportColumns}) {
let selectParam = { let selectParam = {
isAdmin:STATE.否, isAdmin:STATE.否,
memberType: MEMBERTYPE.单位会员, memberType: MEMBERTYPE.单位会员,
userRegisterState: USERREGISTERSTATE.通过, userRegisterState: USERREGISTERSTATE.通过,
isFirstPay:true isFirstPay:true
}; };
let selectTitle = ["入会时间", "是否是导入用户", "会员状态", "证书类型", "个人会员类型", "会员等级/职务", "是否处于宽限期", "用户名", "联系电话", "单位电子邮箱", "单位名称", "统一信用代码", // let selectTitle = ["入会时间", "是否是导入用户", "会员状态", "证书类型", "个人会员类型", "会员等级/职务", "是否处于宽限期", "用户名", "联系电话", "单位电子邮箱", "单位名称", "统一信用代码",
"法人代表", "法人代表联系电话", "法人邮箱", "日常联系人", "日常联系人职务", "日常联系人手机号码", "营业执照", "单位会员类型", "院校办学类型", "院校主管部门", "院校主要负责人", "院校主要负责人职务", "院校主要负责人电话", "院校办公负责人", "院校办公负责人电话", "主要负责人邮箱", "院校科研负责人", "院校科研负责人电话", "教学负责人姓名", "院校学生总人数", "教职工总人数", "教学负责人电话", "开设专业", "单位简介"]; // "法人代表", "法人代表联系电话", "法人邮箱", "日常联系人", "日常联系人职务", "日常联系人手机号码", "营业执照", "单位会员类型", "院校办学类型", "院校主管部门", "院校主要负责人", "院校主要负责人职务", "院校主要负责人电话", "院校办公负责人", "院校办公负责人电话", "主要负责人邮箱", "院校科研负责人", "院校科研负责人电话", "教学负责人姓名", "院校学生总人数", "教职工总人数", "教学负责人电话", "开设专业", "单位简介"];
let selectConf = ["joinTime", "isInput", "memberState", "certificateType", "individualMemberType", "memberLevel", "isGracePeriod", "loginId", "phone", "mail", "unitName", "uscc", // let selectConf = ["joinTime", "isInput", "memberState", "certificateType", "individualMemberType", "memberLevel", "isGracePeriod", "loginId", "phone", "mail", "unitName", "uscc",
"legalPerson", "legalPersonPhone", "legalPersonMail", "contactPerson", "contactPersonDuties", "contactPersonPhone", "uusinessLicenseUrl", "unitMemberType", "yuanXiaoBanXueLeiXing", "yuanXiaoZhuGuanBuMen", "yuanXiaoFuZeRen", "yuanXiaoFuZeRenZhiWu", "yuanXiaoFuZeRenDianHua", "yuanXiaoBanGongFuZeRen", "yuanXiaoBanGongFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang", "yuanXiaoKeYanFuZeRen", "yuanXiaoKeYanFuZeRenDianHua", "jiaoXueFuZeRenXinMing", "yuanXiaoXueShengZongRenShu", "yuanXiaoJiaoZhiGongZongRenShu", "jiaoXueFuZeRenDianHua", "kaishezhuanYe", "danWeiJianJie"]; // "legalPerson", "legalPersonPhone", "legalPersonMail", "contactPerson", "contactPersonDuties", "contactPersonPhone", "uusinessLicenseUrl", "unitMemberType", "yuanXiaoBanXueLeiXing", "yuanXiaoZhuGuanBuMen", "yuanXiaoFuZeRen", "yuanXiaoFuZeRenZhiWu", "yuanXiaoFuZeRenDianHua", "yuanXiaoBanGongFuZeRen", "yuanXiaoBanGongFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang", "yuanXiaoKeYanFuZeRen", "yuanXiaoKeYanFuZeRenDianHua", "jiaoXueFuZeRenXinMing", "yuanXiaoXueShengZongRenShu", "yuanXiaoJiaoZhiGongZongRenShu", "jiaoXueFuZeRenDianHua", "kaishezhuanYe", "danWeiJianJie"];
let selectTitle = [];
let selectConf = [];
exportColumns.forEach( info=> {
if (info.key == "省市区") {
selectTitle.push("省", "市", "区");
selectConf.push("sheng", "shi", "qu");
} else {
selectTitle.push(info.key);
selectConf.push(info.value);
}
})
let dbList = await find(TABLEENUM.用户表, selectParam, selectConf); let dbList = await find(TABLEENUM.用户表, selectParam, selectConf);
let timeChnageList = ["joinTime"]; let timeChnageList = ["joinTime"];
......
src/biz/member/memberFees.ts
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
*/ */
import moment = require("moment"); import moment = require("moment");
import { MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, ORDERSTATE, PAYMENTSTATUS, PAYMENTTYPE, RECEIPTCONFIRMATION, STATE, USERREGISTERSTATE } from "../../config/enum"; import { MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, ORDERSTATE, PAYMENTSTATUS, PAYMENTTYPE, RECEIPTCONFIRMATION, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../../config/enum";
import { TABLEENUM } from "../../data/models/model"; import { TABLEENUM } from "../../data/models/model";
import { find, findCount, findOnce, findOnceToSort, findToPage, findToSort } from "../../data/select"; import { find, findCount, findOnce, findOnceToSort, findToPage, findToSort } from "../../data/select";
import { extractData } from "../../util/piecemeal"; import { extractData } from "../../util/piecemeal";
...@@ -17,8 +17,19 @@ import { successResult } from "../../tools/system"; ...@@ -17,8 +17,19 @@ import { successResult } from "../../tools/system";
/** /**
* 已缴费列表 success * 已缴费列表 success
* @param name 名称关键字：个人会员匹配真实姓名，单位会员匹配单位名称
* @param memberType 会员类别 unitMemberType、individualMemberType 多选
* 会员类别：个人【个人会员、专业会员】单位【院校、机构、其他】返回前端枚举：MEMBERTYPEECCENUM
* @param documentId 身份证
* @param phone 登录手机号
* @param mail 单位/个人邮箱
* @param joinStartTime 入会开始时间
* @param joinEndTime 入会结束时间
* @param memberLevel 会员级别/职务 多选
* 会员级别/职务：【普通会员、理事会员、常务理事会员】
* @param pageNumber 当前页
*/ */
export async function getPaid({unitName, joinStartTime, joinEndTime, memberType, pageNumber}) { export async function getPaid({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, pageNumber}) {
const NowMs = new Date().valueOf(); const NowMs = new Date().valueOf();
/**到期时间距离今天大于90天 */ /**到期时间距离今天大于90天 */
let selectParam:any = { let selectParam:any = {
...@@ -30,21 +41,36 @@ export async function getPaid({unitName, joinStartTime, joinEndTime, memberType, ...@@ -30,21 +41,36 @@ export async function getPaid({unitName, joinStartTime, joinEndTime, memberType,
isGracePeriod:STATE.否 isGracePeriod:STATE.否
} }
if (unitName) selectParam.unitName = unitName; if (name) selectParam["$and"].push({
"$or":[
{unitName:name},
{name},
]
});
if (memberType) {
if (memberType < UNITMEMBERTYPE.院校) {
selectParam.individualMemberType = {"$in":memberType};
} else {
selectParam.unitMemberType = {"$in":memberType};
}
}
if (documentId) selectParam.documentId = documentId;
if (phone) selectParam.phone = phone;
if (mail) selectParam.mail = mail;
if (joinStartTime) { if (joinStartTime) {
selectParam["$and"].push( { "joinTime":{"$gt":joinStartTime} } ) selectParam["$and"].push( { "joinTime":{"$gt":joinStartTime} } )
} }
if (joinEndTime) { if (joinEndTime) {
selectParam["$and"].push( { "joinTime":{"$lt":joinEndTime} } ) selectParam["$and"].push( { "joinTime":{"$lt":joinEndTime} } )
} }
if (memberType) selectParam.memberType = memberType; if (memberLevel) selectParam.memberLevel = {"$in":memberLevel};
const SelectFiles = ["userId", "memberState", "unitName", "loginId", "phone", "joinTime", "memberType", "lifespanStartTime", "lifespanEndTime", "memberLevel"]; const SelectFiles = ["userId", "memberState", "unitName", "name", "loginId", "phone", "joinTime", "memberType", "lifespanStartTime", "lifespanEndTime", "memberLevel"];
let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber); let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber);
let dataCount = await findCount(TABLEENUM.用户表, selectParam); let dataCount = await findCount(TABLEENUM.用户表, selectParam);
let dataList = []; let dataList = [];
const itemFiles = ["userId", "memberState", "unitName", "loginId", "phone", "joinTime", "memberType"]; const itemFiles = ["userId", "memberState", "unitName", "name", "loginId", "phone", "joinTime", "memberType"];
dbList.forEach(info => { dbList.forEach(info => {
let item:any = extractData(info, itemFiles); let item:any = extractData(info, itemFiles);
item.lifespanTime = `${moment(info.lifespanStartTime).format("YYYY-MM-DD")} 至 ${moment(info.lifespanEndTime).format("YYYY-MM-DD")}`; item.lifespanTime = `${moment(info.lifespanStartTime).format("YYYY-MM-DD")} 至 ${moment(info.lifespanEndTime).format("YYYY-MM-DD")}`;
...@@ -86,9 +112,19 @@ export async function paidOrderList({id}) { ...@@ -86,9 +112,19 @@ export async function paidOrderList({id}) {
/** /**
* 待缴费列表 success * 待缴费列表 success
* @param param0 * @param name 名称关键字：个人会员匹配真实姓名，单位会员匹配单位名称
* @param memberType 会员类别 unitMemberType、individualMemberType 多选
* 会员类别：个人【个人会员、专业会员】单位【院校、机构、其他】返回前端枚举：MEMBERTYPEECCENUM
* @param documentId 身份证
* @param phone 登录手机号
* @param mail 单位/个人邮箱
* @param joinStartTime 入会开始时间
* @param joinEndTime 入会结束时间
* @param memberLevel 会员级别/职务 多选
* 会员级别/职务：【普通会员、理事会员、常务理事会员】
* @param pageNumber 当前页
*/ */
export async function unpaidList({unitName, joinStartTime, joinEndTime, memberType, pageNumber}) { export async function unpaidList({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, pageNumber}) {
const NowMs = new Date().valueOf(); const NowMs = new Date().valueOf();
/**到期时间距离今天小于90天 */ /**到期时间距离今天小于90天 */
let selectParam:any = { let selectParam:any = {
...@@ -100,15 +136,29 @@ export async function unpaidList({unitName, joinStartTime, joinEndTime, memberTy ...@@ -100,15 +136,29 @@ export async function unpaidList({unitName, joinStartTime, joinEndTime, memberTy
isGracePeriod:STATE.否, isGracePeriod:STATE.否,
userRegisterState:USERREGISTERSTATE.通过 userRegisterState:USERREGISTERSTATE.通过
} }
if (name) selectParam["$and"].push({
if (unitName) selectParam.unitName = unitName; "$or":[
{unitName:name},
{name},
]
});
if (joinStartTime) { if (joinStartTime) {
selectParam["$and"].push( { "joinTime":{"$gt":joinStartTime} } ) selectParam["$and"].push( { "joinTime":{"$gt":joinStartTime} } )
} }
if (joinEndTime) { if (joinEndTime) {
selectParam["$and"].push( { "joinTime":{"$lt":joinEndTime} } ) selectParam["$and"].push( { "joinTime":{"$lt":joinEndTime} } )
} }
if (memberType) selectParam.memberType = memberType; if (memberType) {
if (memberType < UNITMEMBERTYPE.院校) {
selectParam.individualMemberType = {"$in":memberType};
} else {
selectParam.unitMemberType = {"$in":memberType};
}
}
if (documentId) selectParam.documentId = documentId;
if (phone) selectParam.phone = phone;
if (mail) selectParam.mail = mail;
if (memberLevel) selectParam.memberLevel = {"$in":memberLevel};
const SelectFiles = ["userId", "memberState", "unitName", "loginId", "phone", "joinTime", "memberType", "lifespanStartTime", "lifespanEndTime"]; const SelectFiles = ["userId", "memberState", "unitName", "loginId", "phone", "joinTime", "memberType", "lifespanStartTime", "lifespanEndTime"];
let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber, 10); let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber, 10);
...@@ -134,8 +184,19 @@ export async function unpaidList({unitName, joinStartTime, joinEndTime, memberTy ...@@ -134,8 +184,19 @@ export async function unpaidList({unitName, joinStartTime, joinEndTime, memberTy
/** /**
* 会费管理-欠费 success * 会费管理-欠费 success
* @param name 名称关键字：个人会员匹配真实姓名，单位会员匹配单位名称
* @param memberType 会员类别 unitMemberType、individualMemberType 多选
* 会员类别：个人【个人会员、专业会员】单位【院校、机构、其他】返回前端枚举：MEMBERTYPEECCENUM
* @param documentId 身份证
* @param phone 登录手机号
* @param mail 单位/个人邮箱
* @param joinStartTime 入会开始时间
* @param joinEndTime 入会结束时间
* @param memberLevel 会员级别/职务 多选
* 会员级别/职务：【普通会员、理事会员、常务理事会员】
* @param pageNumber 当前页
*/ */
export async function getRenewalPeriod({unitName, joinStartTime, joinEndTime, memberType, pageNumber}) { export async function getRenewalPeriod({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, duties, pageNumber}) {
const NowMs = new Date().valueOf(); const NowMs = new Date().valueOf();
let selectParam:any = { let selectParam:any = {
"$or":[ "$or":[
...@@ -151,8 +212,12 @@ export async function getRenewalPeriod({unitName, joinStartTime, joinEndTime, me ...@@ -151,8 +212,12 @@ export async function getRenewalPeriod({unitName, joinStartTime, joinEndTime, me
isFirstPay:true, isFirstPay:true,
isAdmin:STATE.否, isAdmin:STATE.否,
} }
if (name) selectParam["$and"].push({
if (unitName) selectParam.unitName = unitName; "$or":[
{unitName:name},
{name},
]
});
if (joinStartTime) { if (joinStartTime) {
if (!selectParam["$and"]) selectParam["$and"] = []; if (!selectParam["$and"]) selectParam["$and"] = [];
selectParam["$and"].push( { "joinTime":{"$gt":joinStartTime} } ) selectParam["$and"].push( { "joinTime":{"$gt":joinStartTime} } )
...@@ -161,7 +226,17 @@ export async function getRenewalPeriod({unitName, joinStartTime, joinEndTime, me ...@@ -161,7 +226,17 @@ export async function getRenewalPeriod({unitName, joinStartTime, joinEndTime, me
if (!selectParam["$and"]) selectParam["$and"] = []; if (!selectParam["$and"]) selectParam["$and"] = [];
selectParam["$and"].push( { "joinTime":{"$lt":joinEndTime} } ) selectParam["$and"].push( { "joinTime":{"$lt":joinEndTime} } )
} }
if (memberType) selectParam.memberType = memberType; if (memberType) {
if (memberType < UNITMEMBERTYPE.院校) {
selectParam.individualMemberType = {"$in":memberType};
} else {
selectParam.unitMemberType = {"$in":memberType};
}
}
if (documentId) selectParam.documentId = documentId;
if (phone) selectParam.phone = phone;
if (mail) selectParam.mail = mail;
if (memberLevel) selectParam.memberLevel = {"$in":memberLevel};
const SelectFiles = ["userId", "memberState", "unitName", "loginId", "phone", "joinTime", "memberType", "lifespanStartTime", "lifespanEndTime"]; const SelectFiles = ["userId", "memberState", "unitName", "loginId", "phone", "joinTime", "memberType", "lifespanStartTime", "lifespanEndTime"];
let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber, 10); let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber, 10);
...@@ -255,8 +330,19 @@ export async function setGracePeriod({id, gracePeriodEndTime}) { ...@@ -255,8 +330,19 @@ export async function setGracePeriod({id, gracePeriodEndTime}) {
/** /**
* 宽限期列表 success * 宽限期列表 success
* @param name 名称关键字：个人会员匹配真实姓名，单位会员匹配单位名称
* @param memberType 会员类别 unitMemberType、individualMemberType 多选
* 会员类别：个人【个人会员、专业会员】单位【院校、机构、其他】返回前端枚举：MEMBERTYPEECCENUM
* @param documentId 身份证
* @param phone 登录手机号
* @param mail 单位/个人邮箱
* @param joinStartTime 入会开始时间
* @param joinEndTime 入会结束时间
* @param memberLevel 会员级别/职务 多选
* 会员级别/职务：【普通会员、理事会员、常务理事会员】
* @param pageNumber 当前页
*/ */
export async function getGracePeriod({unitName, joinStartTime, joinEndTime, memberType, pageNumber}) { export async function getGracePeriod({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, duties, pageNumber}) {
const NowMs = new Date().valueOf(); const NowMs = new Date().valueOf();
/**到期时间距离今天大于90天 */ /**到期时间距离今天大于90天 */
let selectParam:any = { let selectParam:any = {
...@@ -264,15 +350,29 @@ export async function getGracePeriod({unitName, joinStartTime, joinEndTime, memb ...@@ -264,15 +350,29 @@ export async function getGracePeriod({unitName, joinStartTime, joinEndTime, memb
gracePeriodEndTime:{"$gt":NowMs}, gracePeriodEndTime:{"$gt":NowMs},
isAdmin:STATE.否, isAdmin:STATE.否,
} }
if (name) selectParam["$and"].push({
if (unitName) selectParam.unitName = unitName; "$or":[
{unitName:name},
{name},
]
});
if (joinStartTime) { if (joinStartTime) {
selectParam["$and"].push( { "joinTime":{"$gt":joinStartTime} } ) selectParam["$and"].push( { "joinTime":{"$gt":joinStartTime} } )
} }
if (joinEndTime) { if (joinEndTime) {
selectParam["$and"].push( { "joinTime":{"$lt":joinEndTime} } ) selectParam["$and"].push( { "joinTime":{"$lt":joinEndTime} } )
} }
if (memberType) selectParam.memberType = memberType; if (memberType) {
if (memberType < UNITMEMBERTYPE.院校) {
selectParam.individualMemberType = {"$in":memberType};
} else {
selectParam.unitMemberType = {"$in":memberType};
}
}
if (documentId) selectParam.documentId = documentId;
if (phone) selectParam.phone = phone;
if (mail) selectParam.mail = mail;
if (memberLevel) selectParam.memberLevel = {"$in":memberLevel};
const SelectFiles = [ "userId", "memberState", "unitName", "loginId", "phone", "joinTime", "memberType", "joinTime", "lifespanEndTime"]; const SelectFiles = [ "userId", "memberState", "unitName", "loginId", "phone", "joinTime", "memberType", "joinTime", "lifespanEndTime"];
let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber, 10); let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber, 10);
......
src/biz/member/order.ts
...@@ -149,18 +149,54 @@ export async function offlinePayment({orderId, paymentNum, offlinePaymentUrl }) ...@@ -149,18 +149,54 @@ export async function offlinePayment({orderId, paymentNum, offlinePaymentUrl })
/** /**
* 发票管理-财务核对列表 success * 发票管理-财务核对列表 success
* @param param0 * @param name 名称关键字：个人会员匹配真实姓名，单位会员匹配单位名称
* @param memberType 会员类别 unitMemberType、individualMemberType 多选
* 会员类别：个人【个人会员、专业会员】单位【院校、机构、其他】返回前端枚举：MEMBERTYPEECCENUM
* @param documentId 身份证
* @param phone 登录手机号
* @param mail 单位/个人邮箱
* @param joinStartTime 入会开始时间
* @param joinEndTime 入会结束时间
* @param memberLevel 会员级别/职务 多选
* 会员级别/职务：【普通会员、理事会员、常务理事会员】
* @param paymentType 支付方式
* @param costType 会费类别
* @param pageNumber 当前页
*/ */
export async function paidList({unitName, paymentType, costType, pageNumber }) { export async function paidList({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, paymentType, costType, pageNumber }) {
eccEnumValue("财务核对列表", "支付类型", PAYMENTTYPE, paymentType); eccEnumValue("财务核对列表", "支付类型", PAYMENTTYPE, paymentType);
eccEnumValue("财务核对列表", "会费类别", COSTTYPE, costType ); eccEnumValue("财务核对列表", "会费类别", COSTTYPE, costType );
let findParam:any = { let findParam:any = {
"$or":[{isFirst:false}, {isFirst:true, firstPayExamine:true }], "$and":[
{ "$or":[{isFirst:false}, {isFirst:true, firstPayExamine:true }] },
],
confirmReceipt:RECEIPTCONFIRMATION.待确认, confirmReceipt:RECEIPTCONFIRMATION.待确认,
state:ORDERSTATE.已支付 state:ORDERSTATE.已支付
}; }
if (unitName) findParam.unitName = {"$regex":unitName}; if (name) findParam["$and"].push({
"$or":[
{unitName:name},
{name},
]
});
if (memberType) {
if (memberType < UNITMEMBERTYPE.院校) {
findParam.individualMemberType = {"$in":memberType};
} else {
findParam.unitMemberType = {"$in":memberType};
}
}
if (documentId) findParam.documentId = documentId;
if (phone) findParam.phone = phone;
if (mail) findParam.mail = mail;
if (joinStartTime) {
findParam["$and"].push( { "joinTime":{"$gt":joinStartTime} } )
}
if (joinEndTime) {
findParam["$and"].push( { "joinTime":{"$lt":joinEndTime} } )
}
if (memberLevel) findParam.memberLevel = {"$in":memberLevel};
if (paymentType) findParam.paymentMethod = paymentType; if (paymentType) findParam.paymentMethod = paymentType;
if (costType) findParam.isFirst = costType == COSTTYPE.首次; if (costType) findParam.isFirst = costType == COSTTYPE.首次;
...@@ -257,15 +293,48 @@ export async function confirmReceiptOut({id}) { ...@@ -257,15 +293,48 @@ export async function confirmReceiptOut({id}) {
/** /**
* 发票管理-待开发票 success * 发票管理-待开发票 success
* @param param0 * @param name 名称关键字：个人会员匹配真实姓名，单位会员匹配单位名称
* @param memberType 会员类别 unitMemberType、individualMemberType 多选
* 会员类别：个人【个人会员、专业会员】单位【院校、机构、其他】返回前端枚举：MEMBERTYPEECCENUM
* @param documentId 身份证
* @param phone 登录手机号
* @param mail 单位/个人邮箱
* @param joinStartTime 入会开始时间
* @param joinEndTime 入会结束时间
* @param memberLevel 会员级别/职务 多选
* 会员级别/职务：【普通会员、理事会员、常务理事会员】
* @param paymentType 支付方式
* @param isPay 是否支付
* @param pageNumber 当前页
*/ */
export async function billStateList({unitName, paymentType, isPay, pageNumber}) { export async function billStateList({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, paymentType, isPay, pageNumber}) {
eccEnumValue("发票列表", "是否支付", ISPAYENUM, isPay ); eccEnumValue("发票列表", "是否支付", ISPAYENUM, isPay );
let findParam:any = { let findParam:any = {
invoiceStatus:INVOICESTATUS.未开发票 invoiceStatus:INVOICESTATUS.未开发票
}; };
if (unitName) findParam.unitName = {"$regex":unitName};
if (name) findParam["$or"] = [
{unitName:name},
{name},
]
if (memberType) {
if (memberType < UNITMEMBERTYPE.院校) {
findParam.individualMemberType = {"$in":memberType};
} else {
findParam.unitMemberType = {"$in":memberType};
}
}
if (documentId) findParam.documentId = documentId;
if (phone) findParam.phone = phone;
if (mail) findParam.mail = mail;
if (joinStartTime) {
findParam["$and"].push( { "joinTime":{"$gt":joinStartTime} } )
}
if (joinEndTime) {
findParam["$and"].push( { "joinTime":{"$lt":joinEndTime} } )
}
if (memberLevel) findParam.memberLevel = {"$in":memberLevel};
if (paymentType) { if (paymentType) {
eccEnumValue("发票列表", "支付类型", PAYMENTTYPE, paymentType); eccEnumValue("发票列表", "支付类型", PAYMENTTYPE, paymentType);
findParam.paymentMethod = paymentType; findParam.paymentMethod = paymentType;
...@@ -341,16 +410,48 @@ export async function backInvoice({id}) { ...@@ -341,16 +410,48 @@ export async function backInvoice({id}) {
/** /**
* 发票管理-已开发票 success * 发票管理-已开发票 success
* @param param0 * @param name 名称关键字：个人会员匹配真实姓名，单位会员匹配单位名称
* @param memberType 会员类别 unitMemberType、individualMemberType 多选
* 会员类别：个人【个人会员、专业会员】单位【院校、机构、其他】返回前端枚举：MEMBERTYPEECCENUM
* @param documentId 身份证
* @param phone 登录手机号
* @param mail 单位/个人邮箱
* @param joinStartTime 入会开始时间
* @param joinEndTime 入会结束时间
* @param memberLevel 会员级别/职务 多选
* 会员级别/职务：【普通会员、理事会员、常务理事会员】
* @param paymentType 支付方式
* @param isPay 是否支付
* @param pageNumber 当前页
*/ */
export async function invoicedList({unitName, paymentType, isPay, pageNumber}) { export async function invoicedList({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, paymentType, isPay, pageNumber}) {
eccEnumValue("发票列表", "支付类型", PAYMENTTYPE, paymentType); eccEnumValue("发票列表", "支付类型", PAYMENTTYPE, paymentType);
eccEnumValue("发票列表", "是否支付", ISPAYENUM, isPay ); eccEnumValue("发票列表", "是否支付", ISPAYENUM, isPay );
let findParam:any = { let findParam:any = {
invoiceStatus:INVOICESTATUS.已开发票 invoiceStatus:INVOICESTATUS.已开发票
}; };
if (unitName) findParam.unitName = {"$regex":unitName}; if (name) findParam["$or"] = [
{unitName:name},
{name},
]
if (memberType) {
if (memberType < UNITMEMBERTYPE.院校) {
findParam.individualMemberType = {"$in":memberType};
} else {
findParam.unitMemberType = {"$in":memberType};
}
}
if (documentId) findParam.documentId = documentId;
if (phone) findParam.phone = phone;
if (mail) findParam.mail = mail;
if (joinStartTime) {
findParam["$and"].push( { "joinTime":{"$gt":joinStartTime} } )
}
if (joinEndTime) {
findParam["$and"].push( { "joinTime":{"$lt":joinEndTime} } )
}
if (memberLevel) findParam.memberLevel = {"$in":memberLevel};
if (paymentType) findParam.paymentMethod = paymentType; if (paymentType) findParam.paymentMethod = paymentType;
if (isPay) findParam.state = isPay if (isPay) findParam.state = isPay
...@@ -422,7 +523,7 @@ export async function orderList({userId, type}) { ...@@ -422,7 +523,7 @@ export async function orderList({userId, type}) {
const SelectFile = ["orderCycleStart", "orderCycleEnd", "money", "state", "id", "advanceInvoice", "invoiceStatus", "unitName", "confirmReceipt", "newUscc"]; const SelectFile = ["orderCycleStart", "orderCycleEnd", "money", "state", "id", "advanceInvoice", "invoiceStatus", "unitName", "confirmReceipt", "newUscc"];
let dbList = await find(TABLEENUM.订单表, findParam, SelectFile); let dbList = await find(TABLEENUM.订单表, findParam, SelectFile);
/**查询证明函需要字段会员等级 */ /**查询证明函需要字段会员等级 */
let myOldInfo = await findOnce(TABLEENUM.用户表, {userId}, ["memberLevel", "userId", "uscc"]); let myOldInfo = await findOnce(TABLEENUM.用户表, {userId}, ["memberLevel", "userId", "uscc", "memberType"]);
if (!myOldInfo || !myOldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在); if (!myOldInfo || !myOldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
let memberLevel = changeEnumValue(MEMBERLEVEL, myOldInfo.memberLevel); let memberLevel = changeEnumValue(MEMBERLEVEL, myOldInfo.memberLevel);
...@@ -461,7 +562,8 @@ export async function orderList({userId, type}) { ...@@ -461,7 +562,8 @@ export async function orderList({userId, type}) {
orderCycleEnd:moment(orderCycleEnd).format("YYYY"), orderCycleEnd:moment(orderCycleEnd).format("YYYY"),
memberLevel, memberLevel,
payState, payState,
payStateStr:changeEnumValue(MYORDERLISTPAYSTATE, payState) payStateStr:changeEnumValue(MYORDERLISTPAYSTATE, payState),
memberType:myOldInfo.memberType
}; };
dataList.push(item); dataList.push(item);
...@@ -477,13 +579,19 @@ export async function orderList({userId, type}) { ...@@ -477,13 +579,19 @@ export async function orderList({userId, type}) {
* @param newUscc 社会信用代码 * @param newUscc 社会信用代码
* @param newUnitName 发票抬头 * @param newUnitName 发票抬头
*/ */
export async function applicationInvoice({id, newUscc, newUnitName}) { export async function applicationInvoice({id, memberType, newUscc, newUnitName}) {
let orderInfo = await findOnce(TABLEENUM.订单表, {id}, ["id", "invoiceStatus", "advanceInvoice", "invoiceAdd", "state", "advanceInvoice"]); let orderInfo = await findOnce(TABLEENUM.订单表, {id}, ["id", "invoiceStatus", "advanceInvoice", "invoiceAdd", "state", "advanceInvoice"]);
if (!orderInfo || !orderInfo.id) throw new BizError(ERRORENUM.目标数据不存在); if (!orderInfo || !orderInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
if (orderInfo.invoiceStatus == INVOICESTATUS.已开发票) throw new BizError(ERRORENUM.发票已开具不可重复提交); if (orderInfo.invoiceStatus == INVOICESTATUS.已开发票) throw new BizError(ERRORENUM.发票已开具不可重复提交);
if (orderInfo.invoiceStatus == INVOICESTATUS.退回) throw new BizError(ERRORENUM.请求已被退回请重新申请); if (orderInfo.invoiceStatus == INVOICESTATUS.退回) throw new BizError(ERRORENUM.请求已被退回请重新申请);
let updateInfo:any = {invoiceStatus:INVOICESTATUS.未开发票, newUscc, newUnitName, advanceInvoice : true}; let updateInfo:any = {};
//个人会员申请发票锁定文字，无法修改
if (memberType == MEMBERTYPE.单位会员) {
updateInfo = {invoiceStatus:INVOICESTATUS.未开发票, newUscc, newUnitName, advanceInvoice : true};
} else {
updateInfo = {invoiceStatus:INVOICESTATUS.未开发票, advanceInvoice : true};
}
await updateOneData(TABLEENUM.订单表, {id}, updateInfo); await updateOneData(TABLEENUM.订单表, {id}, updateInfo);
......
src/config/enum.ts
...@@ -364,11 +364,11 @@ export enum INDIVIDUALMEMBERTYPE { ...@@ -364,11 +364,11 @@ export enum INDIVIDUALMEMBERTYPE {
* 会员类型 校验用 * 会员类型 校验用
*/ */
export enum MEMBERTYPEECCENUM { export enum MEMBERTYPEECCENUM {
普通会员 = 1, 个人会员 = 1,
专家会员, // 个人专家,
院校 = 9, 单位院校 = 9,
机构, 单位机构,
其他 单位其他
} }
...@@ -671,4 +671,3 @@ export enum OOSCODE { ...@@ -671,4 +671,3 @@ export enum OOSCODE {
注册信息 注册信息
} }
src/config/outPutConfig.ts 0 → 100644
/**
* 待审核导出列-单位会员
*/
export enum UNITAUDITINGCOLUMNS {
单位名称 = "unitName",
法人邮箱 = "legalPersonMail",
主要负责人 = "yuanXiaoFuZeRen",
科研负责人电话 = "yuanXiaoKeYanFuZeRenDianHua",
省市区 = "shengshiqu",
日常联系人 = "contactPerson",
主要负责人职务 = "yuanXiaoFuZeRenZhiWu",
教学负责人姓名 = "jiaoXueFuZeRenXinMing",
通信地址 = "addres",
日常联系人职务 = "contactPersonDuties",
主要负责人电话 = "yuanXiaoFuZeRenDianHua",
教学负责人电话 = "jiaoXueFuZeRenDianHua",
单位邮箱 = "unitMail",
日常联系人手机 = "contactPersonPhone",
主要负责人邮箱 = "ZhuYaoFuZeRenYouXiang",
学生总人数 = "yuanXiaoXueShengZongRenShu",
单位信用代码 = "uscc",
// 单位信息类型 = "",
办公负责人 = "yuanXiaoBanGongFuZeRen",
教职工总人数 = "yuanXiaoJiaoZhiGongZongRenShu",
法人代表 = "legalPerson",
办学类型 = "yuanXiaoBanXueLeiXing",
办公负责人电话 = "yuanXiaoBanGongFuZeRenDianHua",
开设专业 = "kaishezhuanYe",
法人联系电话 = "legalPersonPhone",
主管部门 = "yuanXiaoZhuGuanBuMen",
科研负责人 = "yuanXiaoKeYanFuZeRen",
单位简介 = "danWeiJianJie"
}
/**
* 待审核导出列-个人会员
*/
export enum AUDITINGCOLUMNS {
姓名 = "name",
手机号码 = "phone",
专业类别 = "profCategory",
性别 = "sex",
个人邮箱 = "mail",
民族 = "nation",
省市区 = "shengshiqu",
出生年月 = "birth",
通信地址 = "addres",
证件类型 = "documentType",
工作单位 = "unitName",
证件号码 = "documentId",
职务 = "duties",
学历 = "education",
职称 = "workTitle"
}
src/routers/member/router.ts
...@@ -253,16 +253,19 @@ export const Config = { ...@@ -253,16 +253,19 @@ export const Config = {
"会员库":[ "会员库":[
{ {
apiName:"单位会员列表", apiName:"单位会员列表",
subUrl:'/memberdb/unitmemberlist',//路径全小写 subUrl:'/memberdb/unitmemberlist',
param:[ param:[
{key:"unitName", type:"String", desc:"单位名称", isNull:true}, {key:"unitName", type:"String", desc:"单位名称", isNull:true},
{key:"joinTime", type:"Number", desc:"入会时间", isNull:true}, {key:"mail", type:"String", desc:"单位邮箱", isNull:true},
{key:"phone", type:"String", desc:"登录手机号", isNull:true},
{key:"joinStartTime", type:"Number", desc:"入会开始时间", isNull:true},
{key:"joinEndTime", type:"Number", desc:"入会结束时间", isNull:true},
{key:"unitMemberType", type:"[Number]", desc:"单位会员类型", isNull:true}, {key:"unitMemberType", type:"[Number]", desc:"单位会员类型", isNull:true},
{key:"memberLevel", type:"[Number]", desc:"会员等级职务", isNull:true}, {key:"memberLevel", type:"[Number]", desc:"会员等级职务", isNull:true},
{key:"session", type:"Number", desc:"届次", isNull:true}, {key:"session", type:"Number", desc:"届次", isNull:true},
{key:"memberState", type:"Number", desc:"状态", isNull:true},
{key:"sheng", type:"String", desc:"省", isNull:true}, {key:"sheng", type:"String", desc:"省", isNull:true},
{key:"shi", type:"String", desc:"市", isNull:true}, {key:"shi", type:"String", desc:"市", isNull:true},
{key:"qu", type:"String", desc:"区", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"} {key:"pageNumber", type:"Number", desc:"当前页"}
], ],
bindBiz:memberBiz.unitMemberList bindBiz:memberBiz.unitMemberList
...@@ -270,16 +273,19 @@ export const Config = { ...@@ -270,16 +273,19 @@ export const Config = {
{ {
apiName:"个人会员列表", apiName:"个人会员列表",
subUrl:'/memberdb/individualmemberlist', subUrl:'/memberdb/individualmemberlist',
param:[ param:[
{key:"name", type:"String", desc:"姓名", isNull:true}, {key:"name", type:"String", desc:"姓名", isNull:true},
{key:"documentId", type:"String", desc:"身份证", isNull:true}, {key:"documentId", type:"String", desc:"身份证", isNull:true},
{key:"phone", type:"String", desc:"手机号", isNull:true}, {key:"phone", type:"String", desc:"手机号", isNull:true},
{key:"individualMemberType", type:"[Number]", desc:"级别、会员类型", isNull:true}, {key:"mail", type:"Number", desc:"个人邮箱", isNull:true},
{key:"joinStartTime", type:"Number", desc:"入会开始时间", isNull:true},
{key:"joinEndTime", type:"Number", desc:"入会结束时间", isNull:true},
{key:"memberLevel", type:"[Number]", desc:"会员等级", isNull:true}, {key:"memberLevel", type:"[Number]", desc:"会员等级", isNull:true},
{key:"session", type:"Number", desc:"届次", isNull:true}, {key:"session", type:"Number", desc:"届次", isNull:true},
{key:"joinTime", type:"Number", desc:"入会时间", isNull:true}, {key:"profCategory", type:"Number", desc:"专业类别", isNull:true},
{key:"auditTime", type:"Number", desc:"审核时间", isNull:true},
{key:"memberState", type:"Number", desc:"状态", isNull:true}, {key:"memberState", type:"Number", desc:"状态", isNull:true},
{key:"sheng", type:"String", desc:"省", isNull:true},
{key:"shi", type:"String", desc:"市", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"} {key:"pageNumber", type:"Number", desc:"当前页"}
], ],
bindBiz:memberBiz.individualMemberList bindBiz:memberBiz.individualMemberList
...@@ -421,12 +427,13 @@ export const Config = { ...@@ -421,12 +427,13 @@ export const Config = {
apiName:"待审核列表", apiName:"待审核列表",
subUrl:'/examine/pendingreview', subUrl:'/examine/pendingreview',
param:[ param:[
{key:"unitName", type:"String", desc:"单位名称", isNull:true}, {key:"name", type:"String", desc:"名称", isNull:true},
{key:"joinTime", type:"Number", desc:"入会时间", isNull:true}, {key:"memberType", type:"[Number]", desc:"会员类别", isNull:true},
{key:"memberType", type:"Number", desc:"会员类别", isNull:true}, {key:"documentId", type:"String", desc:"身份证", isNull:true},
{key:"phone", type:"String", desc:"登录手机号", isNull:true},
{key:"mail", type:"String", desc:"邮箱", isNull:true},
{key:"sheng", type:"String", desc:"省", isNull:true}, {key:"sheng", type:"String", desc:"省", isNull:true},
{key:"shi", type:"String", desc:"市", isNull:true}, {key:"shi", type:"String", desc:"市", isNull:true},
{key:"qu", type:"String", desc:"区", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"} {key:"pageNumber", type:"Number", desc:"当前页"}
], ],
bindBiz:examineBiz.pendingReviewList bindBiz:examineBiz.pendingReviewList
...@@ -478,10 +485,14 @@ export const Config = { ...@@ -478,10 +485,14 @@ export const Config = {
apiName:"已缴费名单列表", apiName:"已缴费名单列表",
subUrl:'/memberfees/paid', subUrl:'/memberfees/paid',
param:[ param:[
{key:"unitName", type:"String", desc:"单位名称", isNull:true}, {key:"name", type:"String", desc:"名称", isNull:true},
{key:"memberType", type:"[Number]", desc:"会员类别", isNull:true},
{key:"documentId", type:"String", desc:"身份证", isNull:true},
{key:"phone", type:"String", desc:"手机号", isNull:true},
{key:"mail", type:"String", desc:"邮箱", isNull:true},
{key:"joinStartTime", type:"Number", desc:"入会开始时间", isNull:true}, {key:"joinStartTime", type:"Number", desc:"入会开始时间", isNull:true},
{key:"joinEndTime", type:"Number", desc:"入会结束时间", isNull:true}, {key:"joinEndTime", type:"Number", desc:"入会结束时间", isNull:true},
{key:"memberType", type:"Number", desc:"会员类别", isNull:true}, {key:"memberLevel", type:"[Number]", desc:"个人级别职务", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"} {key:"pageNumber", type:"Number", desc:"当前页"}
], ],
bindBiz:memberFeesBiz.getPaid bindBiz:memberFeesBiz.getPaid
...@@ -498,10 +509,14 @@ export const Config = { ...@@ -498,10 +509,14 @@ export const Config = {
apiName:"待缴费列表", apiName:"待缴费列表",
subUrl:'/memberfees/unpaidlist', subUrl:'/memberfees/unpaidlist',
param:[ param:[
{key:"unitName", type:"String", desc:"单位名称", isNull:true}, {key:"name", type:"String", desc:"名称", isNull:true},
{key:"memberType", type:"[Number]", desc:"会员类别", isNull:true},
{key:"documentId", type:"String", desc:"身份证", isNull:true},
{key:"phone", type:"String", desc:"手机号", isNull:true},
{key:"mail", type:"String", desc:"邮箱", isNull:true},
{key:"joinStartTime", type:"Number", desc:"入会开始时间", isNull:true}, {key:"joinStartTime", type:"Number", desc:"入会开始时间", isNull:true},
{key:"joinEndTime", type:"Number", desc:"入会结束时间", isNull:true}, {key:"joinEndTime", type:"Number", desc:"入会结束时间", isNull:true},
{key:"memberType", type:"Number", desc:"会员类别", isNull:true}, {key:"memberLevel", type:"[Number]", desc:"个人级别职务", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"} {key:"pageNumber", type:"Number", desc:"当前页"}
], ],
bindBiz:memberFeesBiz.unpaidList bindBiz:memberFeesBiz.unpaidList
...@@ -510,10 +525,14 @@ export const Config = { ...@@ -510,10 +525,14 @@ export const Config = {
apiName:"欠费名单列表", apiName:"欠费名单列表",
subUrl:'/memberfees/getrenewalperiod', subUrl:'/memberfees/getrenewalperiod',
param:[ param:[
{key:"unitName", type:"String", desc:"单位名称", isNull:true}, {key:"name", type:"String", desc:"名称", isNull:true},
{key:"memberType", type:"[Number]", desc:"会员类别", isNull:true},
{key:"documentId", type:"String", desc:"身份证", isNull:true},
{key:"phone", type:"String", desc:"手机号", isNull:true},
{key:"mail", type:"String", desc:"邮箱", isNull:true},
{key:"joinStartTime", type:"Number", desc:"入会开始时间", isNull:true}, {key:"joinStartTime", type:"Number", desc:"入会开始时间", isNull:true},
{key:"joinEndTime", type:"Number", desc:"入会结束时间", isNull:true}, {key:"joinEndTime", type:"Number", desc:"入会结束时间", isNull:true},
{key:"memberType", type:"Number", desc:"会员类别", isNull:true}, {key:"memberLevel", type:"[Number]", desc:"个人级别职务", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"} {key:"pageNumber", type:"Number", desc:"当前页"}
], ],
bindBiz:memberFeesBiz.getRenewalPeriod bindBiz:memberFeesBiz.getRenewalPeriod
...@@ -549,10 +568,14 @@ export const Config = { ...@@ -549,10 +568,14 @@ export const Config = {
apiName:"宽限期名单列表", apiName:"宽限期名单列表",
subUrl:'/memberfees/getgraceperiod', subUrl:'/memberfees/getgraceperiod',
param:[ param:[
{key:"unitName", type:"String", desc:"单位名称", isNull:true}, {key:"name", type:"String", desc:"名称", isNull:true},
{key:"memberType", type:"[Number]", desc:"会员类别", isNull:true},
{key:"documentId", type:"String", desc:"身份证", isNull:true},
{key:"phone", type:"String", desc:"手机号", isNull:true},
{key:"mail", type:"String", desc:"邮箱", isNull:true},
{key:"joinStartTime", type:"Number", desc:"入会开始时间", isNull:true}, {key:"joinStartTime", type:"Number", desc:"入会开始时间", isNull:true},
{key:"joinEndTime", type:"Number", desc:"入会结束时间", isNull:true}, {key:"joinEndTime", type:"Number", desc:"入会结束时间", isNull:true},
{key:"memberType", type:"Number", desc:"会员类别", isNull:true}, {key:"memberLevel", type:"[Number]", desc:"个人级别职务", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"} {key:"pageNumber", type:"Number", desc:"当前页"}
], ],
bindBiz:memberFeesBiz.getGracePeriod bindBiz:memberFeesBiz.getGracePeriod
......
src/routers/order/router.ts
...@@ -40,7 +40,14 @@ export const Config = { ...@@ -40,7 +40,14 @@ export const Config = {
apiName:"财务核对", apiName:"财务核对",
subUrl:'/order/invoice/check/list', subUrl:'/order/invoice/check/list',
param:[ param:[
{key:"unitName", type:"String", desc:"单位名称", isNull:true}, {key:"name", type:"String", desc:"名称", isNull:true},
{key:"memberType", type:"[Number]", desc:"会员类别", isNull:true},
{key:"documentId", type:"String", desc:"身份证", isNull:true},
{key:"phone", type:"String", desc:"手机号", isNull:true},
{key:"mail", type:"String", desc:"邮箱", isNull:true},
{key:"joinStartTime", type:"Number", desc:"入会开始时间", isNull:true},
{key:"joinEndTime", type:"Number", desc:"入会结束时间", isNull:true},
{key:"memberLevel", type:"[Number]", desc:"个人级别职务", isNull:true},
{key:"paymentType", type:"Number", desc:"支付方式", isNull:true}, {key:"paymentType", type:"Number", desc:"支付方式", isNull:true},
{key:"costType", type:"Number", desc:"会费类别", isNull:true}, {key:"costType", type:"Number", desc:"会费类别", isNull:true},
{key:"pageNumber", type:"Number", desc:"分页-当前页面"} {key:"pageNumber", type:"Number", desc:"分页-当前页面"}
...@@ -51,7 +58,14 @@ export const Config = { ...@@ -51,7 +58,14 @@ export const Config = {
apiName:"待开发票", apiName:"待开发票",
subUrl:'/order/invoice/list', subUrl:'/order/invoice/list',
param:[ param:[
{key:"unitName", type:"String", desc:"单位名称", isNull:true}, {key:"name", type:"String", desc:"名称", isNull:true},
{key:"memberType", type:"[Number]", desc:"会员类别", isNull:true},
{key:"documentId", type:"String", desc:"身份证", isNull:true},
{key:"phone", type:"String", desc:"手机号", isNull:true},
{key:"mail", type:"String", desc:"邮箱", isNull:true},
{key:"joinStartTime", type:"Number", desc:"入会开始时间", isNull:true},
{key:"joinEndTime", type:"Number", desc:"入会结束时间", isNull:true},
{key:"memberLevel", type:"[Number]", desc:"个人级别职务", isNull:true},
{key:"paymentType", type:"Number", desc:"支付方式", isNull:true}, {key:"paymentType", type:"Number", desc:"支付方式", isNull:true},
{key:"isPay", type:"Number", desc:"是否支付", isNull:true}, {key:"isPay", type:"Number", desc:"是否支付", isNull:true},
{key:"pageNumber", type:"Number", desc:"分页-当前页面"} {key:"pageNumber", type:"Number", desc:"分页-当前页面"}
...@@ -95,8 +109,15 @@ export const Config = { ...@@ -95,8 +109,15 @@ export const Config = {
apiName:"发票管理-已开发票", apiName:"发票管理-已开发票",
subUrl:'/order/invoice/examine/invoicedlist', subUrl:'/order/invoice/examine/invoicedlist',
param:[ param:[
{key:"unitName", type:"String", desc:"单位名称", isNull:true}, {key:"name", type:"String", desc:"名称", isNull:true},
{key:"paymentType", type:"Number", desc:"付款方式", isNull:true}, {key:"memberType", type:"[Number]", desc:"会员类别", isNull:true},
{key:"documentId", type:"String", desc:"身份证", isNull:true},
{key:"phone", type:"String", desc:"手机号", isNull:true},
{key:"mail", type:"String", desc:"邮箱", isNull:true},
{key:"joinStartTime", type:"Number", desc:"入会开始时间", isNull:true},
{key:"joinEndTime", type:"Number", desc:"入会结束时间", isNull:true},
{key:"memberLevel", type:"[Number]", desc:"个人级别职务", isNull:true},
{key:"paymentType", type:"Number", desc:"支付方式", isNull:true},
{key:"isPay", type:"Number", desc:"是否支付", isNull:true}, {key:"isPay", type:"Number", desc:"是否支付", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"}, {key:"pageNumber", type:"Number", desc:"当前页"},
], ],
...@@ -133,8 +154,9 @@ export const Config = { ...@@ -133,8 +154,9 @@ export const Config = {
subUrl:'/order/applicationinvoice', subUrl:'/order/applicationinvoice',
param:[ param:[
{key:"id", type:"String", desc:"会员缴费列表返回id"}, {key:"id", type:"String", desc:"会员缴费列表返回id"},
{key:"newUscc", type:"String", desc:"新的社会信用代码"}, {key:"memberType", type:"Number", desc:"会员类型"},
{key:"newUnitName", type:"String", desc:"新的发票抬头"} {key:"newUscc", type:"String", desc:"新的社会信用代码", isNull:true},
{key:"newUnitName", type:"String", desc:"新的发票抬头", isNull:true}
], ],
bindBiz:orderBiz.applicationInvoice bindBiz:orderBiz.applicationInvoice
}, },
......
src/routers/outPut/routers.ts
...@@ -8,13 +8,17 @@ export const Config = { ...@@ -8,13 +8,17 @@ export const Config = {
{ {
apiName:"个人会员导出", apiName:"个人会员导出",
subUrl:'/memberdb/outputindividualmembers', subUrl:'/memberdb/outputindividualmembers',
param:[], param:[
{key:"exportColumns", type:"[]", desc:"导出数据列"}
],
bindBiz:memberBiz.outPutIndividualMembers bindBiz:memberBiz.outPutIndividualMembers
}, },
{ {
apiName:"单位会员导出", apiName:"单位会员导出",
subUrl:'/memberdb/outputunitmembers', subUrl:'/memberdb/outputunitmembers',
param:[], param:[
{key:"exportColumns", type:"[]", desc:"导出数据列"}
],
bindBiz:memberBiz.outPutUnitMembers bindBiz:memberBiz.outPutUnitMembers
} }
], ],
...@@ -23,7 +27,8 @@ export const Config = { ...@@ -23,7 +27,8 @@ export const Config = {
apiName:"待审核导出", apiName:"待审核导出",
subUrl:'/memberdb/outputpendingreviewlist', subUrl:'/memberdb/outputpendingreviewlist',
param:[ param:[
{key:"memberType", type:"Number", desc:"会员类型"} {key:"memberType", type:"Number", desc:"会员类型"},
{key:"exportColumns", type:"[]", desc:"导出数据列"}
], ],
bindBiz:examineBiz.outPutPendingReviewList bindBiz:examineBiz.outPutPendingReviewList
}, },
......
src/routers/public/router.ts
import * as publicBiz from '../../biz/public'; import * as publicBiz from '../../biz/public';
import * as enumConfig from '../../config/enum'; import * as enumConfig from '../../config/enum';
import * as outPutConfig from '../../config/outPutConfig';
export const FirstName = '公共接口'; export const FirstName = '公共接口';
export const FirstRouter = '/public'; export const FirstRouter = '/public';
...@@ -232,7 +233,20 @@ export const Config = { ...@@ -232,7 +233,20 @@ export const Config = {
param:[], param:[],
defaultParam:enumConfig.VIDEOANDIMGTYPEENUM, defaultParam:enumConfig.VIDEOANDIMGTYPEENUM,
bindBiz:publicBiz.setEnumInterface bindBiz:publicBiz.setEnumInterface
},
{
apiName:"导出审核单位会员数据列",
subUrl:'/unitauditingcolumns',
param:[],
defaultParam:outPutConfig.UNITAUDITINGCOLUMNS,
bindBiz:publicBiz.setEnumInterface
},
{
apiName:"导出审核个人会员数据列",
subUrl:'/auditingcolumns',
param:[],
defaultParam:outPutConfig.AUDITINGCOLUMNS,
bindBiz:publicBiz.setEnumInterface
} }
], ],
} }
src/routers/router.ts
...@@ -19,7 +19,7 @@ import * as asyncHandler from 'express-async-handler'; ...@@ -19,7 +19,7 @@ import * as asyncHandler from 'express-async-handler';
import { payCallback } from "../biz/member/cost"; import { payCallback } from "../biz/member/cost";
import { checkUser } from "../middleware/user"; import { checkUser } from "../middleware/user";
const Look = true;//true更新文档 const Look = false;//true更新文档
export async function setRouter(httpServer){ export async function setRouter(httpServer){
if (Look) { if (Look) {
......
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