Skip to content

W
wenHuaBu_adminServer
Commit 0c9f1af1 by chenjinjing
Options

no message

parent 9e9ce195
Showing with 217 additions and 56 deletions
src/biz/mail.ts
...@@ -145,6 +145,7 @@ function getModel(name, type) { ...@@ -145,6 +145,7 @@ function getModel(name, type) {
* @returns * @returns
*/ */
export async function sendMail({id, type}) { export async function sendMail({id, type}) {
return;
eccEnumValue("发送邮件", "邮件类型", CLIENTMAILTYPE, type); eccEnumValue("发送邮件", "邮件类型", CLIENTMAILTYPE, type);
let userInfo = await findOnce(TABLEENUM.用户表, {userId:id}, ["userId", "name", "unitName", "memberType", "mail"]); let userInfo = await findOnce(TABLEENUM.用户表, {userId:id}, ["userId", "name", "unitName", "memberType", "mail"]);
......
src/biz/member/examine.ts
...@@ -507,8 +507,8 @@ export async function batchAdopt({idList, session}) { ...@@ -507,8 +507,8 @@ export async function batchAdopt({idList, session}) {
userRegisterState:USERREGISTERSTATE.通过, userRegisterState:USERREGISTERSTATE.通过,
session:session, session:session,
paymentStatus:PAYMENTSTATUS.未支付, paymentStatus:PAYMENTSTATUS.未支付,
lifespanStartTime:NowMs, lifespanStartTime:joinTime,
lifespanEndTime:NowMs + 1000, lifespanEndTime:joinTime + 1000,
memberLevel:MEMBERLEVEL.普通会员, memberLevel:MEMBERLEVEL.普通会员,
memberState:MEMBERSTATE.异常, memberState:MEMBERSTATE.异常,
memberNum memberNum
......
src/biz/member/finance/costVerification.ts
...@@ -32,7 +32,7 @@ import { systemSendMail } from "../../mail"; ...@@ -32,7 +32,7 @@ import { systemSendMail } from "../../mail";
* @param costType 会费类别 * @param costType 会费类别
* @param pageNumber 当前页 * @param pageNumber 当前页
*/ */
export async function paidList({name, memberType, documentId, phone, mail, joinStartTime, session, joinEndTime, memberLevel, payType, paymentNum,pageSize, pageNumber, examineState}) { export async function paidList({name, memberType, documentId, phone, mail, joinStartTime, session, joinEndTime, memberLevel, payType, paymentNum,pageSize, pageNumber, examineState, backgroundUpload}) {
if (payType != 1 && payType != 2 && payType != 3) throw new BizError(ERRORENUM.参数错误); if (payType != 1 && payType != 2 && payType != 3) throw new BizError(ERRORENUM.参数错误);
// eccEnumValue("财务核对列表", "会费类别", COSTTYPE, costType ); // eccEnumValue("财务核对列表", "会费类别", COSTTYPE, costType );
...@@ -40,11 +40,15 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS ...@@ -40,11 +40,15 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
state:ORDERSTATE.已支付 state:ORDERSTATE.已支付
}; };
if (payType == 1) { if (payType == 1) {
findParam.paymentMethod = PAYMENTTYPE.微信支付; findParam.paymentMethod = PAYMENTTYPE.微信支付;
} else if (payType == 2) { } else if (payType == 2) {
findParam.paymentMethod = {"$ne":PAYMENTTYPE.微信支付}; if (backgroundUpload == null) {
findParam.paymentMethod = {"$ne":PAYMENTTYPE.微信支付};
} else {
if (backgroundUpload == STATE.是) findParam.paymentMethod = PAYMENTTYPE.后台上传;
else if (backgroundUpload == STATE.否) findParam.paymentMethod = PAYMENTTYPE.银行转账;
}
} }
if (examineState) { if (examineState) {
...@@ -132,7 +136,13 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS ...@@ -132,7 +136,13 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
itemData.joinTime = moment(info.orderCycleStart).format("YYYY-MM-DD"); itemData.joinTime = moment(info.orderCycleStart).format("YYYY-MM-DD");
itemData.operationTime = moment(info.payTime).format("YYYY-MM-DD"); itemData.operationTime = moment(info.payTime).format("YYYY-MM-DD");
itemData.memberType = changeEnumValue(MEMBERTYPE, info.memberCategory); itemData.memberType = changeEnumValue(MEMBERTYPE, info.memberCategory);
itemData.paymentMethod = changeEnumValue(PAYMENTTYPE, info.paymentMethod); itemData.paymentMethod = changeEnumValue(PAYMENTTYPE, info.paymentMethod);
if (payType == 2) {
if (info.paymentMethod == PAYMENTTYPE.后台上传) itemData.backgroundUpload = "是";
if (info.paymentMethod == PAYMENTTYPE.银行转账) itemData.backgroundUpload = "否";
}
itemData.costType = info.isFirst == COSTTYPE.首次 ? "首次" : "续费"; itemData.costType = info.isFirst == COSTTYPE.首次 ? "首次" : "续费";
itemData.cycle = `${moment(info.orderCycleStart).format("YYYY")}至${moment(info.orderCycleEnd).format("YYYY")}` itemData.cycle = `${moment(info.orderCycleStart).format("YYYY")}至${moment(info.orderCycleEnd).format("YYYY")}`
...@@ -155,7 +165,6 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS ...@@ -155,7 +165,6 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
itemData.session = getEdition(parseInt(`${userInfo.session/100}`), parseInt(`${userInfo.session%100}`) ); itemData.session = getEdition(parseInt(`${userInfo.session/100}`), parseInt(`${userInfo.session%100}`) );
itemData.state = info.confirmReceipt == RECEIPTCONFIRMATION.收款确认 ? "已审批" : "待审批"; itemData.state = info.confirmReceipt == RECEIPTCONFIRMATION.收款确认 ? "已审批" : "待审批";
itemData.invoiceStatus = info.invoiceStatus == INVOICESTATUS.已开发票 ? "已开" : "未开"; itemData.invoiceStatus = info.invoiceStatus == INVOICESTATUS.已开发票 ? "已开" : "未开";
dataList.push(itemData); dataList.push(itemData);
} }
......
src/biz/member/homePage.ts
...@@ -264,6 +264,25 @@ export async function getSheng ({userId}) { ...@@ -264,6 +264,25 @@ export async function getSheng ({userId}) {
let msg = '会员注册尚未审核通过，无法下载证书'; let msg = '会员注册尚未审核通过，无法下载证书';
//判断是否审批通过 //判断是否审批通过
if (userInfo.userRegisterState == USERREGISTERSTATE.通过) { if (userInfo.userRegisterState == USERREGISTERSTATE.通过) {
let addresStr = "";
if (getCityNameByCode(userInfo.sheng)) {
addresStr += `${getCityNameByCode(userInfo.sheng)}`;
if (getCityNameByCode(userInfo.shi)) {
if (getCityNameByCode(userInfo.sheng) != getCityNameByCode(userInfo.shi)) {
addresStr += `${getCityNameByCode(userInfo.shi)}`;
}
if (getCityNameByCode(userInfo.qu)) {
addresStr += `${getCityNameByCode(userInfo.qu)}`;
}
}
}
// if (getCityNameByCode(userInfo.sheng) == getCityNameByCode(userInfo.shi)) {
// addresStr = `${getCityNameByCode(userInfo.shi)}${getCityNameByCode(userInfo.qu)}`;
// } else {
// addresStr = `${getCityNameByCode(userInfo.sheng)}${getCityNameByCode(userInfo.shi)}${getCityNameByCode(userInfo.qu)}`;
// }
if(userInfo.memberType == MEMBERTYPE.个人会员) { if(userInfo.memberType == MEMBERTYPE.个人会员) {
//个人会员已支付可下载 //个人会员已支付可下载
if (userInfo.individualMemberType == INDIVIDUALMEMBERTYPE.普通会员 && userInfo.paymentStatus != PAYMENTSTATUS.未支付) certificate = true; if (userInfo.individualMemberType == INDIVIDUALMEMBERTYPE.普通会员 && userInfo.paymentStatus != PAYMENTSTATUS.未支付) certificate = true;
...@@ -272,7 +291,7 @@ export async function getSheng ({userId}) { ...@@ -272,7 +291,7 @@ export async function getSheng ({userId}) {
if (certificate) { if (certificate) {
cefaInfo = { cefaInfo = {
name:userInfo.name, name:userInfo.name,
area:getCityNameByCode(userInfo.sheng), area:addresStr,
documentId:userInfo.documentId, documentId:userInfo.documentId,
memberNum:userInfo.memberNum, memberNum:userInfo.memberNum,
session:getEdition(Math.floor(userInfo.session/100), userInfo.session%100 ), session:getEdition(Math.floor(userInfo.session/100), userInfo.session%100 ),
...@@ -290,12 +309,11 @@ export async function getSheng ({userId}) { ...@@ -290,12 +309,11 @@ export async function getSheng ({userId}) {
certificate = true; certificate = true;
} }
if (certificate) { if (certificate) {
let addresStr = ""; // if (getCityNameByCode(userInfo.sheng) == getCityNameByCode(userInfo.shi)) {
if (getCityNameByCode(userInfo.sheng) == getCityNameByCode(userInfo.shi)) { // addresStr = `${getCityNameByCode(userInfo.shi)}${getCityNameByCode(userInfo.qu)}${userInfo.addres}`;
addresStr = `${getCityNameByCode(userInfo.shi)}${getCityNameByCode(userInfo.qu)}${userInfo.addres}`; // } else {
} else { // addresStr = `${getCityNameByCode(userInfo.sheng)}${getCityNameByCode(userInfo.shi)}${getCityNameByCode(userInfo.qu)}${userInfo.addres}`;
addresStr = `${getCityNameByCode(userInfo.sheng)}${getCityNameByCode(userInfo.shi)}${getCityNameByCode(userInfo.qu)}${userInfo.addres}`; // }
}
cefaInfo = { cefaInfo = {
unitName:userInfo.unitName, unitName:userInfo.unitName,
addres:addresStr, addres:addresStr,
...@@ -430,6 +448,25 @@ export async function getApply({userId}) { ...@@ -430,6 +448,25 @@ export async function getApply({userId}) {
/** /**
* 职务申请是否审批中
* @param param0
* @returns
*/
export async function getChangeApplyType({userId}) {
let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
let userInfo = await findOnce(TABLEENUM.用户表, {userId}, ["changeApplyType"]);
let changeApplyType = false;
if (userInfo.changeApplyType == CHANGEAPPLYTYPE.待审批) changeApplyType = false;
else changeApplyType = true;
return {changeApplyType};
}
/**
* 变更理事申请，职位未发生变更不需要走当前流程 * 变更理事申请，职位未发生变更不需要走当前流程
* @param memberLevel 变更理事 * @param memberLevel 变更理事
* @param userId 登录的userid * @param userId 登录的userid
...@@ -483,10 +520,16 @@ export async function isNeedSupplement({userId}) { ...@@ -483,10 +520,16 @@ export async function isNeedSupplement({userId}) {
// }; // };
/**资料变更 */ /**资料变更 */
// const DwRequiredConf = {
// "基本信息": ["unitName", "sheng", "shi", "qu", "addres", "uscc", "legalPerson", "legalPersonPhone", "legalPersonMail", "contactPerson",
// "contactPersonDuties", "phone", "uusinessLicenseUrl", "applicationForm"],
// "单位信息": ["unitMemberType", "yuanXiaoBanXueLeiXing", "yuanXiaoZhuGuanBuMen", "yuanXiaoFuZeRen", "yuanXiaoFuZeRenZhiWu",
// "yuanXiaoFuZeRenDianHua", "yuanXiaoBanGongFuZeRen", "yuanXiaoBanGongFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang", "yuanXiaoKeYanFuZeRen",
// "yuanXiaoKeYanFuZeRenDianHua", "jiaoXueFuZeRenXinMing", "jiaoXueFuZeRenDianHua"]
// };
const DwRequiredConf = { const DwRequiredConf = {
"基本信息": ["unitName", "sheng", "shi", "qu", "addres", "uscc", "legalPerson", "legalPersonPhone", "legalPersonMail", "contactPerson", "基本信息": ["sheng", "shi", "qu", "addres", "contactPerson", "contactPersonDuties", "phone", "applicationForm"],
"contactPersonDuties", "phone", "uusinessLicenseUrl", "applicationForm"], "单位信息": ["yuanXiaoZhuGuanBuMen", "yuanXiaoFuZeRen", "yuanXiaoFuZeRenZhiWu",
"单位信息": ["unitMemberType", "yuanXiaoBanXueLeiXing", "yuanXiaoZhuGuanBuMen", "yuanXiaoFuZeRen", "yuanXiaoFuZeRenZhiWu",
"yuanXiaoFuZeRenDianHua", "yuanXiaoBanGongFuZeRen", "yuanXiaoBanGongFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang", "yuanXiaoKeYanFuZeRen", "yuanXiaoFuZeRenDianHua", "yuanXiaoBanGongFuZeRen", "yuanXiaoBanGongFuZeRenDianHua", "ZhuYaoFuZeRenYouXiang", "yuanXiaoKeYanFuZeRen",
"yuanXiaoKeYanFuZeRenDianHua", "jiaoXueFuZeRenXinMing", "jiaoXueFuZeRenDianHua"] "yuanXiaoKeYanFuZeRenDianHua", "jiaoXueFuZeRenXinMing", "jiaoXueFuZeRenDianHua"]
}; };
...@@ -494,6 +537,10 @@ export async function isNeedSupplement({userId}) { ...@@ -494,6 +537,10 @@ export async function isNeedSupplement({userId}) {
const Dwshzycj = { const Dwshzycj = {
"单位所获主要成绩及科研成果": ["startTime", "endTime", "describe"] "单位所获主要成绩及科研成果": ["startTime", "endTime", "describe"]
}; };
// const Gzsqb = {
// "盖章申请表": ["applicationForm"]
// };
let dwshzycjInfo = await findOnce(TABLEENUM.单位所获得科研成果表, {userId}); let dwshzycjInfo = await findOnce(TABLEENUM.单位所获得科研成果表, {userId});
...@@ -539,8 +586,17 @@ export async function isNeedSupplement({userId}) { ...@@ -539,8 +586,17 @@ export async function isNeedSupplement({userId}) {
infoCompleteData["单位所获主要成绩及科研成果"] = true; infoCompleteData["单位所获主要成绩及科研成果"] = true;
} }
} }
} }
// for (let i = 0; i < Gzsqb["盖章申请表"].length; i++) {
// if(!oldInfo[Gzsqb["盖章申请表"][i]]) {
// infoCompleteData["盖章申请表"] = false;
// changeApplyType = CHANGEAPPLYTYPE.注册信息待补充;
// break;
// } else {
// infoCompleteData["盖章申请表"] = true;
// }
// }
} }
let infoComplete = []; let infoComplete = [];
...@@ -573,6 +629,7 @@ export async function isZwbgtxzd({userId}) { ...@@ -573,6 +629,7 @@ export async function isZwbgtxzd({userId}) {
if(!oldInfo[ZyRequiredConf[key][i]]) { if(!oldInfo[ZyRequiredConf[key][i]]) {
isZwbgtxzd = false; isZwbgtxzd = false;
changeApplyType = CHANGEAPPLYTYPE.注册信息待补充 changeApplyType = CHANGEAPPLYTYPE.注册信息待补充
break;
} else { } else {
isZwbgtxzd = true; isZwbgtxzd = true;
} }
...@@ -695,6 +752,48 @@ export async function applyReason({applyStr, userId}) { ...@@ -695,6 +752,48 @@ export async function applyReason({applyStr, userId}) {
/** /**
* 变更理事申请理由-单位会员 2025-04-22 单位会员新增理事申请字段需要与个人会员区分方法
* @param applyStr 变更申请理由
* @param userId 登录的userid
* @returns
*/
export async function applyReasonMember({applyName, applySex, applyDuties, applyPhone, applyStr, userId}) {
let oldInfo = await findOnce(TABLEENUM.用户表, {userId});
if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
const Now = new Date().valueOf();
let applyId = generateSystemId(TABLEENUM.理事变更审批历史表, userId);
let param = {
applyStr,
changeApplyType:CHANGEAPPLYTYPE.待审批,
applyApplicationTime:Now,
applyId,
}
await updateOneData(TABLEENUM.用户表, {userId}, param);
/**添加审批历史 */
let applyInfo:any = {
applyId,
userId,
applyMemberLevel:oldInfo.applyMemberLevel,
beforeChange:oldInfo.beforeChange,
changeApplyType:CHANGEAPPLYTYPE.待审批,
applyApplicationTime:Now,
applyName,
applySex,
applyDuties,
applyPhone,
applyStr,
};
await addOneData(TABLEENUM.理事变更审批历史表, applyInfo);
return successResult();
}
/**
* 资料变更 * 资料变更
* @param param0 * @param param0
* @returns * @returns
......
src/biz/member/member.ts
...@@ -40,8 +40,19 @@ export async function unitMemberList({unitName, mail, phone, joinStartTime, join ...@@ -40,8 +40,19 @@ export async function unitMemberList({unitName, mail, phone, joinStartTime, join
isBlackUser:STATE.否 isBlackUser:STATE.否
}; };
if (unitName) selectParam.unitName = {"$regex":unitName}; if (unitName) selectParam.unitName = {"$regex":unitName};
if (mail) selectParam.mail = mail; if (mail) {
if (phone) selectParam.phone = phone; selectParam.mail = mail;
selectParam.legalPersonMail = mail; //法人邮箱
selectParam.ZhuYaoFuZeRenYouXiang = mail; //主要负责人邮箱
}
if (phone) {
selectParam.phone = phone;
selectParam.legalPersonPhone = phone; //法人联系电话
selectParam.yuanXiaoFuZeRenDianHua = phone; //院校主要负责人电话
selectParam.yuanXiaoBanGongFuZeRenDianHua = phone; //院校办公负责人电话
selectParam.yuanXiaoKeYanFuZeRenDianHua = phone; //院校科研负责人电话
selectParam.jiaoXueFuZeRenDianHua = phone; //教学负责人电话
}
if (joinStartTime) { if (joinStartTime) {
selectParam["joinTime"] = {"$gt":joinStartTime}; selectParam["joinTime"] = {"$gt":joinStartTime};
} }
...@@ -166,30 +177,32 @@ export async function unitMemberDetails({userId, id}) { ...@@ -166,30 +177,32 @@ export async function unitMemberDetails({userId, id}) {
* @returns * @returns
*/ */
export async function unitMemberUpdate({form, keyanForm, id}) { export async function unitMemberUpdate({form, keyanForm, id}) {
const keyanFormItemConfig = { // const keyanFormItemConfig = {
startTime: 'Number', // startTime: 'Number',
endTime: 'Number', // endTime: 'Number',
describe: 'String' // describe: 'String'
}; // };
keyanForm.forEach(item => { // keyanForm.forEach(item => {
eccFormParam("单位会员修改", keyanFormItemConfig, item ); // eccFormParam("单位会员修改", keyanFormItemConfig, item );
}); // });
let oldInfo = await findOnce(TABLEENUM.用户表, {userId:id}); let oldInfo = await findOnce(TABLEENUM.用户表, {userId:id});
if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在); if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
/**校验枚举 */ /**校验枚举 */
const EccFuncName = '单位会员修改'; const EccFuncName = '单位会员修改';
/**校验入参 */ /**校验入参 */
eccCityCode(form.sheng, form.shi, form.qu); if (form.sheng && form.shi && form.qu) eccCityCode(form.sheng, form.shi, form.qu);
eccEnumValue(EccFuncName, '性别', SEX, form.sex); if (form.sex) eccEnumValue(EccFuncName, '性别', SEX, form.sex);
eccEnumValue(EccFuncName, '证件类型', DOCUMENTTYPE, form.documentType); if (form.documentType) eccEnumValue(EccFuncName, '证件类型', DOCUMENTTYPE, form.documentType);
eccEnumValue(EccFuncName, '民族', NATION, form.nation); if (form.nation) eccEnumValue(EccFuncName, '民族', NATION, form.nation);
eccEnumValue(EccFuncName, '专业类别', PROFCATEGORY, form.profCategory); if (form.profCategory) eccEnumValue(EccFuncName, '专业类别', PROFCATEGORY, form.profCategory);
/**修改会员用户信息 */ /**修改会员用户信息 */
let distinctMailInfo = await findOnce(TABLEENUM.用户表, {mail:form.mail}, ["userId"]); let distinctMailInfo = await findOnce(TABLEENUM.用户表, {mail:form.mail}, ["userId"]);
if (distinctMailInfo && distinctMailInfo.userId && distinctMailInfo.userId != oldInfo.userId) throw new BizError(ERRORENUM.邮箱重复, oldInfo.loginId, oldInfo.mail ); if (distinctMailInfo && distinctMailInfo.userId && distinctMailInfo.userId != oldInfo.userId) {
// throw new BizError(ERRORENUM.邮箱重复, oldInfo.loginId, oldInfo.mail );
}
form.mail = form.mail; form.mail = form.mail;
await updateOneData(TABLEENUM.用户表, {userId:id}, form); await updateOneData(TABLEENUM.用户表, {userId:id}, form);
...@@ -369,12 +382,12 @@ export async function individualMemberDetails({userId, id}) { ...@@ -369,12 +382,12 @@ export async function individualMemberDetails({userId, id}) {
if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在); if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
/**校验入参 */ /**校验入参 */
eccCityCode(form.sheng, form.shi, form.qu);
let EccFuncName = "个人会员修改"; let EccFuncName = "个人会员修改";
eccEnumValue(EccFuncName, '性别', SEX, form.sex); if (form.sheng && form.shi && form.qu) eccCityCode(form.sheng, form.shi, form.qu);
eccEnumValue(EccFuncName, '证件类型', DOCUMENTTYPE, form.documentType); if (form.sex) eccEnumValue(EccFuncName, '性别', SEX, form.sex);
eccEnumValue(EccFuncName, '民族', NATION, form.nation); if (form.documentType) eccEnumValue(EccFuncName, '证件类型', DOCUMENTTYPE, form.documentType);
eccEnumValue(EccFuncName, '专业类别', PROFCATEGORY, form.profCategory); if (form.nation) eccEnumValue(EccFuncName, '民族', NATION, form.nation);
if (form.profCategory) eccEnumValue(EccFuncName, '专业类别', PROFCATEGORY, form.profCategory);
await updateOneData(TABLEENUM.用户表, {userId:id}, form); await updateOneData(TABLEENUM.用户表, {userId:id}, form);
return successResult(); return successResult();
......
src/biz/member/user.ts
...@@ -55,6 +55,8 @@ export async function login({loginId, pwd}) { ...@@ -55,6 +55,8 @@ export async function login({loginId, pwd}) {
if (userInfo.memberState >= MEMBERSTATE.冻结 ) { if (userInfo.memberState >= MEMBERSTATE.冻结 ) {
throw new BizError(ERRORENUM.该账号已被冻结); throw new BizError(ERRORENUM.该账号已被冻结);
} }
let isPass = false;
if (userInfo.userRegisterState == USERREGISTERSTATE.通过) isPass = true;
let dataInfo = { let dataInfo = {
isAdmin:userInfo.isAdmin == STATE.是, isAdmin:userInfo.isAdmin == STATE.是,
...@@ -63,7 +65,7 @@ export async function login({loginId, pwd}) { ...@@ -63,7 +65,7 @@ export async function login({loginId, pwd}) {
token:token, token:token,
adminLv:userInfo.adminLv, adminLv:userInfo.adminLv,
timeMs:Now, timeMs:Now,
isPass:userInfo.userRegisterState == USERREGISTERSTATE.通过, isPass,
memberType:userInfo.memberType, memberType:userInfo.memberType,
isInput:(userInfo.isInput && !userInfo.inputUserChangePwd), isInput:(userInfo.isInput && !userInfo.inputUserChangePwd),
phone:userInfo.phone phone:userInfo.phone
......
src/biz/officialWebsite.ts
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
*/ */
import moment = require("moment"); import moment = require("moment");
import { ARTICLEPOSITION, BANNERPOSITION, BRANCHPOSITION, CODPARTICIPANT, DANGJIANVIDEO, DONGTAIZIXUNSUBTYPE, IMGEDITFUNENUM, INDIVIDUALMEMBERTYPE, MEMBERTYPE, PARTYBUILDSUBTYPEENUM, PARTYBUILDTYPEENUM, PAYMENTSTATUS, STATE, TONGZHIGONGGAO, UNITMEMBERTYPE, USERREGISTERSTATE, XUEHUILINGDAOZHIWEI } from "../config/enum"; import { ARTICLEPOSITION, BANNERPOSITION, BRANCHPOSITION, CODPARTICIPANT, DANGJIANVIDEO, DONGTAIZIXUNSUBTYPE, IMGEDITFUNENUM, INDIVIDUALMEMBERTYPE, MEMBERLEVEL, MEMBERTYPE, PARTYBUILDSUBTYPEENUM, PARTYBUILDTYPEENUM, PAYMENTSTATUS, STATE, TONGZHIGONGGAO, UNITMEMBERTYPE, USERREGISTERSTATE, XUEHUILINGDAOZHIWEI } from "../config/enum";
import { TABLEENUM } from "../data/models/model"; import { TABLEENUM } from "../data/models/model";
import { find, findCount, findOnce, findToPage, findToSort, findToSortToPage } from "../data/select"; import { find, findCount, findOnce, findToPage, findToSort, findToSortToPage } from "../data/select";
import { extractData } from "../util/piecemeal"; import { extractData } from "../util/piecemeal";
...@@ -856,7 +856,11 @@ export async function xueXiYuanDiShiPinType() { ...@@ -856,7 +856,11 @@ export async function xueXiYuanDiShiPinType() {
// } // }
/**
* 证书查询
* @param param0
* @returns
*/
export async function zhengShuChaXun({memberType, name, carId}) { export async function zhengShuChaXun({memberType, name, carId}) {
eccEnumValue("证书查询", "会员类型", MEMBERTYPE, memberType); eccEnumValue("证书查询", "会员类型", MEMBERTYPE, memberType);
let selectParam = {}; let selectParam = {};
...@@ -872,19 +876,40 @@ export async function zhengShuChaXun({memberType, name, carId}) { ...@@ -872,19 +876,40 @@ export async function zhengShuChaXun({memberType, name, carId}) {
let msg = '会员注册尚未审核通过，无法下载证书'; let msg = '会员注册尚未审核通过，无法下载证书';
//判断是否审批通过 //判断是否审批通过
if (userInfo.userRegisterState == USERREGISTERSTATE.通过) { if (userInfo.userRegisterState == USERREGISTERSTATE.通过) {
let addresStr = ``;
if (getCityNameByCode(userInfo.sheng)) {
addresStr += `${getCityNameByCode(userInfo.sheng)}`;
if (getCityNameByCode(userInfo.shi)) {
if (getCityNameByCode(userInfo.sheng) != getCityNameByCode(userInfo.shi)) {
addresStr += `${getCityNameByCode(userInfo.shi)}`;
}
if (getCityNameByCode(userInfo.qu)) {
addresStr += `${getCityNameByCode(userInfo.qu)}`;
}
}
}
// if (getCityNameByCode(userInfo.sheng) == getCityNameByCode(userInfo.shi) || !getCityNameByCode(userInfo.qu)) {
// addresStr = `${getCityNameByCode(userInfo.shi)}${getCityNameByCode(userInfo.qu)}`;
// } else {
// addresStr = `${getCityNameByCode(userInfo.sheng)}${getCityNameByCode(userInfo.shi)}${getCityNameByCode(userInfo.qu)}`;
// }
if(userInfo.memberType == MEMBERTYPE.个人会员) { if(userInfo.memberType == MEMBERTYPE.个人会员) {
//个人会员已支付可下载 //个人会员已支付可下载
if (userInfo.individualMemberType == INDIVIDUALMEMBERTYPE.普通会员 && userInfo.paymentStatus != PAYMENTSTATUS.未支付) certificate = true; if (userInfo.individualMemberType == INDIVIDUALMEMBERTYPE.普通会员 && userInfo.paymentStatus != PAYMENTSTATUS.未支付) certificate = true;
//个人会员专家无需支付可下载 //个人会员专家无需支付可下载
if (userInfo.individualMemberType == INDIVIDUALMEMBERTYPE.专家会员) certificate = true; if (userInfo.individualMemberType == INDIVIDUALMEMBERTYPE.专家会员) certificate = true;
if (certificate) { if (certificate) {
cefaInfo = { cefaInfo = {
name:userInfo.name, name:userInfo.name,
area:getCityNameByCode(userInfo.sheng), area:addresStr,
documentId:userInfo.documentId, documentId:userInfo.documentId,
memberNum:userInfo.memberNum, memberNum:userInfo.memberNum,
session:getEdition(Math.floor(userInfo.session/100), userInfo.session%100 ), session:getEdition(Math.floor(userInfo.session/100), userInfo.session%100 ),
lifespanTime:`${moment(userInfo.lifespanStartTime).format("YYYY年MM月DD日")}至${moment(userInfo.lifespanEndTime).format("YYYY年MM月DD日")}` lifespanTime:`${moment(userInfo.lifespanStartTime).format("YYYY年MM月DD日")}至${moment(userInfo.lifespanEndTime).format("YYYY年MM月DD日")}`,
memberLevel:userInfo.memberLevel,
memberLevelStr:changeEnumValue(MEMBERLEVEL, userInfo.memberLevel),
} }
msg = ``; msg = ``;
} else { } else {
...@@ -898,18 +923,19 @@ export async function zhengShuChaXun({memberType, name, carId}) { ...@@ -898,18 +923,19 @@ export async function zhengShuChaXun({memberType, name, carId}) {
certificate = true; certificate = true;
} }
if (certificate) { if (certificate) {
let addresStr = ""; // if (getCityNameByCode(userInfo.sheng) == getCityNameByCode(userInfo.shi)) {
if (getCityNameByCode(userInfo.sheng) == getCityNameByCode(userInfo.shi)) { // addresStr = `${getCityNameByCode(userInfo.shi)}${getCityNameByCode(userInfo.qu)}${userInfo.addres}`;
addresStr = `${getCityNameByCode(userInfo.shi)}${getCityNameByCode(userInfo.qu)}${userInfo.addres}`; // } else {
} else { // addresStr = `${getCityNameByCode(userInfo.sheng)}${getCityNameByCode(userInfo.shi)}${getCityNameByCode(userInfo.qu)}${userInfo.addres}`;
addresStr = `${getCityNameByCode(userInfo.sheng)}${getCityNameByCode(userInfo.shi)}${getCityNameByCode(userInfo.qu)}${userInfo.addres}`; // }
}
cefaInfo = { cefaInfo = {
unitName:userInfo.unitName, unitName:userInfo.unitName,
addres:addresStr, addres:addresStr,
memberNum:userInfo.memberNum, memberNum:userInfo.memberNum,
session:getEdition(Math.floor(userInfo.session/100), userInfo.session%100 ), session:getEdition(Math.floor(userInfo.session/100), userInfo.session%100 ),
lifespanTime:`${moment(userInfo.lifespanStartTime).format("YYYY年MM月DD日")}至${moment(userInfo.lifespanEndTime).format("YYYY年MM月DD日")}` lifespanTime:`${moment(userInfo.lifespanStartTime).format("YYYY年MM月DD日")}至${moment(userInfo.lifespanEndTime).format("YYYY年MM月DD日")}`,
memberLevel:userInfo.memberLevel,
memberLevelStr:changeEnumValue(MEMBERLEVEL, userInfo.memberLevel),
} }
if (userInfo.unitMemberType == UNITMEMBERTYPE.院校) { if (userInfo.unitMemberType == UNITMEMBERTYPE.院校) {
let diffYearNum = moment().diff(moment(userInfo.lifespanStartTime), 'years'); let diffYearNum = moment().diff(moment(userInfo.lifespanStartTime), 'years');
......
src/biz/register.ts
...@@ -333,7 +333,7 @@ export async function registerFlowType({id}) { ...@@ -333,7 +333,7 @@ export async function registerFlowType({id}) {
* @param phone * @param phone
* @returns * @returns
*/ */
export async function memberRegisterSendCode({phone}) { export async function memberRegisterSendCode({phone, verifyType}) {
let userInfo = await findOnce(TABLEENUM.用户表, {phone}, ["userId"]); let userInfo = await findOnce(TABLEENUM.用户表, {phone}, ["userId"]);
if (userInfo && userInfo.userId) throw new BizError(ERRORENUM.该手机号已被注册); if (userInfo && userInfo.userId) throw new BizError(ERRORENUM.该手机号已被注册);
const NowMs = new Date().valueOf(); const NowMs = new Date().valueOf();
...@@ -460,7 +460,11 @@ export async function unitMemberNotSaved({form, keyanForm, id}) { ...@@ -460,7 +460,11 @@ export async function unitMemberNotSaved({form, keyanForm, id}) {
// await updateOneData(TABLEENUM.用户表, {userId:id, saveUnsubmitted:STATE.否}, form); // await updateOneData(TABLEENUM.用户表, {userId:id, saveUnsubmitted:STATE.否}, form);
await updateOneData(TABLEENUM.用户表, {userId:id}, form); await updateOneData(TABLEENUM.用户表, {userId:id}, form);
await deleteManyData(TABLEENUM.单位所获得科研成果表, {userId:id}); /**删除对应userId科研成果 */
let oldKeYanList= await find(TABLEENUM.单位所获得科研成果表, {userId:id});
if (oldKeYanList && oldKeYanList.length) {
await deleteManyData(TABLEENUM.单位所获得科研成果表, {userId:id});
}
let addList = []; let addList = [];
for (let i = 0; i < keyanForm.length; i++) { for (let i = 0; i < keyanForm.length; i++) {
let {startTime, endTime, describe} = keyanForm[i]; let {startTime, endTime, describe} = keyanForm[i];
......
src/config/serverConfig.ts
...@@ -26,7 +26,8 @@ export const SessionTimeMsConfig = { ...@@ -26,7 +26,8 @@ export const SessionTimeMsConfig = {
"6_10":{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()},
"7_1":{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()},
"7_2":{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()},
"7_3":{activTime:'2024-5-11 08:00:00', timeMs:new Date('2024-5-11 08:00:00').valueOf()} "7_3":{activTime:'2024-5-22 08:00:00', timeMs:new Date('2024-5-22 08:00:00').valueOf()}, //2025年4月15日 高老师说要统一7届3次的入会时间为2024年5月22日
"7_4":{activTime:'2024-12-11 08:00:00', timeMs:new Date('2024-12-11 08:00:00').valueOf()},
} }
const ConfigName = "serverConfig.xml"; const ConfigName = "serverConfig.xml";
......
src/data/models/model.ts
...@@ -650,11 +650,17 @@ const ModelArray = [ ...@@ -650,11 +650,17 @@ const ModelArray = [
userId:{type:'String', index:true},//用户id 外键 userId:{type:'String', index:true},//用户id 外键
applyMemberLevel:'Number',//申请变更的职位 applyMemberLevel:'Number',//申请变更的职位
beforeChange:'Number',//会员等级、职务 枚举 MEMBERLEVEL 【变更申请前的职位】 beforeChange:'Number',//会员等级、职务 枚举 MEMBERLEVEL 【变更申请前的职位】
applyStr:'String',//变更理事申请理由
changeApplyType:'Number',//变更审批状态 changeApplyType:'Number',//变更审批状态
applyApplicationTime:'Number',//变更理事申请时间 applyApplicationTime:'Number',//变更理事申请时间
applyReviewTime:'Number',//变更理事审核时间 applyReviewTime:'Number',//变更理事审核时间
rejectRemarks:'String',//变更理事驳回理由 rejectRemarks:'String',//变更理事驳回理由
/**2025-04-18新增字段 -start */
applyName:'String',//变更理事负责人姓名
applySex:'Number',//变更理事负责人性别
applyDuties:'String',//变更理事负责人职务
applyPhone:'String',//变更理事负责人电话
/**-------------------end */
applyStr:'String',//变更理事申请理由
} }
}, },
{ {
...@@ -695,7 +701,6 @@ const ModelArray = [ ...@@ -695,7 +701,6 @@ const ModelArray = [
session:'Number',//届次【规则：五年一届半年一次（10次一届）】 数据库保存格式：200801【年月（YYYYMM）】 session:'Number',//届次【规则：五年一届半年一次（10次一届）】 数据库保存格式：200801【年月（YYYYMM）】
joinTime:'Number',//入会时间 届次绑定入会时间，旧的时间线对应届次按照之前的配置来，新届次对应入会时间按照新届次第一次被审核时间 joinTime:'Number',//入会时间 届次绑定入会时间，旧的时间线对应届次按照之前的配置来，新届次对应入会时间按照新届次第一次被审核时间
} }
} }
]; ];
......
src/routers/order/router.ts
...@@ -57,6 +57,7 @@ export const Config = { ...@@ -57,6 +57,7 @@ export const Config = {
{key:"pageNumber", type:"Number", desc:"分页-当前页面"}, {key:"pageNumber", type:"Number", desc:"分页-当前页面"},
{key:"pageSize", type:"Number", desc:"分页-当前页大小"}, {key:"pageSize", type:"Number", desc:"分页-当前页大小"},
{key:"session", type:"Number", desc:"届次", isNull:true}, {key:"session", type:"Number", desc:"届次", isNull:true},
{key:"backgroundUpload", type:"Number", desc:"是否后台上传", isNull:true},
], ],
bindBiz:costVerificationBiz.paidList bindBiz:costVerificationBiz.paidList
}, },
......
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