Skip to content

W
wenHuaBu_adminServer
Commit 2fada263 by lixinming
Options

no message

parent 084b98af
Showing with 175 additions and 87 deletions
src/biz/member/apply.ts
......@@ -26,7 +26,7 @@ import { addOneData } from "../../data/add";
* @param memberLevel 申请变更会员
* @returns
*/
export async function applyList({name, joinStartTime, joinEndTime, memberCategory, beforeChange, memberLevel, pageNumber}) {
export async function applyList({name, joinStartTime, joinEndTime, memberCategory, beforeChange, memberLevel, pageNumber, pageSize}) {
let selectParam:any = {
isBlackUser:STATE.否,
changeApplyType:{"$gt":CHANGEAPPLYTYPE.注册信息补充完成} //返回除了补充注册信息之外的所有状态数据
......@@ -54,7 +54,7 @@ export async function applyList({name, joinStartTime, joinEndTime, memberCategor
if (beforeChange && beforeChange.length) selectParam.beforeChange = {"$in":beforeChange};
let selectConf = ["userId", "applyId", "changeApplyType", "unitName", "name", "beforeChange", "applyMemberLevel", "applyStr", "applyApplicationTime", "applyReviewTime", "individualMemberType", "unitMemberType", "memberType"];
let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, selectConf, {applyApplicationTime:-1}, pageNumber);
let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, selectConf, {applyApplicationTime:-1}, pageNumber, pageSize);
let dataCount = await findCount(TABLEENUM.用户表, selectParam);
let dataList = [];
......@@ -151,7 +151,7 @@ export async function applyList({name, joinStartTime, joinEndTime, memberCategor
*/
export async function applyBatchAdopt({idList}) {
//限制长度
if (idList.length > 10) throw new BizError(ERRORENUM.批量操作超过个数限制);
if (idList.length > 50) throw new BizError(ERRORENUM.批量操作超过个数限制);
let thisDate = new Date();
const NowMs = thisDate.valueOf();
......@@ -354,7 +354,7 @@ export async function outPutApply() {
* @param userId
* @returns
*/
export async function infomationChangeList({name, changeState, pageNumber}) {
export async function infomationChangeList({name, changeState, pageSize, pageNumber}) {
let selectParam:any = {memberType:MEMBERTYPE.单位会员, infoChangeId:{"$ne":null}};
if (name) {
selectParam.unitName = {"$regex":name}
......@@ -363,7 +363,7 @@ export async function infomationChangeList({name, changeState, pageNumber}) {
selectParam.infoChangeOptionType = changeState;
}
let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, ["userId", "memberType", "userId", "unitName", "infoChangeId", "uscc", "legalPerson", "unitMemberType", "yuanXiaoBanXueLeiXing"], {infoChangeMs:-1}, pageNumber);
let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, ["userId", "memberType", "userId", "unitName", "infoChangeId", "uscc", "legalPerson", "unitMemberType", "yuanXiaoBanXueLeiXing"], {infoChangeMs:-1}, pageNumber, pageSize);
let dataCount = await findCount(TABLEENUM.用户表, selectParam);
let dataList = [];
......@@ -561,7 +561,7 @@ export async function infomationChangeLog({infoChangeId}) {
export async function infomationChangeManyPass({infoChangeIdList}) {
if (infoChangeIdList.length > 50) throw new BizError(ERRORENUM.批量操作超过个数限制);
for (let i = 0; i < infoChangeIdList.length; i++) {
let infoChangeId = infoChangeIdList[i];
let selectParam:any = {infoChangeId};
......
src/biz/member/cost.ts
......@@ -140,20 +140,21 @@ export async function testCallback(weChartPR) {
if (userInfo.memberType == MEMBERTYPE.单位会员) {
updateInfo.invoiceStatus = INVOICESTATUS.不具备开票条件;
}
await updateOneData(TABLEENUM.订单表, {weChartPR}, updateInfo);
//更新用户状态
let notPayCount = await findCount(TABLEENUM.订单表, {userId:oldInfo.userId, state:ORDERSTATE.未支付} );
/**只有一笔欠费时才更新用户状态 */
let updateUserInfo:any = {};
if (notPayCount < 1) {
let newOrderInfo = await findOnceToSort(TABLEENUM.订单表, {userId:oldInfo.userId}, {lifespanEndTime:-1}, ["orderCycleStart","orderCycleEnd"]);
updateUserInfo.lifespanStartTime = newOrderInfo.orderCycleStart,
updateUserInfo.lifespanEndTime = newOrderInfo.orderCycleEnd,
updateUserInfo.isGracePeriod = STATE.否,
updateUserInfo.gracePeriodEndTime = 0,
updateUserInfo.memberState = MEMBERSTATE.正常,
updateUserInfo.paymentStatus = PAYMENTSTATUS.已支付
updateUserInfo.lifespanStartTime = newOrderInfo.orderCycleStart;
updateUserInfo.lifespanEndTime = newOrderInfo.orderCycleEnd;
updateUserInfo.isGracePeriod = STATE.否;
updateUserInfo.gracePeriodEndTime = 0;
updateUserInfo.memberState = MEMBERSTATE.正常;
updateUserInfo.paymentStatus = PAYMENTSTATUS.已支付;
} else {//非一笔订单 要更新会员到期时间 到 用户表
updateUserInfo.lifespanStartTime = oldInfo.orderCycleStart;
updateUserInfo.lifespanEndTime = oldInfo.orderCycleEnd;
......@@ -173,7 +174,7 @@ export async function testCallback(weChartPR) {
await addOneData(TABLEENUM.订单审批历史表, addLogInfo );
await updateOneData(TABLEENUM.订单表, {weChartPR}, updateInfo);
}
/**
......
src/biz/member/examine.ts
......@@ -31,7 +31,8 @@ import { SessionTimeMsConfig } from "../../config/serverConfig";
* @param shi 市
* @param pageNumber 当前页
*/
export async function pendingReviewList({name, memberType, documentId, phone, mail, sheng, shi, pageNumber, examineState}) {
export async function pendingReviewList({name, memberType, documentId, phone, mail, sheng, shi, pageNumber,pageSize, examineState}) {
if (pageSize > 50 || pageSize < 10) throw new BizError(ERRORENUM.参数错误, "待审核页面大小错误", pageSize);
/**查询条件 */
let selectParam:any = {
isAdmin:STATE.否
......@@ -100,7 +101,7 @@ export async function pendingReviewList({name, memberType, documentId, phone, ma
if (shi) selectParam.shi = shi;
const SelectFiles = ["userId", "userRegisterState", "unitName", "name", "loginId", "phone", "askForTime", "memberLevel", "sheng", "shi", "qu", "individualMemberType", "unitMemberType", "memberType", "mail"];
let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, SelectFiles, {askForTime:-1}, pageNumber);
let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, SelectFiles, {askForTime:-1}, pageNumber, pageSize);
let dataCount = await findCount(TABLEENUM.用户表, selectParam);
let dataList = [];
......@@ -221,7 +222,7 @@ export async function adopt({id, session}) {
*/
export async function batchAdopt({idList, session}) {
//限制长度
if (idList.length > 10) throw new BizError(ERRORENUM.批量操作超过个数限制);
if (idList.length > 50) throw new BizError(ERRORENUM.批量操作超过个数限制);
let thisDate = new Date();
const NowMs = thisDate.valueOf();
......
src/biz/member/finance/costVerification.ts
......@@ -6,13 +6,13 @@ import moment = require("moment");
import { COSTTYPE, INVOICESTATUS, ISRECEIVE, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, ORDEREXAMINE, ORDERSTATE, PAYMENTSTATUS, PAYMENTTYPE, RECEIPTCONFIRMATION, STATE } from "../../../config/enum";
import { ERRORENUM } from "../../../config/errorEnum";
import { TABLEENUM } from "../../../data/models/model";
import { find, findCount, findOnce, findOnceToSort, findToPage } from "../../../data/select";
import { find, findCount, findOnce, findOnceToSort, findToPage, findToSortToPage } from "../../../data/select";
import { BizError } from "../../../util/bizError";
import { extractData } from "../../../util/piecemeal";
import { changeEnumValue, eccEnumValue } from "../../../util/verificationEnum";
import { updateOneData } from "../../../data/update";
import { addOneData } from "../../../data/add";
import { successResult } from "../../../tools/system";
import { getEdition, successResult } from "../../../tools/system";
/**
......@@ -31,9 +31,9 @@ import { successResult } from "../../../tools/system";
* @param costType 会费类别
* @param pageNumber 当前页
*/
export async function paidList({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, payType, costType, pageNumber, examineState}) {
export async function paidList({name, memberType, documentId, phone, mail, joinStartTime, session, joinEndTime, memberLevel, payType, paymentNum,pageSize, pageNumber, examineState}) {
if (payType != 1 && payType != 2 && payType != 3) throw new BizError(ERRORENUM.参数错误);
eccEnumValue("财务核对列表", "会费类别", COSTTYPE, costType );
// eccEnumValue("财务核对列表", "会费类别", COSTTYPE, costType );
let findParam:any = {
state:ORDERSTATE.已支付
......@@ -54,6 +54,9 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
}
} else findParam.confirmReceipt = {"$ne":RECEIPTCONFIRMATION.退回}
if (paymentNum) {
findParam.paymentNum = paymentNum;
}
/**用户表查询条件 */
let checkUserIdList = [];
......@@ -93,6 +96,10 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
isSelectUser = true;
itemParam.memberLevel = {"$in":memberLevel};
}
if (session) {
isSelectUser = true;
itemParam.session = session;
}
if (isSelectUser) {
let checkUserIdDataList = await find(TABLEENUM.用户表, itemParam, ["userId"]);
checkUserIdDataList.forEach(key => {
......@@ -105,10 +112,10 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
if (phone) findParam.phone = phone;
if (costType) findParam.isFirst = costType == COSTTYPE.首次;
// if (costType) findParam.isFirst = costType == COSTTYPE.首次;
let selectFile = ["id", "unitName", "userId", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "isFirst", "paymentNum", "memberState", "operationTime", "confirmReceipt", "invoiceStatus" ];
let dbList = await findToPage(TABLEENUM.订单表, findParam, selectFile, pageNumber);
let selectFile = ["id", "unitName", "userId", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "isFirst", "payTime", "paymentNum", "memberState", "operationTime", "confirmReceipt", "invoiceStatus" ];
let dbList = await findToSortToPage(TABLEENUM.订单表, findParam, selectFile, {payTime:-1}, pageNumber, pageSize);
let dataCount = await findCount(TABLEENUM.订单表, findParam);
let dataList = [];
......@@ -119,7 +126,7 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
let itemData:any = extractData(info, itemFile);
itemData.joinTime = moment(info.orderCycleStart).format("YYYY-MM-DD");
itemData.operationTime = moment(info.operationTime).format("YYYY-MM-DD");
itemData.operationTime = moment(info.payTime).format("YYYY-MM-DD");
itemData.memberType = changeEnumValue(MEMBERTYPE, info.memberCategory);
// itemData.paymentMethod = changeEnumValue(PAYMENTTYPE, info.paymentMethod);
itemData.costType = info.isFirst == COSTTYPE.首次 ? "首次" : "续费";
......@@ -130,7 +137,7 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
itemData.paymentNum = "-";
}
let userInfo = await findOnce(TABLEENUM.用户表, {userId:info.userId}, ["userId", "memberState", "name", "memberLevel", "individualMemberType", "unitMemberType"]);
let userInfo = await findOnce(TABLEENUM.用户表, {userId:info.userId}, ["userId", "memberState", "name", "memberLevel", "individualMemberType", "unitMemberType", "session"]);
if (!userInfo || !userInfo.userId) continue;
itemData.memberLevel = changeEnumValue(MEMBERLEVEL, userInfo.memberLevel);
itemData.name = userInfo.name;
......@@ -141,6 +148,7 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
itemData.memberType = changeEnumValue(MEMBERTYPEECCENUM, userInfo.unitMemberType);
}
itemData.session = getEdition(parseInt(`${userInfo.session/100}`), parseInt(`${userInfo.session%100}`) );
itemData.state = info.confirmReceipt == RECEIPTCONFIRMATION.收款确认 ? "已审批" : "待审批";
itemData.invoiceStatus = info.invoiceStatus == INVOICESTATUS.已开发票 ? "已开" : "未开";
......@@ -238,12 +246,26 @@ export async function confirmReceiptOut({id, isReceive, returnsReasons}) {
* 发票管理-财务核对页-数据导出
* @param param0
*/
export async function outPutConfirmReceipt({exportColumns}) {
export async function outPutConfirmReceipt({exportColumns, payType, examineState}) {
let findParam:any = {
confirmReceipt:RECEIPTCONFIRMATION.待确认,
state:ORDERSTATE.已支付
}
if (payType == 1) {
findParam.paymentMethod = PAYMENTTYPE.微信支付;
} else if (payType == 2) {
findParam.paymentMethod = {"$ne":PAYMENTTYPE.微信支付};
}
if (examineState) {
if (examineState == 1) {
findParam.confirmReceipt = RECEIPTCONFIRMATION.待确认;
} else {
findParam.confirmReceipt = RECEIPTCONFIRMATION.收款确认;
}
} else findParam.confirmReceipt = {"$ne":RECEIPTCONFIRMATION.退回}
let selectTitle = [];
let selectConf = [];
exportColumns.forEach( info=> {
......@@ -258,7 +280,7 @@ export async function outPutConfirmReceipt({exportColumns}) {
let dataList = [selectTitle];
for (let i = 0; i < dbList.length; i++) {
let info = dbList[i];
let userInfo = await findOnce(TABLEENUM.用户表, {userId:info.userId}, ["memberState", "name", "unitName", "documentId", "uscc", "mail", "unitMail", "memberLevel", "phone"]);
let userInfo = await findOnce(TABLEENUM.用户表, {userId:info.userId}, ["memberState", "name", "session", "unitName", "documentId", "uscc", "mail", "unitMail", "memberLevel", "phone"]);
let subList = [];
for (let i = 0; i < selectConf.length; i++) {
let key = selectConf[i];
......@@ -280,6 +302,9 @@ export async function outPutConfirmReceipt({exportColumns}) {
value = "-";
}
}
if (key == "session") {
value = getEdition(Math.floor(userInfo.session/100), userInfo.session%100 );
}
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");
......@@ -304,7 +329,7 @@ export async function outPutConfirmReceipt({exportColumns}) {
*/
export async function confirmReceiptManyPass({idList}) {
//限制长度
if (idList.length > 10) throw new BizError(ERRORENUM.批量操作超过个数限制);
if (idList.length > 50) throw new BizError(ERRORENUM.批量操作超过个数限制);
let thisDate = new Date();
const NowMs = thisDate.valueOf();
......
src/biz/member/finance/invoice.ts
......@@ -6,7 +6,7 @@
import moment = require("moment");
import { INVOICESTATUS, ISPAYENUM, MEMBERLEVEL, MEMBERSTATE, MEMBERTYPE, MEMBERTYPEECCENUM, ORDEREXAMINE, ORDERSTATE, PAYMENTTYPE, RECEIPTCONFIRMATION } from "../../../config/enum";
import { TABLEENUM } from "../../../data/models/model";
import { find, findCount, findOnce, findToPage } from "../../../data/select";
import { find, findCount, findOnce, findOnceToSort, findToPage } from "../../../data/select";
import { extractData } from "../../../util/piecemeal";
import { changeEnumValue, eccEnumValue } from "../../../util/verificationEnum";
import { ERRORENUM } from "../../../config/errorEnum";
......@@ -33,7 +33,8 @@ import { successResult } from "../../../tools/system";
* @param weChartPR 微信订单号
* @param pageNumber 当前页
*/
export async function billStateList({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, payState,paymentType, invoiceState, weChartPR, pageNumber}) {
export async function billStateList({name, memberType, documentId, phone, mail, joinStartTime, pageSize, joinEndTime, memberLevel, payState,paymentType, invoiceState, weChartPR, pageNumber}) {
let testMs = new Date().valueOf();
if (payState != 1 && payState != 2 && payState != 3) throw new BizError(ERRORENUM.参数错误);
let findParam:any = {invoiceStatus:{"$ne":INVOICESTATUS.已开发票}};
......@@ -125,7 +126,7 @@ export async function billStateList({name, memberType, documentId, phone, mail,
if (weChartPR) findParam.paymentNum = {"$regex":`${weChartPR}`};
let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "state", "paymentNum", "userId", "desc", "invoiceMail", "weChartCreatePayMs", "invoiceStatus"];
let dbList = await findToPage(TABLEENUM.订单表, findParam, selectFile, pageNumber);
let dbList = await findToPage(TABLEENUM.订单表, findParam, selectFile, pageNumber, pageSize);
let dataCount = await findCount(TABLEENUM.订单表, findParam);
let dataList = [];
......@@ -161,9 +162,15 @@ export async function billStateList({name, memberType, documentId, phone, mail,
itemData.cycle = `${moment(info.orderCycleStart).format("YYYY")}至${moment(info.orderCycleEnd).format("YYYY")}`;
itemData.weChartCreatePayMs = moment(info.weChartCreatePayMs || info.payTime).format("YYYY-MM-DD");
itemData.name = userInfomation.name;
//发票申请时间
let orderInfo = await findOnceToSort(TABLEENUM.订单审批历史表, {orderId:info.id,operationBehavior:ORDEREXAMINE.用户提交, refundName:null}, {operationTime:-1}, ["operationTime"]);
if (orderInfo && orderInfo.operationTime) itemData.invoiceTime = moment(orderInfo.operationTime).format("YYYY-MM-DD");
else itemData.invoiceTime = "-"
dataList.push(itemData);
}
console.log("请求耗时", new Date().valueOf() - testMs);
return {dataList, dataCount};
}
......@@ -248,10 +255,39 @@ export async function backInvoice({id}) {
* 发票管理-待开发票-数据导出
* @param param0
*/
export async function outPutBillState({exportColumns}) {
let findParam:any = {
invoiceStatus:INVOICESTATUS.未开发票
};
export async function outPutBillState({exportColumns, payState, invoiceState}) {
let findParam:any = { };
if (payState == 1) {//已支付
findParam.state = ORDERSTATE.已支付;
if (invoiceState == 1) {//已申请
findParam.invoiceStatus = INVOICESTATUS.未开发票
} else if (invoiceState == 2) {//未申请
findParam["$or"] = [{invoiceStatus:INVOICESTATUS.不具备开票条件}, {invoiceStatus:INVOICESTATUS.退回}];
} else {//全部
// findParam.invoiceStatus = {"$ne": INVOICESTATUS.已开发票};
}
} else if (payState == 2){//未支付
findParam.state = ORDERSTATE.未支付;
if (!invoiceState || invoiceState == 1) {//已申请 和 全部
findParam.invoiceStatus = INVOICESTATUS.未开发票
} else {//未申请
return {dataList:[], dataCount:0};
}
} else {//全部
if (!invoiceState) {// 全部
findParam["$or"] = [
{ state : ORDERSTATE.已支付, },
{ state : ORDERSTATE.未支付, invoiceStatus:INVOICESTATUS.未开发票},
// { invoiceStatus : INVOICESTATUS.未开发票},
// {"$or":[{invoiceStatus:INVOICESTATUS.不具备开票条件}, {invoiceStatus:INVOICESTATUS.退回}]}
]
} else if ( invoiceState == 1) {//已申请
findParam.invoiceStatus = INVOICESTATUS.未开发票;
}else {//未申请
findParam = { state : ORDERSTATE.未支付, invoiceStatus:INVOICESTATUS.未开发票};
}
}
let selectTitle = [];
let selectConf = [];
......@@ -336,7 +372,7 @@ export async function billStateHistory({id}) {
*/
export async function billStateBatchAdopt({idList}) {
//限制长度
if (idList.length > 10) throw new BizError(ERRORENUM.批量操作超过个数限制);
if (idList.length > 50) throw new BizError(ERRORENUM.批量操作超过个数限制);
let thisDate = new Date();
const NowMs = thisDate.valueOf();
......
src/biz/member/member.ts
......@@ -57,7 +57,7 @@ export async function unitMemberList({unitName, mail, phone, joinStartTime, join
if (shi) selectParam.shi = shi;
if (lableId && lableId.length) selectParam.lableId = {"$in":lableId};
const SelectFiles = ["userId", "memberState", "unitMemberType", "unitName", "contactPerson", "phone", "unitMail", "sheng", "joinTime", "memberLevel", "lableId"];
const SelectFiles = ["userId", "memberState", "unitMemberType", "unitName", "contactPerson", "phone", "unitMail", "sheng", "joinTime", "memberLevel", "lableId", "session"];
let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, SelectFiles, {joinTime:-1}, pageNumber);
let dataCount = await findCount(TABLEENUM.用户表, selectParam);
......@@ -76,7 +76,9 @@ export async function unitMemberList({unitName, mail, phone, joinStartTime, join
let lableInfo = await find(TABLEENUM.标签表, {lableId:{"$in":info.lableId}}, ["lableName"]);
lableInfo.forEach ( lableItem => {
item.lableId.push(lableItem.lableName);
})
});
item.session = getEdition(Math.floor(item.session/100), item.session%100 );
dataList.push(item);
}
......@@ -267,7 +269,7 @@ export async function individualMemberList({name, documentId, phone, mail, joinS
if (lableId && lableId.length) selectParam.lableId = {"$in":lableId};
let selectConf = ["userId", "memberState", "unitName", "name", "sex", "documentId", "phone", "individualMemberType", "memberLevel", "joinTime", "lableId"];
let selectConf = ["userId", "memberState", "unitName","session", "name", "sex", "documentId", "phone", "individualMemberType", "memberLevel", "joinTime", "lableId"];
let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, selectConf, {joinTime:-1}, pageNumber);
let dataCount = await findCount(TABLEENUM.用户表, selectParam);
......@@ -289,6 +291,8 @@ export async function individualMemberList({name, documentId, phone, mail, joinS
item.lableId.push(lableItem.lableName);
})
item.session = getEdition(Math.floor(item.session/100), item.session%100 );
dataList.push(item);
}
......@@ -445,6 +449,8 @@ export async function outPutIndividualMembers({exportColumns}) {
else if (key == "nation") value = changeEnumValue(NATION, value);
else if (key == "education") value = changeEnumValue(EDUCATION, value);
else if (key == "yuanXiaoBanXueLeiXing") value = changeEnumValue(BANXUELEIXING, value);
else if (key == "session") value = getEdition(Math.floor(value/100), value%100 );
else if (key == "memberState") value = changeEnumValue(MEMBERSTATE, value);
else if (key == "profCategory") value = changeEnumValue(PROFCATEGORY, value);
else if (addList.indexOf(key) != -1) value = getCityNameByCode(value);
else if (key == "lableId") {
......@@ -512,6 +518,8 @@ export async function outPutUnitMembers({exportColumns}) {
else if (key == "unitMemberType") value = changeEnumValue(UNITMEMBERTYPE, value);
else if (key == "memberLevel") value = changeEnumValue(MEMBERLEVEL, value);
else if (key == "yuanXiaoBanXueLeiXing") value = changeEnumValue(BANXUELEIXING, value);
else if (key == "session") value = getEdition(Math.floor(value/100), value%100 );
else if (key == "memberState") value = changeEnumValue(MEMBERSTATE, value);
else if (addList.indexOf(key) != -1) value = getCityNameByCode(value);
else if (key == "lableId") {
value = [];
......
src/biz/member/memberFees.ts
......@@ -11,7 +11,7 @@ import { changeEnumValue } from "../../util/verificationEnum";
import { BizError } from "../../util/bizError";
import { ERRORENUM } from "../../config/errorEnum";
import { updateOneData } from "../../data/update";
import { successResult } from "../../tools/system";
import { getEdition, successResult } from "../../tools/system";
import { addOneData } from "../../data/add";
......@@ -130,13 +130,25 @@ export async function outPutDataForExcel({type, exportColumns}) {
}
} else if (key == "code") {
item = info.documentId || info.uscc;
}else {
} else if (key == "jiaofeijutinianfen") {
let 缴费Year = '';
// 已缴费和缴费期显示缴费年限
if (type == 2 || type == 3) {
orderItemList.forEach(orderItem => {
if (orderItem.state == ORDERSTATE.已支付) {
缴费Year += ` ${new Date(orderItem.orderCycleStart).getFullYear()}`;
}
});
item = 缴费Year || "-";
}
} else {
item = info[key];
}
if (key == "memberState") item = changeEnumValue(MEMBERSTATE, item);
if (key == "memberType") item = changeEnumValue(MEMBERTYPE, item);
if (key == "memberLevel") item = changeEnumValue(MEMBERLEVEL, item);
if (key == "session") item = getEdition(Math.floor(item/100), item%100 );
if (key == "joinTime") item = moment(item).format("YYYY-MM-DD");
subList.push(item);
});
......@@ -161,7 +173,7 @@ export async function outPutDataForExcel({type, exportColumns}) {
* 会员级别/职务：【普通会员、理事会员、常务理事会员】
* @param pageNumber 当前页
*/
export async function getPaid({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, pageNumber}) {
export async function getPaid({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, session, pageNumber}) {
const NowMs = new Date().valueOf();
/**到期时间距离今天大于90天 */
let selectParam:any = {
......@@ -196,14 +208,15 @@ export async function getPaid({name, memberType, documentId, phone, mail, joinSt
selectParam["joinTime"]["$lt"] = joinEndTime;
}
if (memberLevel.length) selectParam.memberLevel = {"$in":memberLevel};
if (session) selectParam.session = session;
const SelectFiles = ["userId", "memberState", "unitName", "name", "joinTime", "memberLevel", "individualMemberType", "unitMemberType",
"lifespanStartTime", "lifespanEndTime"];
"lifespanStartTime", "lifespanEndTime", "session"];
let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, SelectFiles, {joinTime:-1}, pageNumber);
let dataCount = await findCount(TABLEENUM.用户表, selectParam);
let dataList = [];
const itemFiles = ["userId", "memberState", "unitName", "name", "joinTime", "memberType", "memberLevel", "lifespanTime", "nextPayment", "money"];
const itemFiles = ["userId", "memberState", "unitName", "name", "joinTime", "memberType", "memberLevel", "lifespanTime", "nextPayment", "money", "session"];
for (let i = 0; i < dbList.length; i++) {
let info = dbList[i];
let item:any = extractData(info, itemFiles);
......@@ -224,6 +237,7 @@ export async function getPaid({name, memberType, documentId, phone, mail, joinSt
orderDbList.forEach(orderItem => {
item.money = orderItem.money;
});
item.session = getEdition(Math.floor(item.session/100), item.session%100 ),
dataList.push(item);
};
......@@ -361,32 +375,13 @@ export async function unpaidList({name, memberType, documentId, phone, mail, joi
* 会员级别/职务：【普通会员、理事会员、常务理事会员】
* @param pageNumber 当前页
*/
export async function getRenewalPeriod({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, arrears,pageNumber}) {
export async function getRenewalPeriod({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, session, pageNumber}) {
const NowMs = new Date().valueOf();
//lifespanEndTime:{"$gt":NowMs + (90 * 24 * 3600 * 1000), "$gt":NowMs},
let selectParam:any = {
userRegisterState:USERREGISTERSTATE.通过,
isAdmin:STATE.否,
}
if (arrears) {
if (arrears == 1) {//已欠费
selectParam["$or"] = [
{
isGracePeriod:STATE.否,
lifespanEndTime:{"$lt":NowMs}
},
{
isGracePeriod:STATE.是,
lifespanEndTime:{"$lt":NowMs},
gracePeriodEndTime:{"$lt":NowMs}
}
];
} else { //宽限期
selectParam.lifespanEndTime = {"$lt":NowMs + (90 * 24 * 3600 * 1000), "$gt":NowMs};
}
} else {
selectParam["$or"] = [
"$or":[
{
isGracePeriod:STATE.否,
lifespanEndTime:{"$lt":NowMs}
......@@ -396,7 +391,10 @@ export async function getRenewalPeriod({name, memberType, documentId, phone, mai
lifespanEndTime:{"$lt":NowMs + (90 * 24 * 3600 * 1000)},
gracePeriodEndTime:{"$lt":NowMs}
}
];
]
}
if (session) {
selectParam.session = session;
}
if (name){
if (!selectParam["$and"]) selectParam["$and"] = [];
......@@ -428,14 +426,14 @@ export async function getRenewalPeriod({name, memberType, documentId, phone, mai
if (memberLevel.length) selectParam.memberLevel = {"$in":memberLevel};
// const SelectFiles = ["userId", "memberState", "unitName", "loginId", "phone", "joinTime", "memberType", "lifespanStartTime", "lifespanEndTime", "name", "individualMemberType", "unitMemberType"];
const SelectFiles = ["userId", "memberState", "individualMemberType", "unitMemberType", "unitName", "name", "memberLevel", "joinTime"];
const SelectFiles = ["userId", "memberState", "individualMemberType", "unitMemberType", "unitName", "name", "memberLevel", "joinTime", "session"];
let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, SelectFiles, {joinTime:-1}, pageNumber);
// let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber, 10);
let dataCount = await findCount(TABLEENUM.用户表, selectParam);
let dataList = [];
const itemFiles = ["userId", "memberState", "memberType", "unitName", "name", "memberLevel", "joinTime", "orderCycleStart", "money", "durationYear"];
const itemFiles = ["userId", "memberState", "memberType", "unitName", "name", "memberLevel", "joinTime", "orderCycleStart", "money", "durationYear", "session"];
for (let i = 0; i < dbList.length; i++) {
let info = dbList[i];
let item:any = extractData(info, itemFiles);
......@@ -468,6 +466,8 @@ export async function getRenewalPeriod({name, memberType, documentId, phone, mai
}
});
item.session = getEdition(Math.floor(item.session/100), item.session%100 ),
dataList.push(item);
};
......
src/config/outPutConfig.ts
......@@ -40,7 +40,10 @@ export enum UNITAUDITINGCOLUMNS {
科研负责人 = "yuanXiaoKeYanFuZeRen",
单位简介 = "danWeiJianJie",
标签 = "lableId"
标签 = "lableId",
状态 = "memberState",
届次 = "session",
职务 = "memberLevel"
}
......@@ -64,7 +67,10 @@ export enum AUDITINGCOLUMNS {
职务 = "duties",
学历 = "education",
职称 = "workTitle",
标签 = "lableId"
标签 = "lableId",
状态 = "memberState",
届次 = "session",
级别 = "memberLevel"
}
......@@ -84,7 +90,8 @@ export enum CONFIRMRECEIPTCOLUMNS {
"单位/个人邮箱" = "mail",
提交时间 = "operationTime", //上传转账凭证的时间
会员职务 = "memberLevel",
注册手机号="phone"
注册手机号="phone",
届次 = "session"
}
......@@ -159,7 +166,8 @@ export enum MEMBERFEESDCOLUMNS {
会员职务 = "memberLevel",
入会时间 = "joinTime",
缴费金额 = "Money",
"欠费具体年份" = "duration"
"欠费具体年份" = "duration",
"届次" = "session"
}
......@@ -175,7 +183,9 @@ export enum MEMBERPAYMENTCOLUMNS {
缴费金额 = "Money",
缴费年限 = "paymentYear",
欠费具体年份 = "duration",
欠费年限 = "durationYear"
欠费年限 = "durationYear",
"届次" = "session",
缴费具体年份 = "jiaofeijutinianfen"
}
......
src/main.ts
import { testCallback } from "./biz/member/cost";
import { initActivity } from "./biz/member/msgActivity";
import { initSaveUnsubmitted } from "./biz/register";
import { initSMS } from "./biz/sms";
......@@ -28,7 +28,7 @@ async function lanuch() {
// console.log(moment(1498262400000).format("YYYY-MM-DD HH:mm:SS"))
console.log("服务初始化成功");
// await testCallback("aeaa2492b585abd2bcfe4302a59bccb4")
// await testCallback("40a4e33658fa681429b9990434675c24")
}
lanuch();
......
src/routers/apply/router.ts
......@@ -19,7 +19,8 @@ export const Config = {
{key:"beforeChange", type:"[Number]", desc:"变更前会员等级职务", isNull:true},
{key:"memberLevel", type:"[Number]", desc:"变更后会员等级职务", isNull:true},
{key:"memberCategory", type:"Number", desc:"会员类别", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"}
{key:"pageNumber", type:"Number", desc:"当前页"},
{key:"pageSize", type:"Number", desc:"一页大小"}
],
bindBiz:applyBiz.applyList
},
......@@ -71,6 +72,7 @@ export const Config = {
{key:"name", type:"String", desc:"关键字搜索", isNull:true},
{key:"changeState", type:"Number", desc:"筛选状态 0是全部 1是通过 2是待审批 3是驳回修改", isNull:true},
{key:"pageNumber", type:"Number", desc:"分页"},
{key:"pageSize", type:"Number", desc:"一页显示大小"},
],
bindBiz:applyBiz.infomationChangeList
},
......
src/routers/member/router.ts
......@@ -375,8 +375,6 @@ export const Config = {
{key:"memberLevel", type:"[Number]", desc:"会员等级职务", isNull:true},
{key:"session", type:"Number", desc:"届次", isNull:true},
{key:"memberState", type:"Number", desc:"状态", isNull:true},
{key:"sheng", type:"String", desc:"省", isNull:true},
{key:"shi", type:"String", desc:"市", isNull:true},
{key:"lableId", type:"[String]", desc:"标签Id", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"}
],
......@@ -397,8 +395,6 @@ export const Config = {
{key:"session", type:"Number", desc:"届次", isNull:true},
{key:"profCategory", type:"Number", desc:"专业类别", isNull:true},
{key:"memberState", type:"Number", desc:"状态", isNull:true},
{key:"sheng", type:"String", desc:"省", isNull:true},
{key:"shi", type:"String", desc:"市", isNull:true},
{key:"lableId", type:"[String]", desc:"标签Id", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"}
],
......@@ -557,6 +553,7 @@ export const Config = {
{key:"sheng", type:"String", desc:"省", isNull:true},
{key:"shi", type:"String", desc:"市", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"},
{key:"pageSize", type:"Number", desc:"一页显示多少数据"},
{key:"examineState", type:"Number", desc:"审核状态", isNull:true},
],
bindBiz:examineBiz.pendingReviewList
......@@ -625,6 +622,7 @@ export const Config = {
{key:"joinStartTime", type:"Number", desc:"入会开始时间", isNull:true},
{key:"joinEndTime", type:"Number", desc:"入会结束时间", isNull:true},
{key:"memberLevel", type:"[Number]", desc:"个人级别职务", isNull:true},
{key:"session", type:"Number", desc:"届次", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"}
],
bindBiz:memberFeesBiz.getPaid
......@@ -665,7 +663,7 @@ export const Config = {
{key:"joinStartTime", type:"Number", desc:"入会开始时间", isNull:true},
{key:"joinEndTime", type:"Number", desc:"入会结束时间", isNull:true},
{key:"memberLevel", type:"[Number]", desc:"个人级别职务", isNull:true},
{key:"arrears", type:"Number", desc:"是否欠费 0全部 1是 2否", isNull:true},
{key:"session", type:"Number", desc:"届次", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"}
],
bindBiz:memberFeesBiz.getRenewalPeriod
......
src/routers/order/router.ts
......@@ -53,8 +53,10 @@ export const Config = {
// {key:"paymentType", type:"Number", desc:"支付方式", isNull:true},2024年12月21日去掉
{key:"examineState", type:"Number", desc:"审批状态 0是全部，1是待审批2是已审批", isNull:true},
{key:"payType", type:"Number", desc:"支付方式 1是微信支付 2是线下支付 3全部"},
{key:"costType", type:"Number", desc:"会费类别", isNull:true},
{key:"pageNumber", type:"Number", desc:"分页-当前页面"}
{key:"paymentNum", type:"String", desc:"支付单号", isNull:true},
{key:"pageNumber", type:"Number", desc:"分页-当前页面"},
{key:"pageSize", type:"Number", desc:"分页-当前页大小"},
{key:"session", type:"Number", desc:"届次", isNull:true},
],
bindBiz:costVerificationBiz.paidList
},
......@@ -74,7 +76,8 @@ export const Config = {
{key:"payState", type:"Number", desc:"支付状态 1是已支付 2是未支付 3是全部"},
{key:"invoiceState", type:"Number", desc:"发票状态 0是全部 1是已申请 2是未申请", isNull:true},
{key:"weChartPR", type:"String", desc:"微信支付单号", isNull:true},
{key:"pageNumber", type:"Number", desc:"分页-当前页面"}
{key:"pageNumber", type:"Number", desc:"分页-当前页面"},
{key:"pageSize", type:"Number", desc:"分页-一页大小"}
],
bindBiz:invoiceBiz.billStateList
},
......@@ -108,7 +111,9 @@ export const Config = {
apiName:"财务核对-数据导出",
subUrl:'/order/invoice/examine/outputconfirmreceipt',
param:[
{key:"exportColumns", type:"[]", desc:"导出数据列"}
{key:"exportColumns", type:"[]", desc:"导出数据列"},
{key:"examineState", type:"Number", desc:"审批状态 0是全部，1是待审批2是已审批", isNull:true},
{key:"payType", type:"Number", desc:"支付方式 1是微信支付 2是线下支付 3全部"},
],
bindBiz:costVerificationBiz.outPutConfirmReceipt
},
......@@ -141,7 +146,9 @@ export const Config = {
apiName:"待开发票-数据导出",
subUrl:'/order/invoice/examine/outputbillstate',
param:[
{key:"exportColumns", type:"[]", desc:"导出数据列"}
{key:"exportColumns", type:"[]", desc:"导出数据列"},
{key:"payState", type:"Number", desc:"支付状态 1是已支付 2是未支付 3是全部"},
{key:"invoiceState", type:"Number", desc:"发票状态 0是全部 1是已申请 2是未申请", isNull:true},
],
bindBiz:invoiceBiz.outPutBillState
},
......
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