Skip to content

W
wenHuaBu_adminServer
Commit d9a16cee by lixinming
Options

1.5

parent 2fd40af6
Showing with 243 additions and 224 deletions
src/biz/member/cost.ts
......@@ -137,8 +137,8 @@ export async function payCallback(body) {
paymentMethod:PAYMENTTYPE.微信支付,
payTime:new Date().valueOf(),
weChartState:WEICHARTPAYSTATE.已支付,
confirmReceipt:RECEIPTCONFIRMATION.待确认
};
if (!oldInfo.isFirst) updateInfo.confirmReceipt = RECEIPTCONFIRMATION.待确认;
await updateOneData(TABLEENUM.订单表, {weChartPR:wechartCallbackData.out_trade_no}, updateInfo);
......
src/biz/member/examine.ts
......@@ -32,25 +32,25 @@ import { getCityNameByCode } from "../../config/cityConfig";
export async function pendingReviewList({name, memberType, documentId, phone, mail, sheng, shi, pageNumber}) {
/**查询条件 */
let selectParam:any = {
"$and":[{
"$or":[
{ 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.完成第三步 }
],
isAdmin:STATE.否
}; //审批列表展示状态除通过外的数据
if (name) selectParam["$and"].push({
"$or":[
{unitName:name},
{name},
]
});
if (memberType) {
if (name) {
selectParam["$and"] = [
{"$or":[
{unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}}
]}
];
}
if (memberType.length) {
if (memberType < UNITMEMBERTYPE.院校) {
selectParam.individualMemberType = {"$in":memberType};
} else {
......
src/biz/member/homePage.ts
......@@ -69,7 +69,7 @@ export async function getMemberData({userId}) {
topInfo.integral = 0;
if(topInfo.joinTime) topInfo.joinTime = moment(topInfo.joinTime).format("YYYY-MM-DD");
if(topInfo.lifespanEndTime) {
if(topInfo.isFirstPay) topInfo.lifespanEndTime = "欠费中";
if(!topInfo.isFirstPay) topInfo.lifespanEndTime = "欠费中";
else topInfo.lifespanEndTime = moment(topInfo.lifespanEndTime).format("YYYY-MM-DD");
}
......
src/biz/member/member.ts
......@@ -34,25 +34,28 @@ import { eccFormParam } from "../../util/verificationParam";
* @param 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.否,
memberType : MEMBERTYPE.单位会员,
userRegisterState : USERREGISTERSTATE.通过
};
if (unitName) selectParam.unitName = unitName;
if (mail) selectParam.mail = mail;
if (phone) selectParam.phone = phone;
if (joinStartTime) {
selectParam["$and"].push( { "joinTime":{"$gt":joinStartTime} } )
selectParam["joinTime"] = {"$gt":joinStartTime};
}
if (joinEndTime) {
selectParam["$and"].push( { "joinTime":{"$lt":joinEndTime} } )
if (!selectParam["joinTime"]) selectParam["joinTime"] = {};
selectParam["joinTime"]["$lt"] = joinEndTime;
}
if (unitMemberType) selectParam.unitMemberType = {"$in":unitMemberType};
if (memberLevel) selectParam.memberLevel = {"$in":memberLevel};
if (unitMemberType.length) selectParam.unitMemberType = {"$in":unitMemberType};
if (memberLevel.length) selectParam.memberLevel = {"$in":memberLevel};
if (session) selectParam.session = session;
if (memberState) selectParam.memberState = memberState;
if (sheng) selectParam.sheng = sheng;
if (shi) selectParam.shi = shi;
selectParam.memberType = MEMBERTYPE.单位会员;
selectParam.userRegisterState = USERREGISTERSTATE.通过;
selectParam.isFirstPay = true;
const SelectFiles = ["userId", "memberState", "unitName", "loginId", "phone", "joinTime", "unitMemberLevel", "sheng", "shi", "qu"];
let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber);
......@@ -218,27 +221,29 @@ export async function delResearch({id}) {
* @param shi 市
*/
export async function individualMemberList({name, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, session, profCategory, memberState, sheng, shi, pageNumber}) {
let selectParam:any = {};
let selectParam:any = {
memberType : MEMBERTYPE.个人会员,
userRegisterState : USERREGISTERSTATE.通过
};
if (name) selectParam.name = name;
if (documentId) selectParam.documentId = documentId;
if (phone) selectParam.phone = phone;
if (mail) selectParam.mail = mail;
if (joinStartTime) {
selectParam["$and"].push( { "joinTime":{"$gt":joinStartTime} } )
selectParam["joinTime"] = {"$gt":joinStartTime};
}
if (joinEndTime) {
selectParam["$and"].push( { "joinTime":{"$lt":joinEndTime} } )
if (!selectParam["joinTime"]) selectParam["joinTime"] = {};
selectParam["joinTime"]["$lt"] = joinEndTime;
}
if (memberLevel) selectParam.memberLevel = {"$in":memberLevel};
if (memberLevel && memberLevel.length) selectParam.memberLevel = {"$in":memberLevel};
if (session) selectParam.session = session;
if (profCategory) selectParam.profCategory = {"$in":profCategory};
if (profCategory && profCategory.length) selectParam.profCategory = {"$in":profCategory};
if (memberState) selectParam.memberState = memberState;
if (sheng) selectParam.sheng = sheng;
if (shi) selectParam.shi = shi;
selectParam.memberType = MEMBERTYPE.个人会员;
selectParam.userRegisterState = USERREGISTERSTATE.通过;
selectParam.isFirstPay = true;
let selectConf = ["userId", "memberState", "unitName", "name", "sex", "nation", "loginId", "phone", "joinTime", "memberLevel", "sheng", "shi", "qu"];
let dbList = await findToPage(TABLEENUM.用户表, selectParam, selectConf, pageNumber);
......@@ -360,8 +365,7 @@ export async function outPutIndividualMembers({exportColumns}) {
let selectParam = {
isAdmin:STATE.否,
memberType: MEMBERTYPE.个人会员,
userRegisterState: USERREGISTERSTATE.通过,
isFirstPay:true
userRegisterState: USERREGISTERSTATE.通过
};
// let selectTitle = ["入会时间", "是否是导入用户", "会员状态", "证书类型", "个人会员类型", "会员等级/职务", "是否处于宽限期", "用户名", "联系电话", "邮箱", "真实姓名", "性别", "证件号码",
// "证件类型", "出生年月", "民族", "省", "市", "区", "通信地址", "学历", "职务", "职称", "学习简历", "工作简历", "专业成果/教研成果", "其他任职情况", "其他专业情况", "专业类别", "工作单位"];
......@@ -421,8 +425,7 @@ export async function outPutUnitMembers({exportColumns}) {
let selectParam = {
isAdmin:STATE.否,
memberType: MEMBERTYPE.单位会员,
userRegisterState: USERREGISTERSTATE.通过,
isFirstPay:true
userRegisterState: USERREGISTERSTATE.通过
};
// let selectTitle = ["入会时间", "是否是导入用户", "会员状态", "证书类型", "个人会员类型", "会员等级/职务", "是否处于宽限期", "用户名", "联系电话", "单位电子邮箱", "单位名称", "统一信用代码",
// "法人代表", "法人代表联系电话", "法人邮箱", "日常联系人", "日常联系人职务", "日常联系人手机号码", "营业执照", "单位会员类型", "院校办学类型", "院校主管部门", "院校主要负责人", "院校主要负责人职务", "院校主要负责人电话", "院校办公负责人", "院校办公负责人电话", "主要负责人邮箱", "院校科研负责人", "院校科研负责人电话", "教学负责人姓名", "院校学生总人数", "教职工总人数", "教学负责人电话", "开设专业", "单位简介"];
......
src/biz/member/memberFees.ts
......@@ -33,21 +33,19 @@ export async function getPaid({name, memberType, documentId, phone, mail, joinSt
const NowMs = new Date().valueOf();
/**到期时间距离今天大于90天 */
let selectParam:any = {
"$and":[
{ "lifespanEndTime":{"$gt":NowMs + (90 * 24 * 3600 * 1000)}},
{ "lifespanEndTime":{"$gt":NowMs}},
],
lifespanEndTime:{"$gt":NowMs + (90 * 24 * 3600 * 1000)},
isAdmin:STATE.否,
isGracePeriod:STATE.否
isGracePeriod:STATE.否,
userRegisterState:USERREGISTERSTATE.通过
}
if (name) selectParam["$and"].push({
"$or":[
{unitName:name},
{name},
if (name) {
selectParam["$or"] = [
{unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}}
]
});
if (memberType) {
}
if (memberType.length) {
if (memberType < UNITMEMBERTYPE.院校) {
selectParam.individualMemberType = {"$in":memberType};
} else {
......@@ -58,12 +56,13 @@ export async function getPaid({name, memberType, documentId, phone, mail, joinSt
if (phone) selectParam.phone = phone;
if (mail) selectParam.mail = mail;
if (joinStartTime) {
selectParam["$and"].push( { "joinTime":{"$gt":joinStartTime} } )
selectParam["joinTime"] = {"$gt":joinStartTime};
}
if (joinEndTime) {
selectParam["$and"].push( { "joinTime":{"$lt":joinEndTime} } )
if (!selectParam["joinTime"]) selectParam["joinTime"] = {};
selectParam["joinTime"]["$lt"] = joinEndTime;
}
if (memberLevel) selectParam.memberLevel = {"$in":memberLevel};
if (memberLevel.length) selectParam.memberLevel = {"$in":memberLevel};
const SelectFiles = ["userId", "memberState", "unitName", "name", "loginId", "phone", "joinTime", "memberType", "lifespanStartTime", "lifespanEndTime", "memberLevel"];
let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber);
......@@ -111,7 +110,7 @@ export async function paidOrderList({id}) {
/**
* 待缴费列表 success
* 待缴费列表 success 缴费期列表
* @param name 名称关键字：个人会员匹配真实姓名，单位会员匹配单位名称
* @param memberType 会员类别 unitMemberType、individualMemberType 多选
* 会员类别：个人【个人会员、专业会员】单位【院校、机构、其他】返回前端枚举：MEMBERTYPEECCENUM
......@@ -128,37 +127,37 @@ export async function unpaidList({name, memberType, documentId, phone, mail, joi
const NowMs = new Date().valueOf();
/**到期时间距离今天小于90天 */
let selectParam:any = {
"$and":[
{lifespanEndTime:{"$lt":NowMs + (90 * 24 * 3600 * 1000)}},
{lifespanEndTime:{"$gt":NowMs}}
],
lifespanEndTime:{"$lt":NowMs + (90 * 24 * 3600 * 1000), "$gt":NowMs},
isAdmin:STATE.否,
isGracePeriod:STATE.否,
userRegisterState:USERREGISTERSTATE.通过
}
if (name) selectParam["$and"].push({
"$or":[
{unitName:name},
{name},
if (documentId) selectParam.documentId = documentId;
if (phone) selectParam.phone = phone;
if (mail) selectParam.mail = mail;
if (memberLevel.length) selectParam.memberLevel = {"$in":memberLevel};
if (name) {
if (!selectParam["$and"]) selectParam["$and"] = [];
selectParam["$or"] = [
{unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}}
]
});
}
if (joinStartTime) {
selectParam["$and"].push( { "joinTime":{"$gt":joinStartTime} } )
selectParam["joinTime"] = {"$gt":joinStartTime};
}
if (joinEndTime) {
selectParam["$and"].push( { "joinTime":{"$lt":joinEndTime} } )
if (!selectParam["joinTime"]) selectParam["joinTime"] = {};
selectParam["joinTime"]["$lt"] = joinEndTime;
}
if (memberType) {
if (memberType.length) {
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"];
let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber, 10);
......@@ -208,25 +207,31 @@ export async function getRenewalPeriod({name, memberType, documentId, phone, mai
isGracePeriod:STATE.是,
lifespanEndTime:{"$lt":NowMs},
gracePeriodEndTime:{"$lt":NowMs}
}],
},
{
isFirstPay:true,
}
],
userRegisterState:USERREGISTERSTATE.通过,
isAdmin:STATE.否,
}
if (name) selectParam["$and"].push({
if (name){
if (!selectParam["$and"]) selectParam["$and"] = [];
selectParam["$and"].push({
"$or":[
{unitName:name},
{name},
{unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}}
]
});
}
if (joinStartTime) {
if (!selectParam["$and"]) selectParam["$and"] = [];
selectParam["$and"].push( { "joinTime":{"$gt":joinStartTime} } )
selectParam["joinTime"] = {"$gt":joinStartTime};
}
if (joinEndTime) {
if (!selectParam["$and"]) selectParam["$and"] = [];
selectParam["$and"].push( { "joinTime":{"$lt":joinEndTime} } )
if (!selectParam["joinTime"]) selectParam["joinTime"] = {};
selectParam["joinTime"]["$lt"] = joinEndTime;
}
if (memberType) {
if (memberType.length) {
if (memberType < UNITMEMBERTYPE.院校) {
selectParam.individualMemberType = {"$in":memberType};
} else {
......@@ -236,7 +241,7 @@ export async function getRenewalPeriod({name, memberType, documentId, phone, mai
if (documentId) selectParam.documentId = documentId;
if (phone) selectParam.phone = phone;
if (mail) selectParam.mail = mail;
if (memberLevel) selectParam.memberLevel = {"$in":memberLevel};
if (memberLevel.length) selectParam.memberLevel = {"$in":memberLevel};
const SelectFiles = ["userId", "memberState", "unitName", "loginId", "phone", "joinTime", "memberType", "lifespanStartTime", "lifespanEndTime"];
let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber, 10);
......@@ -349,20 +354,22 @@ export async function getGracePeriod({name, memberType, documentId, phone, mail,
isGracePeriod:STATE.是,
gracePeriodEndTime:{"$gt":NowMs},
isAdmin:STATE.否,
userRegisterState:USERREGISTERSTATE.通过
}
if (name) selectParam["$and"].push({
"$or":[
{unitName:name},
{name},
if (name) {
selectParam["$or"] = [
{unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}}
]
});
}
if (joinStartTime) {
selectParam["$and"].push( { "joinTime":{"$gt":joinStartTime} } )
selectParam["joinTime"] = {"$gt":joinStartTime};
}
if (joinEndTime) {
selectParam["$and"].push( { "joinTime":{"$lt":joinEndTime} } )
if (!selectParam["joinTime"]) selectParam["joinTime"] = {};
selectParam["joinTime"]["$lt"] = joinEndTime;
}
if (memberType) {
if (memberType.length) {
if (memberType < UNITMEMBERTYPE.院校) {
selectParam.individualMemberType = {"$in":memberType};
} else {
......@@ -372,7 +379,7 @@ export async function getGracePeriod({name, memberType, documentId, phone, mail,
if (documentId) selectParam.documentId = documentId;
if (phone) selectParam.phone = phone;
if (mail) selectParam.mail = mail;
if (memberLevel) selectParam.memberLevel = {"$in":memberLevel};
if (memberLevel.length) selectParam.memberLevel = {"$in":memberLevel};
const SelectFiles = [ "userId", "memberState", "unitName", "loginId", "phone", "joinTime", "memberType", "joinTime", "lifespanEndTime"];
let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber, 10);
......
src/biz/member/order.ts
......@@ -72,79 +72,81 @@ export async function createOrder(id:string, loginId:string, phone:string, unitN
}
/**
* 初始订单 success
* 会员管理-待支付页
*/
export async function firstOrderList({unitName, joinTime, memberType, orderState, pageNumber}) {
/** 首次订单 并且未通过待支付页的审核 */
let findParam:any = { "$or":[{isFirst:true, firstPayExamine:false}] };
if (unitName) findParam.unitName = {"$regex":unitName};
if (memberType) findParam.memberCategory = memberType;
if (orderState) findParam.state = orderState;
let selectFile = ["id", "unitName", "loginId", "phone", "orderCycleStart", "orderCycleEnd", "memberCategory", "state", "userId"];
let dbList = await findToPage(TABLEENUM.订单表, findParam, selectFile, pageNumber);
let dataCount = await findCount(TABLEENUM.订单表, findParam);
let dataList = [];
let itemFile = ["id", "unitName", "loginId", "phone", "memberCategory", "userId"];
dbList.forEach(info => {
let itemData:any = extractData(info, itemFile);
itemData.joinTime = moment(info.orderCycleStart).format("YYYY-MM-DD");
itemData.memberType = changeEnumValue(MEMBERTYPE, itemData.memberCategory);
itemData.paymentMethod = changeEnumValue(MEMBERTYPE, itemData.paymentMethod);
itemData.cycle = `${moment(info.orderCycleStart).format("YYYY-MM-DD")}至${moment(info.orderCycleEnd).format("YYYY-MM-DD")}`;
if (info.state == ORDERSTATE.未支付) {
itemData.state = "未支付";
} else {
if (info.paymentMethod == PAYMENTTYPE.银行转账) itemData.state = "银行转账";
else itemData.state = "已支付";
}
dataList.push(itemData);
});
return {dataList, dataCount};
}
/**
* 会员管理-待支付页-通过审核 success
* @param id 订单id
*/
export async function checkOrder({id}) {
let orderInfo = await findOnce(TABLEENUM.订单表, {id});
if (!orderInfo || !orderInfo.id ) throw new BizError(ERRORENUM.目标数据不存在);
if (!orderInfo.isFirst || orderInfo.firstPayExamine) throw new BizError(ERRORENUM.重复提交);
await updateOneData(TABLEENUM.订单表, {id}, {firstPayExamine:true, confirmReceipt:RECEIPTCONFIRMATION.待确认});
return successResult();
}
/**
* 待支付页 线下付款
* @param param0
* @returns
*/
export async function offlinePayment({orderId, paymentNum, offlinePaymentUrl }) {
let orderInfo = await findOnce(TABLEENUM.订单表, {id:orderId});
if (!orderInfo || !orderInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
if (orderInfo.state == ORDERSTATE.已支付 && orderInfo.confirmReceipt != RECEIPTCONFIRMATION.退回) throw new BizError(ERRORENUM.该订单已支付);
let updateInfo = {
paymentNum,
offlinePaymentUrl,
state:ORDERSTATE.已支付,
paymentMethod:PAYMENTTYPE.线下支付,
payTime:new Date().valueOf(),
confirmReceipt:RECEIPTCONFIRMATION.待确认
};
await updateOneData(TABLEENUM.订单表, {id:orderId}, updateInfo);
return successResult();
}
//1,5去掉了
// /**
// * 初始订单 success
// * 会员管理-待支付页
// */
// export async function firstOrderList({unitName, joinTime, memberType, orderState, pageNumber}) {
// /** 首次订单 并且未通过待支付页的审核 */
// let findParam:any = { "$or":[{isFirst:true, firstPayExamine:false}] };
// if (unitName) findParam.unitName = {"$regex":unitName};
// if (memberType) findParam.memberCategory = memberType;
// if (orderState) findParam.state = orderState;
// let selectFile = ["id", "unitName", "loginId", "phone", "orderCycleStart", "orderCycleEnd", "memberCategory", "state", "userId"];
// let dbList = await findToPage(TABLEENUM.订单表, findParam, selectFile, pageNumber);
// let dataCount = await findCount(TABLEENUM.订单表, findParam);
// let dataList = [];
// let itemFile = ["id", "unitName", "loginId", "phone", "memberCategory", "userId"];
// dbList.forEach(info => {
// let itemData:any = extractData(info, itemFile);
// itemData.joinTime = moment(info.orderCycleStart).format("YYYY-MM-DD");
// itemData.memberType = changeEnumValue(MEMBERTYPE, itemData.memberCategory);
// itemData.paymentMethod = changeEnumValue(MEMBERTYPE, itemData.paymentMethod);
// itemData.cycle = `${moment(info.orderCycleStart).format("YYYY-MM-DD")}至${moment(info.orderCycleEnd).format("YYYY-MM-DD")}`;
// if (info.state == ORDERSTATE.未支付) {
// itemData.state = "未支付";
// } else {
// if (info.paymentMethod == PAYMENTTYPE.银行转账) itemData.state = "银行转账";
// else itemData.state = "已支付";
// }
// dataList.push(itemData);
// });
// return {dataList, dataCount};
// }
//1.5去掉了
// /**
// * 会员管理-待支付页-通过审核 success
// * @param id 订单id
// */
// export async function checkOrder({id}) {
// let orderInfo = await findOnce(TABLEENUM.订单表, {id});
// if (!orderInfo || !orderInfo.id ) throw new BizError(ERRORENUM.目标数据不存在);
// if (!orderInfo.isFirst || orderInfo.firstPayExamine) throw new BizError(ERRORENUM.重复提交);
// await updateOneData(TABLEENUM.订单表, {id}, {firstPayExamine:true, confirmReceipt:RECEIPTCONFIRMATION.待确认});
// return successResult();
// }
// 1.5去掉了
// /**
// * 待支付页 线下付款
// * @param param0
// * @returns
// */
// export async function offlinePayment({orderId, paymentNum, offlinePaymentUrl }) {
// let orderInfo = await findOnce(TABLEENUM.订单表, {id:orderId});
// if (!orderInfo || !orderInfo.id) throw new BizError(ERRORENUM.目标数据不存在);
// if (orderInfo.state == ORDERSTATE.已支付 && orderInfo.confirmReceipt != RECEIPTCONFIRMATION.退回) throw new BizError(ERRORENUM.该订单已支付);
// let updateInfo = {
// paymentNum,
// offlinePaymentUrl,
// state:ORDERSTATE.已支付,
// paymentMethod:PAYMENTTYPE.线下支付,
// payTime:new Date().valueOf(),
// confirmReceipt:RECEIPTCONFIRMATION.待确认
// };
// await updateOneData(TABLEENUM.订单表, {id:orderId}, updateInfo);
// return successResult();
// }
/**
......@@ -168,19 +170,19 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
eccEnumValue("财务核对列表", "会费类别", COSTTYPE, costType );
let findParam:any = {
"$and":[
{ "$or":[{isFirst:false}, {isFirst:true, firstPayExamine:true }] },
],
// "$and":[
// { "$or":[{isFirst:false}, {isFirst:true, firstPayExamine:true }] },
// ],
confirmReceipt:RECEIPTCONFIRMATION.待确认,
state:ORDERSTATE.已支付
}
if (name) findParam["$and"].push({
"$or":[
{unitName:name},
{name},
if (name) {
findParam["$or"] = [
{unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}}
]
});
if (memberType) {
}
if (memberType.length) {
if (memberType < UNITMEMBERTYPE.院校) {
findParam.individualMemberType = {"$in":memberType};
} else {
......@@ -191,12 +193,13 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
if (phone) findParam.phone = phone;
if (mail) findParam.mail = mail;
if (joinStartTime) {
findParam["$and"].push( { "joinTime":{"$gt":joinStartTime} } )
findParam["joinTime"] = {"$gt":joinStartTime};
}
if (joinEndTime) {
findParam["$and"].push( { "joinTime":{"$lt":joinEndTime} } )
if (!findParam["joinTime"]) findParam["joinTime"] = {};
findParam["joinTime"]["$lt"] = joinEndTime;
}
if (memberLevel) findParam.memberLevel = {"$in":memberLevel};
if (memberLevel.length) findParam.memberLevel = {"$in":memberLevel};
if (paymentType) findParam.paymentMethod = paymentType;
if (costType) findParam.isFirst = costType == COSTTYPE.首次;
......@@ -238,7 +241,7 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
export async function confirmReceiptPass({id}) {
let orderInfo = await findOnce(TABLEENUM.订单表, {id});
if (!orderInfo || !orderInfo.id ) throw new BizError(ERRORENUM.目标数据不存在);
if (orderInfo.isFirst && !orderInfo.firstPayExamine ) throw new BizError(ERRORENUM.重复提交, '发票管理-财务核对页-收款确认', `提交通过时订单未通过待支付页的校验`);
// if (orderInfo.isFirst && !orderInfo.firstPayExamine ) throw new BizError(ERRORENUM.重复提交, '发票管理-财务核对页-收款确认', `提交通过时订单未通过待支付页的校验`);
if (orderInfo.confirmReceipt != RECEIPTCONFIRMATION.待确认) throw new BizError(ERRORENUM.重复提交, '发票管理-财务核对页-收款确认', `提交通过时订单已经不是待确认 是${orderInfo.confirmReceipt}`);
let updateInfo:any = {confirmReceipt:RECEIPTCONFIRMATION.收款确认};
......@@ -276,7 +279,7 @@ export async function confirmReceiptPass({id}) {
export async function confirmReceiptOut({id}) {
let orderInfo = await findOnce(TABLEENUM.订单表, {id});
if (!orderInfo || !orderInfo.id ) throw new BizError(ERRORENUM.目标数据不存在);
if (orderInfo.isFirst && !orderInfo.firstPayExamine ) throw new BizError(ERRORENUM.重复提交, '发票管理-财务核对页-收款确认', `提交通过时订单未通过待支付页的校验`);
// if (orderInfo.isFirst && !orderInfo.firstPayExamine ) throw new BizError(ERRORENUM.重复提交, '发票管理-财务核对页-收款确认', `提交通过时订单未通过待支付页的校验`);
if (orderInfo.confirmReceipt != RECEIPTCONFIRMATION.待确认) throw new BizError(ERRORENUM.重复提交, '发票管理-财务核对页-收款确认', `提交通过时订单已经不是待确认 是${orderInfo.confirmReceipt}`);
if (orderInfo.paymentMethod == PAYMENTTYPE.微信支付) throw new BizError(ERRORENUM.微信支付无法被退回);
......@@ -309,16 +312,17 @@ export async function confirmReceiptOut({id}) {
*/
export async function billStateList({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, paymentType, isPay, pageNumber}) {
eccEnumValue("发票列表", "是否支付", ISPAYENUM, isPay );
let findParam:any = {
invoiceStatus:INVOICESTATUS.未开发票
};
if (name) findParam["$or"] = [
{unitName:name},
{name},
if (name) {
findParam["$or"] = [
{unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}}
]
if (memberType) {
}
if (memberType && memberType.length) {
if (memberType < UNITMEMBERTYPE.院校) {
findParam.individualMemberType = {"$in":memberType};
} else {
......@@ -329,12 +333,13 @@ export async function billStateList({name, memberType, documentId, phone, mail,
if (phone) findParam.phone = phone;
if (mail) findParam.mail = mail;
if (joinStartTime) {
findParam["$and"].push( { "joinTime":{"$gt":joinStartTime} } )
findParam["joinTime"] = {"$gt":joinStartTime};
}
if (joinEndTime) {
findParam["$and"].push( { "joinTime":{"$lt":joinEndTime} } )
if (!findParam["joinTime"]) findParam["joinTime"] = {};
findParam["joinTime"]["$lt"] = joinEndTime;
}
if (memberLevel) findParam.memberLevel = {"$in":memberLevel};
if (memberLevel.length) findParam.memberLevel = {"$in":memberLevel};
if (paymentType) {
eccEnumValue("发票列表", "支付类型", PAYMENTTYPE, paymentType);
findParam.paymentMethod = paymentType;
......@@ -431,11 +436,13 @@ export async function invoicedList({name, memberType, documentId, phone, mail, j
let findParam:any = {
invoiceStatus:INVOICESTATUS.已开发票
};
if (name) findParam["$or"] = [
{unitName:name},
{name},
if (name) {
findParam["$or"] = [
{unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}}
]
if (memberType) {
}
if (memberType && memberType.length) {
if (memberType < UNITMEMBERTYPE.院校) {
findParam.individualMemberType = {"$in":memberType};
} else {
......@@ -446,12 +453,13 @@ export async function invoicedList({name, memberType, documentId, phone, mail, j
if (phone) findParam.phone = phone;
if (mail) findParam.mail = mail;
if (joinStartTime) {
findParam["$and"].push( { "joinTime":{"$gt":joinStartTime} } )
findParam["joinTime"] = {"$gt":joinStartTime};
}
if (joinEndTime) {
findParam["$and"].push( { "joinTime":{"$lt":joinEndTime} } )
if (!findParam["joinTime"]) findParam["joinTime"] = {};
findParam["joinTime"]["$lt"] = joinEndTime;
}
if (memberLevel) findParam.memberLevel = {"$in":memberLevel};
if (memberLevel && memberLevel.length) findParam.memberLevel = {"$in":memberLevel};
if (paymentType) findParam.paymentMethod = paymentType;
if (isPay) findParam.state = isPay
......
src/biz/register.ts
......@@ -2,7 +2,7 @@
* 注册流程 success
*/
import { BANXUELEIXING, CODETYPE, DOCUMENTTYPE, MEMBERLEVEL, MEMBERTYPE, NATION, OPERATIONREHAVIOR, PROFCATEGORY, REGISTERFLOW, SEX, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../config/enum";
import { BANXUELEIXING, CODETYPE, DOCUMENTTYPE, INDIVIDUALMEMBERTYPE, MEMBERLEVEL, MEMBERTYPE, NATION, OPERATIONREHAVIOR, PROFCATEGORY, REGISTERFLOW, SEX, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../config/enum";
import { ERRORENUM } from "../config/errorEnum";
import { addManyData, addOneData } from "../data/add";
import { deleteManyData } from "../data/delete";
......@@ -51,9 +51,9 @@ export async function memberRegister1({form}) {
memberType:MEMBERTYPE.个人会员,
isAdmin:STATE.否,
registerFlow:REGISTERFLOW.完成第一步,//会员注册流程状态
askForTime:NowMs,//申请时间
loginId, mail, pwd, phone,
token
token,
individualMemberType:INDIVIDUALMEMBERTYPE.普通会员
};
await addOneData(TABLEENUM.用户表, addInfo);
......@@ -98,6 +98,7 @@ export async function memberRegister2({form, id}) {
//更新注册流程
form.registerFlow = REGISTERFLOW.完成第二步;
form.askForTime = new Date().valueOf();
await updateOneData(TABLEENUM.用户表, {userId:id}, form);
/**提交审批历史信息 */
......@@ -236,7 +237,7 @@ export async function unitMemberRegister3({application, id}) {
remarks = "重新提交";
}
await updateOneData(TABLEENUM.用户表, {userId:id}, {userRegisterState, applicationForm:application, registerFlow:REGISTERFLOW.完成第三步});
await updateOneData(TABLEENUM.用户表, {userId:id}, {userRegisterState, applicationForm:application, registerFlow:REGISTERFLOW.完成第三步, askForTime : new Date().valueOf()});
/**提交审批历史信息 */
let addApprovalHistory = {
......@@ -244,7 +245,7 @@ export async function unitMemberRegister3({application, id}) {
userId:id,
operationTime: new Date().valueOf(),
operationBehavior:operationBehavior,
remarks:`单位会员${remarks}`
remarks:`单位会员${remarks}`,
};
await addManyData(TABLEENUM.审批历史表, addApprovalHistory);
......
src/main.ts
......@@ -3,7 +3,7 @@ import { initSMS } from "./biz/sms";
import { initSystemTask } from "./biz/task";
import { initConfig, systemConfig} from "./config/serverConfig";
import { initDataBaseModel } from "./data/db/db";
import { test1, initOrderData } from "./dataScript";
import { test1 } from "./dataScript";
import { httpServer } from "./net/http_server";
async function lanuch() {
......
src/routers/member/router.ts
......@@ -277,7 +277,7 @@ export const Config = {
{key:"name", type:"String", desc:"姓名", isNull:true},
{key:"documentId", type:"String", desc:"身份证", isNull:true},
{key:"phone", type:"String", desc:"手机号", isNull:true},
{key:"mail", type:"Number", 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},
......
src/routers/order/router.ts
......@@ -4,36 +4,36 @@ export const FirstName = '会费相关';
export const FirstRouter = '/manage/cost';
export const Config = {
"审批管理":[
{
apiName:"待支付列表",
subUrl:'/order/fist/list',
param:[
{key:"unitName", type:"String", desc:"单位名称", isNull:true},
{key:"joinTime", type:"Number", desc:"入会时间 时间戳", isNull:true},
{key:"memberType", type:"Number", desc:"会员类别 枚举参考公用组件", isNull:true},
{key:"orderState", type:"Number", desc:"支付状态", isNull:true},
{key:"pageNumber", type:"Number", desc:"分页-当前页面"}
],
bindBiz:orderBiz.firstOrderList
},
{
apiName:"确认待支付",
subUrl:'/order/fist/pass',
param:[
{key:"id", type:"String", desc:"订单标识"},
],
bindBiz:orderBiz.checkOrder
},
{
apiName:"待支付线下支付",
subUrl:'/order/fist/offlinepayment',
param:[
{key:"orderId", type:"String", desc:"订单标识"},
{key:"paymentNum", type:"String", desc:"转账单号"},
{key:"offlinePaymentUrl", type:"String", desc:"转账截图"},
],
bindBiz:orderBiz.offlinePayment
}
// {
// apiName:"待支付列表",
// subUrl:'/order/fist/list',
// param:[
// {key:"unitName", type:"String", desc:"单位名称", isNull:true},
// {key:"joinTime", type:"Number", desc:"入会时间 时间戳", isNull:true},
// {key:"memberType", type:"Number", desc:"会员类别 枚举参考公用组件", isNull:true},
// {key:"orderState", type:"Number", desc:"支付状态", isNull:true},
// {key:"pageNumber", type:"Number", desc:"分页-当前页面"}
// ],
// bindBiz:orderBiz.firstOrderList
// },
// {
// apiName:"确认待支付",
// subUrl:'/order/fist/pass',
// param:[
// {key:"id", type:"String", desc:"订单标识"},
// ],
// bindBiz:orderBiz.checkOrder
// },
// {
// apiName:"待支付线下支付",
// subUrl:'/order/fist/offlinepayment',
// param:[
// {key:"orderId", type:"String", desc:"订单标识"},
// {key:"paymentNum", type:"String", desc:"转账单号"},
// {key:"offlinePaymentUrl", type:"String", desc:"转账截图"},
// ],
// bindBiz:orderBiz.offlinePayment
// }
],
"发票管理":[
{
......
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