Skip to content

W
wenHuaBu_adminServer
Commit 4d1c5323 by chenjinjing
Options

no message

parent 4395db5d
Showing with 36 additions and 33 deletions
src/biz/member/memberFees.ts
...@@ -177,13 +177,14 @@ export async function getPaid({name, memberType, documentId, phone, mail, joinSt ...@@ -177,13 +177,14 @@ export async function getPaid({name, memberType, documentId, phone, mail, joinSt
{name:{"$regex":`${name}`}} {name:{"$regex":`${name}`}}
] ]
} }
if (memberType.length) { // if (memberType.length) {
if (memberType < UNITMEMBERTYPE.院校) { // if (memberType < UNITMEMBERTYPE.院校) {
selectParam.individualMemberType = {"$in":memberType}; // selectParam.individualMemberType = {"$in":memberType};
} else { // } else {
selectParam.unitMemberType = {"$in":memberType}; // selectParam.unitMemberType = {"$in":memberType};
} // }
} // }
if (memberType && memberType.length) selectParam["$or"] = [ {unitMemberType:{"$in":memberType}}, {individualMemberType:{"$in":memberType}} ];
if (documentId) selectParam.documentId = documentId; if (documentId) selectParam.documentId = documentId;
if (phone) selectParam.phone = phone; if (phone) selectParam.phone = phone;
if (mail) selectParam.mail = mail; if (mail) selectParam.mail = mail;
...@@ -208,10 +209,10 @@ export async function getPaid({name, memberType, documentId, phone, mail, joinSt ...@@ -208,10 +209,10 @@ export async function getPaid({name, memberType, documentId, phone, mail, joinSt
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")}`; //会员有效期
item.nextPayment = moment(info.lifespanEndTime).format("YYYY-MM-DD"); //下次缴费时间 item.nextPayment = moment(info.lifespanEndTime).format("YYYY-MM-DD"); //下次缴费时间
// item.nextLifespanTime = "大于90天"; item.nextLifespanTime = "大于90天";
item.joinTime = moment(item.joinTime).format("YYYY-MM-DD"); item.joinTime = moment(item.joinTime).format("YYYY-MM-DD");
item.memberState = changeEnumValue(MEMBERSTATE, item.memberState); item.memberState = changeEnumValue(MEMBERSTATE, item.memberState);
item.memberLevel = changeEnumValue(MEMBERLEVEL, memberLevel); item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel);
if(info.individualMemberType) { if(info.individualMemberType) {
item.memberType = changeEnumValue(MEMBERTYPEECCENUM, info.individualMemberType); item.memberType = changeEnumValue(MEMBERTYPEECCENUM, info.individualMemberType);
} }
...@@ -296,13 +297,14 @@ export async function unpaidList({name, memberType, documentId, phone, mail, joi ...@@ -296,13 +297,14 @@ export async function unpaidList({name, memberType, documentId, phone, mail, joi
if (!selectParam["joinTime"]) selectParam["joinTime"] = {}; if (!selectParam["joinTime"]) selectParam["joinTime"] = {};
selectParam["joinTime"]["$lt"] = joinEndTime; selectParam["joinTime"]["$lt"] = joinEndTime;
} }
if (memberType.length) { // if (memberType.length) {
if (memberType < UNITMEMBERTYPE.院校) { // if (memberType < UNITMEMBERTYPE.院校) {
selectParam.individualMemberType = {"$in":memberType}; // selectParam.individualMemberType = {"$in":memberType};
} else { // } else {
selectParam.unitMemberType = {"$in":memberType}; // selectParam.unitMemberType = {"$in":memberType};
} // }
} // }
if (memberType && memberType.length) selectParam["$or"] = [ {unitMemberType:{"$in":memberType}}, {individualMemberType:{"$in":memberType}} ];
// const SelectFiles = ["userId", "memberState", "unitName", "loginId", "phone", "joinTime", "memberType", "lifespanStartTime", "lifespanEndTime", "individualMemberType", // const SelectFiles = ["userId", "memberState", "unitName", "loginId", "phone", "joinTime", "memberType", "lifespanStartTime", "lifespanEndTime", "individualMemberType",
// "unitMemberType"]; // "unitMemberType"];
...@@ -324,7 +326,7 @@ export async function unpaidList({name, memberType, documentId, phone, mail, joi ...@@ -324,7 +326,7 @@ export async function unpaidList({name, memberType, documentId, phone, mail, joi
item.joinTime = moment(item.joinTime).format("YYYY-MM-DD"); item.joinTime = moment(item.joinTime).format("YYYY-MM-DD");
item.memberState = changeEnumValue(MEMBERSTATE, item.memberState); item.memberState = changeEnumValue(MEMBERSTATE, item.memberState);
item.memberLevel = changeEnumValue(MEMBERLEVEL, memberLevel); item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel);
if(info.individualMemberType) { if(info.individualMemberType) {
item.memberType = changeEnumValue(MEMBERTYPEECCENUM, info.individualMemberType); item.memberType = changeEnumValue(MEMBERTYPEECCENUM, info.individualMemberType);
} }
...@@ -392,13 +394,14 @@ export async function getRenewalPeriod({name, memberType, documentId, phone, mai ...@@ -392,13 +394,14 @@ export async function getRenewalPeriod({name, memberType, documentId, phone, mai
if (!selectParam["joinTime"]) selectParam["joinTime"] = {}; if (!selectParam["joinTime"]) selectParam["joinTime"] = {};
selectParam["joinTime"]["$lt"] = joinEndTime; selectParam["joinTime"]["$lt"] = joinEndTime;
} }
if (memberType.length) { // if (memberType.length) {
if (memberType < UNITMEMBERTYPE.院校) { // if (memberType < UNITMEMBERTYPE.院校) {
selectParam.individualMemberType = {"$in":memberType}; // selectParam.individualMemberType = {"$in":memberType};
} else { // } else {
selectParam.unitMemberType = {"$in":memberType}; // selectParam.unitMemberType = {"$in":memberType};
} // }
} // }
if (memberType && memberType.length) selectParam["$or"] = [ {unitMemberType:{"$in":memberType}}, {individualMemberType:{"$in":memberType}} ];
if (documentId) selectParam.documentId = documentId; if (documentId) selectParam.documentId = documentId;
if (phone) selectParam.phone = phone; if (phone) selectParam.phone = phone;
if (mail) selectParam.mail = mail; if (mail) selectParam.mail = mail;
...@@ -564,13 +567,14 @@ export async function getGracePeriod({name, memberType, documentId, phone, mail, ...@@ -564,13 +567,14 @@ export async function getGracePeriod({name, memberType, documentId, phone, mail,
if (!selectParam["joinTime"]) selectParam["joinTime"] = {}; if (!selectParam["joinTime"]) selectParam["joinTime"] = {};
selectParam["joinTime"]["$lt"] = joinEndTime; selectParam["joinTime"]["$lt"] = joinEndTime;
} }
if (memberType.length) { // if (memberType.length) {
if (memberType < UNITMEMBERTYPE.院校) { // if (memberType < UNITMEMBERTYPE.院校) {
selectParam.individualMemberType = {"$in":memberType}; // selectParam.individualMemberType = {"$in":memberType};
} else { // } else {
selectParam.unitMemberType = {"$in":memberType}; // selectParam.unitMemberType = {"$in":memberType};
} // }
} // }
if (memberType && memberType.length) selectParam["$or"] = [ {unitMemberType:{"$in":memberType}}, {individualMemberType:{"$in":memberType}} ];
if (documentId) selectParam.documentId = documentId; if (documentId) selectParam.documentId = documentId;
if (phone) selectParam.phone = phone; if (phone) selectParam.phone = phone;
if (mail) selectParam.mail = mail; if (mail) selectParam.mail = mail;
...@@ -594,7 +598,7 @@ export async function getGracePeriod({name, memberType, documentId, phone, mail, ...@@ -594,7 +598,7 @@ export async function getGracePeriod({name, memberType, documentId, phone, mail,
item.nextLifespanTime = "宽限期中"; item.nextLifespanTime = "宽限期中";
item.joinTime = moment(item.joinTime).format("YYYY-MM-DD"); item.joinTime = moment(item.joinTime).format("YYYY-MM-DD");
item.memberState = changeEnumValue(MEMBERSTATE, item.memberState); item.memberState = changeEnumValue(MEMBERSTATE, item.memberState);
item.memberLevel = changeEnumValue(MEMBERLEVEL, memberLevel); item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel);
if(info.individualMemberType) { if(info.individualMemberType) {
item.memberType = changeEnumValue(MEMBERTYPEECCENUM, info.individualMemberType); item.memberType = changeEnumValue(MEMBERTYPEECCENUM, info.individualMemberType);
} }
......
src/routers/member/router.ts
...@@ -602,7 +602,6 @@ export const Config = { ...@@ -602,7 +602,6 @@ export const Config = {
], ],
"会费管理":[ "会费管理":[
{ {
apiName:"会费管理导出", apiName:"会费管理导出",
subUrl:'/memberfees/outputdata', subUrl:'/memberfees/outputdata',
param:[ param:[
......
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