Skip to content

W
wenHuaBu_adminServer
Commit d278dbe8 by lixinming
Options

no message

parent 6887990a
Showing with 59 additions and 39 deletions
src/biz/member/apply.ts
...@@ -34,8 +34,8 @@ export async function applyList({name, joinStartTime, joinEndTime, memberCategor ...@@ -34,8 +34,8 @@ export async function applyList({name, joinStartTime, joinEndTime, memberCategor
if (name) { if (name) {
selectParam["$and"] = [{ selectParam["$and"] = [{
"$or":[ "$or":[
{unitName:{"$regex":`${name}`}, memberType:MEMBERTYPE.单位会员}, {unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}, memberType:MEMBERTYPE.个人会员} {name:{"$regex":`${name}`}}
] ]
}] }]
} }
......
src/biz/member/blacklist.ts
...@@ -42,7 +42,9 @@ export async function blackList({name, joinStartTime, joinEndTime, memberType, m ...@@ -42,7 +42,9 @@ export async function blackList({name, joinStartTime, joinEndTime, memberType, m
isBlackUser: STATE.是 isBlackUser: STATE.是
}; };
if (name) selectParam["$or"] = [{name:name}, {unitName:name}]; if (name) {
selectParam["$or"] = [{name:{"$regex":name}}, {unitName:{"$regex":name}}];
}
if (joinStartTime) { if (joinStartTime) {
selectParam["joinTime"] = {"$gt":joinStartTime}; selectParam["joinTime"] = {"$gt":joinStartTime};
}; };
...@@ -50,7 +52,10 @@ export async function blackList({name, joinStartTime, joinEndTime, memberType, m ...@@ -50,7 +52,10 @@ export async function blackList({name, joinStartTime, joinEndTime, memberType, m
if (!selectParam["joinTime"]) selectParam["joinTime"] = {}; if (!selectParam["joinTime"]) selectParam["joinTime"] = {};
selectParam["joinTime"]["$lt"] = joinEndTime; selectParam["joinTime"]["$lt"] = joinEndTime;
}; };
if (memberType && memberType.length) selectParam["$or"] = [ {unitMemberType:{"$in":memberType}}, {individualMemberType:{"$in":memberType}} ]; if (memberType && memberType.length) {
selectParam["$and"] = [];
selectParam["$and"].push({["$or"] : [ {unitMemberType:{"$in":memberType}}, {individualMemberType:{"$in":memberType}} ]});
}
if (memberLevel && memberLevel.length) selectParam.memberLevel = {"$in":memberLevel}; if (memberLevel && memberLevel.length) selectParam.memberLevel = {"$in":memberLevel};
if (session) selectParam.session = session; if (session) selectParam.session = session;
if (sheng) selectParam.sheng = sheng; if (sheng) selectParam.sheng = sheng;
......
src/biz/member/examine.ts
...@@ -74,21 +74,22 @@ export async function pendingReviewList({name, memberType, documentId, phone, ma ...@@ -74,21 +74,22 @@ export async function pendingReviewList({name, memberType, documentId, phone, ma
]} ]}
); );
} else { } else {
if (!selectParam["$or"]) selectParam["$or"] = [];
if (memberType.indexOf(MEMBERTYPE.个人会员) > -1) { if (memberType.indexOf(MEMBERTYPE.个人会员) > -1) {
// selectParam.memberType = MEMBERTYPE.个人会员; // selectParam.memberType = MEMBERTYPE.个人会员;
selectParam["$or"] = [ selectParam["$or"].push(
{ 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 {//单位 if (memberType.indexOf(UNITMEMBERTYPE.其他) > -1 || memberType.indexOf(UNITMEMBERTYPE.机构) > -1 || memberType.indexOf(UNITMEMBERTYPE.院校) > -1) {//单位
// selectParam.unitMemberType = {"$in":memberType}; // selectParam.unitMemberType = {"$in":memberType};
selectParam["$or"] = [ selectParam["$or"].push(
{ unitMemberType:{"$in":memberType}, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第三步 }, { unitMemberType:{"$in":memberType}, userRegisterState:USERREGISTERSTATE.待审核, registerFlow:REGISTERFLOW.完成第三步 },
{ unitMemberType:{"$in":memberType}, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 }, { unitMemberType:{"$in":memberType}, userRegisterState:USERREGISTERSTATE.驳回修改, registerFlow:REGISTERFLOW.完成第一步 },
{ unitMemberType:{"$in":memberType}, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第三步 }, { unitMemberType:{"$in":memberType}, userRegisterState:USERREGISTERSTATE.重新提交, registerFlow:REGISTERFLOW.完成第三步 },
]; );
} }
} }
...@@ -159,9 +160,16 @@ export async function adopt({id, session}) { ...@@ -159,9 +160,16 @@ export async function adopt({id, session}) {
let userCount = await findCount(TABLEENUM.用户表, {isAdmin:0, memberType:userInfo.memberType, userRegisterState:USERREGISTERSTATE.通过}); let userCount = await findCount(TABLEENUM.用户表, {isAdmin:0, memberType:userInfo.memberType, userRegisterState:USERREGISTERSTATE.通过});
let memberNum = getMenberNum(thisDate, userInfo.sheng, userCount, userInfo.memberType); let memberNum = getMenberNum(thisDate, userInfo.sheng, userCount, userInfo.memberType);
let joinTime = 0;
let sessionDate = getSessionByEdition(Math.floor(session/100),Math.floor(session%100));
if (sessionDate) {
joinTime = sessionDate.timeMs;
} else {
joinTime = new Date().valueOf();
}
let updateInfo:any = { let updateInfo:any = {
auditTime:NowMs, auditTime:NowMs,
joinTime:getSessionByEdition(Math.floor(session/100),Math.floor(session%100)), joinTime,
userRegisterState:USERREGISTERSTATE.通过, userRegisterState:USERREGISTERSTATE.通过,
session:session, session:session,
paymentStatus:PAYMENTSTATUS.未支付, paymentStatus:PAYMENTSTATUS.未支付,
...@@ -234,9 +242,17 @@ export async function batchAdopt({idList, session}) { ...@@ -234,9 +242,17 @@ export async function batchAdopt({idList, session}) {
let userCount = await findCount(TABLEENUM.用户表, {isAdmin:0, memberType:userInfo.memberType, userRegisterState:USERREGISTERSTATE.通过}); let userCount = await findCount(TABLEENUM.用户表, {isAdmin:0, memberType:userInfo.memberType, userRegisterState:USERREGISTERSTATE.通过});
let memberNum = getMenberNum(thisDate, userInfo.sheng, userCount, userInfo.memberType); let memberNum = getMenberNum(thisDate, userInfo.sheng, userCount, userInfo.memberType);
let joinTime = 0;
let sessionDate = getSessionByEdition(Math.floor(session/100),Math.floor(session%100));
if (sessionDate) {
joinTime = sessionDate.timeMs;
} else {
joinTime = new Date().valueOf();
}
let updateInfo:any = { let updateInfo:any = {
auditTime:NowMs, auditTime:NowMs,
joinTime:getSessionByEdition(Math.floor(session/100),Math.floor(session%100)), joinTime,
userRegisterState:USERREGISTERSTATE.通过, userRegisterState:USERREGISTERSTATE.通过,
session:session, session:session,
paymentStatus:PAYMENTSTATUS.未支付, paymentStatus:PAYMENTSTATUS.未支付,
......
src/biz/member/homePage.ts
...@@ -338,9 +338,9 @@ export async function getCertificateType({userId}) { ...@@ -338,9 +338,9 @@ export async function getCertificateType({userId}) {
cefaInfo = { cefaInfo = {
memberLevel:changeEnumValue(MEMBERLEVEL, userInfo.memberLevel), memberLevel:changeEnumValue(MEMBERLEVEL, userInfo.memberLevel),
name, name,
applyApplicationTime: "" applyApplicationTime: moment().format("YYYY年MM月DD日")
} }
if (userInfo.applyApplicationTime) cefaInfo.applyApplicationTime = moment(userInfo.applyApplicationTime).format("YYYY年MM月DD日") // if (userInfo.applyApplicationTime) cefaInfo.applyApplicationTime = moment(userInfo.applyApplicationTime).format("YYYY年MM月DD日")
msg = ``; msg = ``;
} }
} else if (userInfo.changeApplyType == CHANGEAPPLYTYPE.注册信息待补充) { } else if (userInfo.changeApplyType == CHANGEAPPLYTYPE.注册信息待补充) {
...@@ -357,9 +357,9 @@ export async function getCertificateType({userId}) { ...@@ -357,9 +357,9 @@ export async function getCertificateType({userId}) {
cefaInfo = { cefaInfo = {
memberLevel:changeEnumValue(MEMBERLEVEL, userInfo.memberLevel), memberLevel:changeEnumValue(MEMBERLEVEL, userInfo.memberLevel),
name, name,
applyApplicationTime: "" applyApplicationTime: moment().format("YYYY年MM月DD日")
} }
if (userInfo.applyApplicationTime) cefaInfo.applyApplicationTime = moment(userInfo.applyApplicationTime).format("YYYY年MM月DD日") // if (userInfo.applyApplicationTime) cefaInfo.applyApplicationTime = moment(userInfo.applyApplicationTime).format("YYYY年MM月DD日")
msg = ``; msg = ``;
} }
} }
......
src/biz/member/order.ts
...@@ -454,7 +454,7 @@ export async function billStateList({name, memberType, documentId, phone, mail, ...@@ -454,7 +454,7 @@ export async function billStateList({name, memberType, documentId, phone, mail,
findParam.paymentMethod = paymentType; findParam.paymentMethod = paymentType;
} }
if (isPay) findParam.state = isPay; if (isPay) findParam.state = isPay;
if (weChartPR) findParam.weChartPR = {"$regex":`${weChartPR}`}; if (weChartPR) findParam.paymentNum = {"$regex":`${weChartPR}`};
let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "state", "paymentNum", "userId", "desc", "invoiceMail", "weChartCreatePayMs"]; let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "state", "paymentNum", "userId", "desc", "invoiceMail", "weChartCreatePayMs"];
let dbList = await findToPage(TABLEENUM.订单表, findParam, selectFile, pageNumber); let dbList = await findToPage(TABLEENUM.订单表, findParam, selectFile, pageNumber);
......
src/biz/register.ts
...@@ -363,8 +363,8 @@ export async function unitMemberEcho2({id}) { ...@@ -363,8 +363,8 @@ export async function unitMemberEcho2({id}) {
let unitInfo:any = extractData(oldInfo, UnitConfig); let unitInfo:any = extractData(oldInfo, UnitConfig);
delete basicInfo.userId; delete basicInfo.userId;
/**处理枚举值 */ /**处理枚举值 */
if (unitInfo.unitMemberType) unitInfo.unitMemberType = changeEnumValue(UNITMEMBERTYPE, unitInfo.unitMemberType); // if (unitInfo.unitMemberType) unitInfo.unitMemberType = changeEnumValue(UNITMEMBERTYPE, unitInfo.unitMemberType);
if (unitInfo.yuanXiaoBanXueLeiXing) unitInfo.yuanXiaoBanXueLeiXing = changeEnumValue(BANXUELEIXING, unitInfo.yuanXiaoBanXueLeiXing); // if (unitInfo.yuanXiaoBanXueLeiXing) unitInfo.yuanXiaoBanXueLeiXing = changeEnumValue(BANXUELEIXING, unitInfo.yuanXiaoBanXueLeiXing);
let oldKeYanList = await find(TABLEENUM.单位所获得科研成果表, {userId:id}); let oldKeYanList = await find(TABLEENUM.单位所获得科研成果表, {userId:id});
let scientificResearch = []; let scientificResearch = [];
...@@ -372,7 +372,6 @@ export async function unitMemberEcho2({id}) { ...@@ -372,7 +372,6 @@ export async function unitMemberEcho2({id}) {
let item = extractData(info, ["id", "startTime", "endTime", "describe"]); let item = extractData(info, ["id", "startTime", "endTime", "describe"]);
scientificResearch.push(item); scientificResearch.push(item);
}); });
return {basicInfo, unitInfo, scientificResearch}; return {basicInfo, unitInfo, scientificResearch};
} }
......
src/config/serverConfig.ts
...@@ -7,26 +7,26 @@ const os = require('os'); ...@@ -7,26 +7,26 @@ const os = require('os');
export let systemConfig = new ServerConfig; export let systemConfig = new ServerConfig;
export const SessionTimeMsConfig = { export const SessionTimeMsConfig = {
"五_一":{activTime:'2013-3-30 08:00:00', timeMs:new Date('2013-3-30 08:00:00').valueOf()}, "5_1":{activTime:'2013-3-30 08:00:00', timeMs:new Date('2013-3-30 08:00:00').valueOf()},
"五_二":{activTime:'2014-4-24 08:00:00', timeMs:new Date('2014-4-24 08:00:00').valueOf()}, "5_2":{activTime:'2014-4-24 08:00:00', timeMs:new Date('2014-4-24 08:00:00').valueOf()},
"五_三":{activTime:'2015-4-10 08:00:00', timeMs:new Date('2015-4-10 08:00:00').valueOf()}, "5_3":{activTime:'2015-4-10 08:00:00', timeMs:new Date('2015-4-10 08:00:00').valueOf()},
"五_四":{activTime:'2015-11-4 08:00:00', timeMs:new Date('2015-11-4 08:00:00').valueOf()}, "5_4":{activTime:'2015-11-4 08:00:00', timeMs:new Date('2015-11-4 08:00:00').valueOf()},
"五_五":{activTime:'2016-4-22 08:00:00', timeMs:new Date('2016-4-22 08:00:00').valueOf()}, "5_5":{activTime:'2016-4-22 08:00:00', timeMs:new Date('2016-4-22 08:00:00').valueOf()},
"五_六":{activTime:'2016-12-15 08:00:00', timeMs:new Date('2016-12-15 08:00:00').valueOf()}, "5_6":{activTime:'2016-12-15 08:00:00', timeMs:new Date('2016-12-15 08:00:00').valueOf()},
"五_七":{activTime:'2017-4-6 08:00:00', timeMs:new Date('2017-4-6 08:00:00').valueOf()}, "5_7":{activTime:'2017-4-6 08:00:00', timeMs:new Date('2017-4-6 08:00:00').valueOf()},
"六_一":{activTime:'2017-6-24 08:00:00', timeMs:new Date('2017-6-24 08:00:00').valueOf()}, "6_1":{activTime:'2017-6-24 08:00:00', timeMs:new Date('2017-6-24 08:00:00').valueOf()},
"六_二":{activTime:'2017-11-28 08:00:00', timeMs:new Date('2017-11-28 08:00:00').valueOf()}, "6_2":{activTime:'2017-11-28 08:00:00', timeMs:new Date('2017-11-28 08:00:00').valueOf()},
"六_三":{activTime:'2018-3-26 08:00:00', timeMs:new Date('2018-3-26 08:00:00').valueOf()}, "6_3":{activTime:'2018-3-26 08:00:00', timeMs:new Date('2018-3-26 08:00:00').valueOf()},
"六_四":{activTime:'2018-12-8 08:00:00', timeMs:new Date('2018-12-8 08:00:00').valueOf()}, "6_4":{activTime:'2018-12-8 08:00:00', timeMs:new Date('2018-12-8 08:00:00').valueOf()},
"六_五":{activTime:'2019-3-28 08:00:00', timeMs:new Date('2019-3-28 08:00:00').valueOf()}, "6_5":{activTime:'2019-3-28 08:00:00', timeMs:new Date('2019-3-28 08:00:00').valueOf()},
"六_六":{activTime:'2019-10-25 08:00:00', timeMs:new Date('2019-10-25 08:00:00').valueOf()}, "6_6":{activTime:'2019-10-25 08:00:00', timeMs:new Date('2019-10-25 08:00:00').valueOf()},
"六_七":{activTime:'2020-12-19 08:00:00', timeMs:new Date('2020-12-19 08:00:00').valueOf()}, "6_7":{activTime:'2020-12-19 08:00:00', timeMs:new Date('2020-12-19 08:00:00').valueOf()},
"六_八":{activTime:'2021-4-23 08:00:00', timeMs:new Date('2021-4-23 08:00:00').valueOf()}, "6_8":{activTime:'2021-4-23 08:00:00', timeMs:new Date('2021-4-23 08:00:00').valueOf()},
"六_九":{activTime:'2021-12-3 08:00:00', timeMs:new Date('2021-12-3 08:00:00').valueOf()}, "6_9":{activTime:'2021-12-3 08:00:00', timeMs:new Date('2021-12-3 08:00:00').valueOf()},
"六_十":{activTime:'2022-12-27 08:00:00', timeMs:new Date('2022-12-27 08:00:00').valueOf()}, "6_10":{activTime:'2022-12-27 08:00:00', timeMs:new Date('2022-12-27 08:00:00').valueOf()},
"七_一":{activTime:'2023-6-10 08:00:00', timeMs:new Date('2023-6-10 08:00:00').valueOf()}, "7_1":{activTime:'2023-6-10 08:00:00', timeMs:new Date('2023-6-10 08:00:00').valueOf()},
"七_二":{activTime:'2023-11-13 08:00:00', timeMs:new Date('2023-11-13 08:00:00').valueOf()}, "7_2":{activTime:'2023-11-13 08:00:00', timeMs:new Date('2023-11-13 08:00:00').valueOf()},
"七_三":{activTime:'2024-5-11 08:00:00', timeMs:new Date('2024-5-11 08:00:00').valueOf()} "7_3":{activTime:'2024-5-11 08:00:00', timeMs:new Date('2024-5-11 08:00:00').valueOf()}
} }
const ConfigName = "serverConfig.xml"; const ConfigName = "serverConfig.xml";
......
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