Skip to content

W
wenHuaBu_adminServer
Commit e6e3723f by chenjinjing
Options

no message

parent 9e491691
Showing with 209 additions and 34 deletions
src/biz/member/examine.ts
......@@ -3,7 +3,7 @@
*/
import moment = require("moment");
import { BANXUELEIXING, CERTIFICATETYPE, DOCUMENTTYPE, EDUCATION, INDIVIDUALMEMBERTYPE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, NATION, OPERATIONREHAVIOR, PAYMENTSTATUS, PROFCATEGORY, REGISTERFLOW, SEX, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../../config/enum";
import { BANXUELEIXING, CERTIFICATETYPE, DOCUMENTTYPE, EDUCATION, INDIVIDUALMEMBERTYPE, LOGONSTATE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, NATION, OPERATIONREHAVIOR, PAYMENTSTATUS, PROFCATEGORY, REGISTERFLOW, SEX, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../../config/enum";
import { ERRORENUM } from "../../config/errorEnum";
import { addManyData } from "../../data/add";
import { TABLEENUM } from "../../data/models/model";
......@@ -17,9 +17,10 @@ import { createOrder } from "./order";
import { getCityNameByCode } from "../../config/cityConfig";
import { sendPassNotice } from "../sms";
import { SessionTimeMsConfig } from "../../config/serverConfig";
import { deleteOneData } from "../../data/delete";
/**
* 待审核列表 success
* 待审核列表 success 入会申请
* @param name 名称关键字：个人会员匹配真实姓名，单位会员匹配单位名称
* @param memberType 会员类别 unitMemberType、individualMemberType
* 会员类别、职务、级别改成多选
......@@ -133,6 +134,105 @@ export async function pendingReviewList({name, memberType, documentId, phone, ma
}
/**
* 入会审批-提交资料列表
*/
export async function submitDocument({loginId, phone, mail, pageNumber, pageSize}) {
if (pageSize > 50 || pageSize < 10) throw new BizError(ERRORENUM.参数错误, "待审核页面大小错误", pageSize);
/**查询条件 */
let selectParam:any = {
isAdmin:STATE.否,
logonState:LOGONSTATE.完成第一步未提交,
registerFlow:REGISTERFLOW.完成第一步
};
if (loginId) selectParam.loginId = {"$regex":loginId};
if (phone) selectParam.phone = phone;
if (mail) selectParam.mail = mail;
const SelectFiles = ["userId", "loginId", "memberType", "phone", "mail", "logonState"];
let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, SelectFiles, {askForTime:-1}, pageNumber, pageSize);
let dataCount = await findCount(TABLEENUM.用户表, selectParam);
let dataList = [];
dbList.forEach(info => {
let item:any = extractData(info, SelectFiles);
/**处理枚举值 */
if (item.logonState) changeEnumValue(LOGONSTATE, item.logonState);
item.memberType = changeEnumValue(MEMBERTYPE, info.memberType);
dataList.push(item);
});
return {dataList, dataCount};
}
/**
* 入会审批-提交资料-驳回
*/
export async function rejectJoin({id}) {
let userInfo = await findOnce(TABLEENUM.用户表, {userId:id, isAdmin:STATE.否}, ["userId", "registerFlow", "loginId","userRegisterState", "memberType", "unitName", "name", "phone", "sheng"]);
if (!userInfo || !userInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
/**驳回修改 */
let updateParam = {
logonState:LOGONSTATE.已驳回,
registerFlow:REGISTERFLOW.完成第一步,
firstStep:new Date().valueOf(),
saveUnsubmitted:STATE.否
}
await updateOneData(TABLEENUM.用户表, {userId:id}, updateParam);
return successResult();
}
/**
* 入会审批-驳回列表
*/
export async function rejectList({loginId, phone, mail, pageNumber, pageSize}) {
if (pageSize > 50 || pageSize < 10) throw new BizError(ERRORENUM.参数错误, "待审核页面大小错误", pageSize);
/**查询条件 */
let selectParam:any = {
isAdmin:STATE.否,
"$or":[{logonState:LOGONSTATE.已驳回}, {logonState:LOGONSTATE.驳回提交}],
registerFlow:REGISTERFLOW.完成第一步
};
if (loginId) selectParam.loginId = {"$regex":loginId};
if (phone) selectParam.phone = phone;
if (mail) selectParam.mail = mail;
const SelectFiles = ["userId", "loginId", "memberType", "phone", "mail", "logonState"];
let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, SelectFiles, {askForTime:-1}, pageNumber, pageSize);
let dataCount = await findCount(TABLEENUM.用户表, selectParam);
let dataList = [];
dbList.forEach(info => {
let item:any = extractData(info, SelectFiles);
/**处理枚举值 */
if (item.logonState) changeEnumValue(LOGONSTATE, item.logonState);
item.memberType = changeEnumValue(MEMBERTYPE, info.memberType);
dataList.push(item);
});
return {dataList, dataCount};
}
/**
* 入会审批-驳回列表-删除
* @param param0
*/
export async function delReject({id}) {
let userInfo = await findOnce(TABLEENUM.用户表, {userId:id, isAdmin:STATE.否}, ["userId", "registerFlow", "loginId","userRegisterState", "memberType", "unitName", "name", "phone", "sheng"]);
if (!userInfo || !userInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
await deleteOneData(TABLEENUM.用户表, {userId:id});
return successResult();
}
/**
* 通过审核 success
......
src/biz/member/finance/costVerification.ts
......@@ -273,9 +273,9 @@ export async function outPutConfirmReceipt({exportColumns, payType, examineState
selectConf.push(info.value);
})
let selectFile = ["id", "unitName", "userId", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "paymentNum", "desc", "invoiceMail"];
let selectFile = ["id", "unitName", "userId", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "paymentNum", "desc", "invoiceMail", "payTime", "confirmReceipt"];
let dbList = await find(TABLEENUM.订单表, findParam, selectFile);
let timeChnageList = []; //"orderCycleStart", "operationTime"
let timeChnageList = ["payTime"]; //"orderCycleStart", "operationTime"
let dataList = [selectTitle];
for (let i = 0; i < dbList.length; i++) {
......@@ -305,6 +305,9 @@ export async function outPutConfirmReceipt({exportColumns, payType, examineState
if (key == "session") {
value = getEdition(Math.floor(userInfo.session/100), userInfo.session%100 );
}
if (key == "confirmReceipt") {
value = value == RECEIPTCONFIRMATION.收款确认 ? "已审批" : "待审批";
}
if (key == "orderCycle") value = `${moment(info.orderCycleStart).format("YYYY-MM-DD")}至${moment(info.orderCycleEnd).format("YYYY-MM-DD")}`;
if (value && value != "-") {
if (timeChnageList.indexOf(key) != -1) value = moment(value).format("YYYY-MM-DD");
......
src/biz/member/member.ts
......@@ -241,7 +241,7 @@ export async function delResearch({id}) {
* @param sheng 省
* @param shi 市
*/
export async function individualMemberList({name, documentId, phone, mail, joinStartTime, joinEndTime, individualMemberType, memberLevel, session, profCategory, memberState, sheng, shi, lableId, pageNumber}) {
export async function individualMemberList({name, documentId, phone, mail, joinStartTime, joinEndTime, individualMemberType, memberLevel, session, profCategory, memberState, sheng, shi, lableId, unitName, pageNumber}) {
let selectParam:any = {
memberType : MEMBERTYPE.个人会员,
userRegisterState : USERREGISTERSTATE.通过,
......@@ -267,7 +267,7 @@ export async function individualMemberList({name, documentId, phone, mail, joinS
if (sheng) selectParam.sheng = sheng;
if (shi) selectParam.shi = shi;
if (lableId && lableId.length) selectParam.lableId = {"$in":lableId};
if (unitName) selectParam.unitName = {"$regex":unitName};
let selectConf = ["userId", "memberState", "unitName","session", "name", "sex", "documentId", "phone", "individualMemberType", "memberLevel", "joinTime", "lableId"];
let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, selectConf, {joinTime:-1}, pageNumber);
......
src/biz/officialWebsite.ts
......@@ -55,19 +55,29 @@ export async function homePage() {
result.zhuanTi.push({rank, title, articleUrl, imgUrl, id:articleTitle});
});
/**学会动态 每个动态资讯取最新的可见的两个*/
let wenZhangTypeList = [ARTICLEPOSITION.动态资讯_hgh学会动态, ARTICLEPOSITION.动态资讯_hgh政策动向, ARTICLEPOSITION.动态资讯_hgh行业风采];
let dongTaiZiXunData = await findToSort(TABLEENUM.文章管理, {articleType:{"$in":wenZhangTypeList }, display:STATE.是}, {articleTime:-1});
dongTaiZiXunData.sort((a, b) => {return a.articleTime - b.articleTime});
let dongTaiZiXunDistinctMap = {};
dongTaiZiXunData.forEach(info => {
/**动态资讯 2025年1月13日 改为【取网站文章管理最新发布的10条内容，除了通知公告，其他所有板块都要取】 */
let wenZhangTypeList = [ARTICLEPOSITION.通知公告_hgh会议通知, ARTICLEPOSITION.通知公告_hgh活动通知, ARTICLEPOSITION.通知公告_hgh项目公告];
// let wenZhangTypeList = [ARTICLEPOSITION.动态资讯_hgh学会动态, ARTICLEPOSITION.动态资讯_hgh政策动向, ARTICLEPOSITION.动态资讯_hgh行业风采,
// ARTICLEPOSITION.品牌项目_hgh学术研究, ARTICLEPOSITION.品牌项目_hgh展演竞赛, ARTICLEPOSITION.品牌项目_hgh社会服务, ARTICLEPOSITION.学习园地_文字资料,
// ARTICLEPOSITION.学会概况_hgh学会规章];
// let dongTaiZiXunData = await findToSort(TABLEENUM.文章管理, {articleType:{"$in":wenZhangTypeList }, display:STATE.是}, {articleTime:-1});
let dongTaiZiXunData = await findToSort(TABLEENUM.文章管理, {articleType:{"$nin":wenZhangTypeList}, display:STATE.是}, {articleTime:-1});
dongTaiZiXunData.sort((a, b) => {return b.articleTime - a.articleTime});
let dongTaiZiXunDistinctMap = {1:[]};
let top18dongTaiZiXun = dongTaiZiXunData.slice(0, 18);
top18dongTaiZiXun.forEach(info => {
let { articleType, id, title, imgUrl, articleTime, desc } = info;
if (!dongTaiZiXunDistinctMap[articleType]) dongTaiZiXunDistinctMap[articleType] = [];
if (dongTaiZiXunDistinctMap[articleType].length < 2) {
dongTaiZiXunDistinctMap[articleType].push({
id, title, imgUrl, articleTime:moment(articleTime).format("YYYY-MM-DD"), desc,
});
}
dongTaiZiXunDistinctMap["1"].push({id, title, imgUrl, articleTime:moment(articleTime).format("YYYY-MM-DD"), desc});
articleType.forEach( articles => {
// if (!dongTaiZiXunDistinctMap[articles]) dongTaiZiXunDistinctMap[articles] = [];
// dongTaiZiXunDistinctMap[articles].push({
// });
// if (dongTaiZiXunDistinctMap[articles].length < 10) {}
})
});
for (let key in dongTaiZiXunDistinctMap) {
result.xueHuiDongTai.push({
key,
......@@ -86,7 +96,8 @@ export async function homePage() {
// });
let huoDongTongZhiSelectList = [ARTICLEPOSITION.通知公告_hgh活动通知, ARTICLEPOSITION.通知公告_hgh会议通知, ARTICLEPOSITION.通知公告_hgh项目公告];
let huoDongTongZhiDataFindParam = {articleType:{"$in":huoDongTongZhiSelectList}, display:STATE.是};
let huoDongTongZhiDataList = await findToSortToPage(TABLEENUM.文章管理, huoDongTongZhiDataFindParam, ["articleTime", "id", "title", "articleType"], {articleTime:-1}, 1);
// let huoDongTongZhiDataList = await findToSortToPage(TABLEENUM.文章管理, huoDongTongZhiDataFindParam, ["articleTime", "id", "title", "articleType"], {articleTime:-1}, 1);
let huoDongTongZhiDataList = await findToSort(TABLEENUM.文章管理, huoDongTongZhiDataFindParam, {articleTime:-1}, ["articleTime", "id", "title", "articleType"]);
huoDongTongZhiDataList.forEach(info => {
let { id, title, articleTime, articleType } = info;
let value = 9;
......
src/biz/register.ts
......@@ -2,7 +2,7 @@
* 注册流程 success
*/
import { BANXUELEIXING, CODETYPE, DOCUMENTTYPE, INDIVIDUALMEMBERTYPE, MEMBERLEVEL, MEMBERTYPE, NATION, OPERATIONREHAVIOR, PROFCATEGORY, REGISTERFLOW, REGISTERSTART, SEX, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../config/enum";
import { BANXUELEIXING, CODETYPE, DOCUMENTTYPE, INDIVIDUALMEMBERTYPE, LOGONSTATE, MEMBERLEVEL, MEMBERTYPE, NATION, OPERATIONREHAVIOR, PROFCATEGORY, REGISTERFLOW, REGISTERSTART, SEX, STATE, UNITMEMBERTYPE, USERREGISTERSTATE } from "../config/enum";
import { ERRORENUM } from "../config/errorEnum";
import { addManyData, addOneData } from "../data/add";
import { deleteManyData, deleteOneData } from "../data/delete";
......@@ -85,6 +85,7 @@ export async function memberRegister1({form}) {
isBlackUser:STATE.否,
saveUnsubmitted:STATE.否,
firstStep:NowMs,
logonState:LOGONSTATE.完成第一步未提交
};
await addOneData(TABLEENUM.用户表, addInfo);
......@@ -102,7 +103,7 @@ export async function memberRegister1({form}) {
*/
export async function memberRegister2({form, id}) {
/**校验用户是否存在 */
let selectUserFiles = ["userId", "registerFlow", "userRegisterState"];
let selectUserFiles = ["userId", "registerFlow", "userRegisterState", "logonState"];
let oldInfo = await findOnce(TABLEENUM.用户表, {userId:id, memberType:MEMBERTYPE.个人会员, isAdmin:STATE.否}, selectUserFiles );
if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
if (oldInfo.registerFlow != REGISTERFLOW.完成第一步) throw new BizError(ERRORENUM.重复提交);
......@@ -113,13 +114,21 @@ export async function memberRegister2({form, id}) {
/**判断是否第一次提交审核 并更新状态*/
let remarks = "第一次提交";
if (oldInfo.userRegisterState == USERREGISTERSTATE.待审核) operationBehavior = OPERATIONREHAVIOR.用户提交
if (oldInfo.userRegisterState == USERREGISTERSTATE.待审核) {
operationBehavior = OPERATIONREHAVIOR.用户提交;
}
else {//驳回
operationBehavior = OPERATIONREHAVIOR.重新提交;
form.userRegisterState = USERREGISTERSTATE.重新提交;
remarks = "重新提交";
}
if (oldInfo.loginState != LOGONSTATE.已驳回) {
form.logonState = LOGONSTATE.已提交;
} else {
form.logonState = LOGONSTATE.驳回提交;
}
/**校验枚举 */
const EccFuncName = '注册个人会员流程2';
eccEnumValue(EccFuncName, '性别', SEX, form.sex);
......@@ -189,6 +198,7 @@ export async function memberRegister2({form, id}) {
isBlackUser:STATE.否,
saveUnsubmitted:STATE.否,
firstStep:NowMs,
logonState:LOGONSTATE.完成第一步未提交
};
await addOneData(TABLEENUM.用户表, addInfo);
......@@ -255,7 +265,7 @@ export async function unitMemberRegister2({form, keyanForm, id}) {
* @param userId
*/
export async function unitMemberRegister3({application, id}) {
let selectUserFiles = ["userId", "registerFlow", "userRegisterState", "application", "memberType"];
let selectUserFiles = ["userId", "registerFlow", "userRegisterState", "application", "memberType", "logonState"];
let oldInfo = await findOnce(TABLEENUM.用户表, {userId:id, memberType:MEMBERTYPE.单位会员, isAdmin:STATE.否}, selectUserFiles);
if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
if (oldInfo.registerFlow != REGISTERFLOW.完成第二步) throw new BizError(ERRORENUM.重复提交);
......@@ -277,8 +287,11 @@ export async function unitMemberRegister3({application, id}) {
applicationForm:application,
registerFlow:REGISTERFLOW.完成第三步,
askForTime : new Date().valueOf(),
saveUnsubmitted:STATE.是
saveUnsubmitted:STATE.是,
logonState:LOGONSTATE.已提交
};
if (oldInfo.loginState == LOGONSTATE.已驳回) updateForm.logonState = LOGONSTATE.驳回提交
await updateOneData(TABLEENUM.用户表, {userId:id}, updateForm);
/**提交审批历史信息 */
......
src/config/enum.ts
......@@ -405,6 +405,14 @@ export enum USERREGISTERSTATE {
}
export enum LOGONSTATE {
完成第一步未提交 = 1,
已驳回,
驳回提交,
已提交,
}
/**
* 证书类型
*/
......
src/config/outPutConfig.ts
......@@ -41,13 +41,9 @@ export enum UNITAUDITINGCOLUMNS {
单位简介 = "danWeiJianJie",
标签 = "lableId",
<<<<<<< HEAD
状态 = "memberState",
届次 = "session",
职务 = "memberLevel"
=======
会员职务 = "memberLevel",
>>>>>>> e695d6ba2ccab167b3543e786c0abbc49e412567
}
......@@ -74,7 +70,6 @@ export enum AUDITINGCOLUMNS {
标签 = "lableId",
状态 = "memberState",
届次 = "session",
级别 = "memberLevel",
会员职务 = "memberLevel",
会员级别 = "individualMemberType"
}
......@@ -84,11 +79,12 @@ export enum AUDITINGCOLUMNS {
* 费用核对导出列-发票管理
*/
export enum CONFIRMRECEIPTCOLUMNS {
状态 = "confirmReceipt",
"单位/个人名称" = "name",
会员类别 = "memberCategory",
所缴周期 = "orderCycle",
缴费金额 = "money",
支付订单 = "paymentNum",
支付单号 = "paymentNum",
支付方式 = "paymentMethod",
"单位代码/个人身份证" = "card",
备注 = "desc",
......@@ -97,7 +93,8 @@ export enum CONFIRMRECEIPTCOLUMNS {
提交时间 = "operationTime", //上传转账凭证的时间
会员职务 = "memberLevel",
注册手机号="phone",
届次 = "session"
届次 = "session",
支付时间 = "payTime", //微信支付的时间
}
......@@ -109,7 +106,7 @@ export enum BILLSTATECOLUMNS {
会员类别 = "memberCategory",
所缴周期 = "orderCycle",
缴费金额 = "money",
支付订单 = "paymentNum",
支付单号 = "paymentNum",
支付方式 = "paymentMethod",
"单位代码/个人身份证" = "card",
备注 = "desc",
......@@ -131,7 +128,7 @@ export enum INVOICEDCOLUMNS {
会员类别 = "memberCategory",
所缴周期 = "orderCycle",
缴费金额 = "money",
支付订单 = "paymentNum",
支付单号 = "paymentNum",
支付方式 = "paymentMethod",
"单位代码/个人身份证" = "card",
备注 = "desc",
......
src/data/models/model.ts
......@@ -458,7 +458,8 @@ const ModelArray = [
applyId:{ type:'String', index:true },
infoChangeId:{type:"String", index:true},//资料更新关联id
infoChangeMs:{type:"Number"},//资料更新申请时间
infoChangeOptionType:{type:"Number"}//INFOCHANGEAPPLYTYPE
infoChangeOptionType:{type:"Number"},//INFOCHANGEAPPLYTYPE
logonState:{type:"Number"},//LOGONSTATE 注册完成第一步未提交
}
},
{
......
src/main.ts
......@@ -19,7 +19,7 @@ async function lanuch() {
// await initAdmin();
await initSystemTask();
await initActivity();
await initSaveUnsubmitted();
// await initSaveUnsubmitted();
// await test1();
// await inputData(); 20240520日导入数据
......
src/routers/member/router.ts
......@@ -396,6 +396,7 @@ export const Config = {
{key:"profCategory", type:"Number", desc:"专业类别", isNull:true},
{key:"memberState", type:"Number", desc:"状态", isNull:true},
{key:"lableId", type:"[String]", desc:"标签Id", isNull:true},
{key:"unitName", type:"String", desc:"所属单位", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"}
],
bindBiz:memberBiz.individualMemberList
......@@ -542,6 +543,26 @@ export const Config = {
bindBiz:registerBiz.updateRegisterStart
},
{
apiName:"提交资料列表",
subUrl:'/examine/submitdocument',
param:[
{key:"loginId", type:"String", desc:"用户名", isNull:true},
{key:"phone", type:"String", desc:"登录手机号", isNull:true},
{key:"mail", type:"String", desc:"邮箱", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"},
{key:"pageSize", type:"Number", desc:"一页显示多少数据"},
],
bindBiz:examineBiz.submitDocument
},
{
apiName:"提交资料-驳回",
subUrl:'/examine/rejectjoin',
param:[
{key:"id", type:"String", desc:"提交资料列表返回的用户id"}
],
bindBiz:examineBiz.rejectJoin
},
{
apiName:"待审核列表",
subUrl:'/examine/pendingreview',
param:[
......@@ -593,6 +614,27 @@ export const Config = {
],
bindBiz:examineBiz.approvalHistoryList
},
{
apiName:"驳回列表",
subUrl:'/examine/rejectlist',
param:[
{key:"loginId", type:"String", desc:"用户名", isNull:true},
{key:"phone", type:"String", desc:"登录手机号", isNull:true},
{key:"mail", type:"String", desc:"邮箱", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"},
{key:"pageSize", type:"Number", desc:"一页显示多少数据"},
],
bindBiz:examineBiz.rejectList
},
{
apiName:"删除驳回列表会员",
subUrl:'/examine/delreject',
param:[
{key:"id", type:"String", desc:"驳回列表返回的用户id"},
],
bindBiz:examineBiz.delReject
},
// {
// apiName:"下拉框选择届次",
// subUrl:'/examine/getsession',
......
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