Skip to content

W
wenHuaBu_adminServer
Commit 2fd40af6 by chenjinjing
Options

no message

parent 05bd5007
Showing with 295 additions and 55 deletions
src/biz/member/homePage.ts
......@@ -29,7 +29,7 @@ export async function getMemberData({userId}) {
let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
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 majorSelectFiles = [];
let otherAttachment:any= {};
......@@ -65,11 +65,14 @@ export async function getMemberData({userId}) {
let baseInfo:any = extractData(oldInfo, baseSelectFiles);
let majorInfo:any = extractData(oldInfo, majorSelectFiles);
/**处理枚举值 */
topInfo.integral = 0;
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 = "已入会";
else topInfo.userRegisterState = "未入会";
// if(topInfo.memberLevel) topInfo.memberLevel = changeEnumValue(MEMBERLEVEL, topInfo.memberLevel);
......
src/biz/member/order.ts
......@@ -149,18 +149,54 @@ export async function offlinePayment({orderId, paymentNum, offlinePaymentUrl })
/**
* 发票管理-财务核对列表 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("财务核对列表", "会费类别", COSTTYPE, costType );
let findParam:any = {
"$or":[{isFirst:false}, {isFirst:true, firstPayExamine:true }],
let findParam:any = {
"$and":[
{ "$or":[{isFirst:false}, {isFirst:true, firstPayExamine:true }] },
],
confirmReceipt:RECEIPTCONFIRMATION.待确认,
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 (costType) findParam.isFirst = costType == COSTTYPE.首次;
......@@ -257,15 +293,48 @@ export async function confirmReceiptOut({id}) {
/**
* 发票管理-待开发票 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 );
let findParam:any = {
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) {
eccEnumValue("发票列表", "支付类型", PAYMENTTYPE, paymentType);
findParam.paymentMethod = paymentType;
......@@ -341,16 +410,48 @@ export async function backInvoice({id}) {
/**
* 发票管理-已开发票 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("发票列表", "是否支付", ISPAYENUM, isPay );
let findParam:any = {
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 (isPay) findParam.state = isPay
......@@ -422,7 +523,7 @@ export async function orderList({userId, type}) {
const SelectFile = ["orderCycleStart", "orderCycleEnd", "money", "state", "id", "advanceInvoice", "invoiceStatus", "unitName", "confirmReceipt", "newUscc"];
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.目标数据不存在);
let memberLevel = changeEnumValue(MEMBERLEVEL, myOldInfo.memberLevel);
......@@ -461,7 +562,8 @@ export async function orderList({userId, type}) {
orderCycleEnd:moment(orderCycleEnd).format("YYYY"),
memberLevel,
payState,
payStateStr:changeEnumValue(MYORDERLISTPAYSTATE, payState)
payStateStr:changeEnumValue(MYORDERLISTPAYSTATE, payState),
memberType:myOldInfo.memberType
};
dataList.push(item);
......@@ -477,13 +579,19 @@ export async function orderList({userId, type}) {
* @param newUscc 社会信用代码
* @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"]);
if (!orderInfo || !orderInfo.id) 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);
......
src/config/enum.ts
......@@ -364,11 +364,11 @@ export enum INDIVIDUALMEMBERTYPE {
* 会员类型 校验用
*/
export enum MEMBERTYPEECCENUM {
普通会员 = 1,
专家会员,
院校 = 9,
机构,
其他
个人会员 = 1,
// 个人专家,
单位院校 = 9,
单位机构,
单位其他
}
......@@ -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 = {
"会员库":[
{
apiName:"单位会员列表",
subUrl:'/memberdb/unitmemberlist',//路径全小写
subUrl:'/memberdb/unitmemberlist',
param:[
{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:"memberLevel", 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:"shi", type:"String", desc:"市", isNull:true},
{key:"qu", type:"String", desc:"区", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"}
],
bindBiz:memberBiz.unitMemberList
......@@ -270,16 +273,19 @@ export const Config = {
{
apiName:"个人会员列表",
subUrl:'/memberdb/individualmemberlist',
param:[
param:[
{key:"name", type:"String", desc:"姓名", isNull:true},
{key:"documentId", 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:"session", type:"Number", desc:"届次", isNull:true},
{key:"joinTime", type:"Number", desc:"入会时间", isNull:true},
{key:"auditTime", type:"Number", desc:"审核时间", isNull:true},
{key:"profCategory", 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:"当前页"}
],
bindBiz:memberBiz.individualMemberList
......@@ -421,12 +427,13 @@ export const Config = {
apiName:"待审核列表",
subUrl:'/examine/pendingreview',
param:[
{key:"unitName", type:"String", desc:"单位名称", isNull:true},
{key:"joinTime", type:"Number", desc:"入会时间", isNull:true},
{key:"memberType", type:"Number", 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:"sheng", type:"String", desc:"省", isNull:true},
{key:"shi", type:"String", desc:"市", isNull:true},
{key:"qu", type:"String", desc:"区", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"}
],
bindBiz:examineBiz.pendingReviewList
......@@ -478,10 +485,14 @@ export const Config = {
apiName:"已缴费名单列表",
subUrl:'/memberfees/paid',
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:"memberType", type:"Number", desc:"会员类别", isNull:true},
{key:"memberLevel", type:"[Number]", desc:"个人级别职务", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"}
],
bindBiz:memberFeesBiz.getPaid
......@@ -498,10 +509,14 @@ export const Config = {
apiName:"待缴费列表",
subUrl:'/memberfees/unpaidlist',
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:"memberType", type:"Number", desc:"会员类别", isNull:true},
{key:"memberLevel", type:"[Number]", desc:"个人级别职务", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"}
],
bindBiz:memberFeesBiz.unpaidList
......@@ -510,10 +525,14 @@ export const Config = {
apiName:"欠费名单列表",
subUrl:'/memberfees/getrenewalperiod',
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:"memberType", type:"Number", desc:"会员类别", isNull:true},
{key:"memberLevel", type:"[Number]", desc:"个人级别职务", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"}
],
bindBiz:memberFeesBiz.getRenewalPeriod
......@@ -549,10 +568,14 @@ export const Config = {
apiName:"宽限期名单列表",
subUrl:'/memberfees/getgraceperiod',
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:"memberType", type:"Number", desc:"会员类别", isNull:true},
{key:"memberLevel", type:"[Number]", desc:"个人级别职务", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"}
],
bindBiz:memberFeesBiz.getGracePeriod
......
src/routers/order/router.ts
......@@ -40,7 +40,14 @@ export const Config = {
apiName:"财务核对",
subUrl:'/order/invoice/check/list',
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:"costType", type:"Number", desc:"会费类别", isNull:true},
{key:"pageNumber", type:"Number", desc:"分页-当前页面"}
......@@ -51,7 +58,14 @@ export const Config = {
apiName:"待开发票",
subUrl:'/order/invoice/list',
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:"isPay", type:"Number", desc:"是否支付", isNull:true},
{key:"pageNumber", type:"Number", desc:"分页-当前页面"}
......@@ -95,8 +109,15 @@ export const Config = {
apiName:"发票管理-已开发票",
subUrl:'/order/invoice/examine/invoicedlist',
param:[
{key:"unitName", type:"String", desc:"单位名称", isNull:true},
{key:"paymentType", type:"Number", 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:"isPay", type:"Number", desc:"是否支付", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"},
],
......@@ -133,8 +154,9 @@ export const Config = {
subUrl:'/order/applicationinvoice',
param:[
{key:"id", type:"String", desc:"会员缴费列表返回id"},
{key:"newUscc", type:"String", desc:"新的社会信用代码"},
{key:"newUnitName", type:"String", desc:"新的发票抬头"}
{key:"memberType", type:"Number", desc:"会员类型"},
{key:"newUscc", type:"String", desc:"新的社会信用代码", isNull:true},
{key:"newUnitName", type:"String", desc:"新的发票抬头", isNull:true}
],
bindBiz:orderBiz.applicationInvoice
},
......
src/routers/outPut/routers.ts
......@@ -8,13 +8,17 @@ export const Config = {
{
apiName:"个人会员导出",
subUrl:'/memberdb/outputindividualmembers',
param:[],
param:[
{key:"exportColumns", type:"[]", desc:"导出数据列"}
],
bindBiz:memberBiz.outPutIndividualMembers
},
{
apiName:"单位会员导出",
subUrl:'/memberdb/outputunitmembers',
param:[],
param:[
{key:"exportColumns", type:"[]", desc:"导出数据列"}
],
bindBiz:memberBiz.outPutUnitMembers
}
],
......@@ -23,7 +27,8 @@ export const Config = {
apiName:"待审核导出",
subUrl:'/memberdb/outputpendingreviewlist',
param:[
{key:"memberType", type:"Number", desc:"会员类型"}
{key:"memberType", type:"Number", desc:"会员类型"},
{key:"exportColumns", type:"[]", desc:"导出数据列"}
],
bindBiz:examineBiz.outPutPendingReviewList
},
......
src/routers/public/router.ts
import * as publicBiz from '../../biz/public';
import * as enumConfig from '../../config/enum';
import * as outPutConfig from '../../config/outPutConfig';
export const FirstName = '公共接口';
export const FirstRouter = '/public';
......@@ -232,7 +233,20 @@ export const Config = {
param:[],
defaultParam:enumConfig.VIDEOANDIMGTYPEENUM,
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';
import { payCallback } from "../biz/member/cost";
import { checkUser } from "../middleware/user";
const Look = true;//true更新文档
const Look = false;//true更新文档
export async function setRouter(httpServer){
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