Skip to content

W
wenHuaBu_adminServer
Commit 725578eb by lixinming
Options

Merge branch 'master' of http://123.207.147.179:8888/node_server/wenHuaBu_adminServer

parents 014d0afd 480acbf4
Showing with 45 additions and 46 deletions
src/biz/member/examine.ts
......@@ -33,7 +33,7 @@ import { systemSendMail } from "../mail";
* @param shi 市
* @param pageNumber 当前页
*/
export async function pendingReviewList({name, memberType, documentId, phone, mail, sheng, shi, pageNumber,pageSize, examineState}) {
export async function pendingReviewList({name, memberType, documentId, phone, mail, examineState, pageNumber, pageSize}) {
if (pageSize > 50 || pageSize < 10) throw new BizError(ERRORENUM.参数错误, "待审核页面大小错误", pageSize);
/**查询条件 */
let selectParam:any = {
......@@ -98,10 +98,9 @@ export async function pendingReviewList({name, memberType, documentId, phone, ma
if (documentId) selectParam.documentId = documentId;
if (phone) selectParam.phone = phone;
if (mail) selectParam.mail = mail;
if (sheng) selectParam.sheng = sheng;
if (shi) selectParam.shi = shi;
const SelectFiles = ["userId", "userRegisterState", "unitName", "name", "loginId", "phone", "askForTime", "memberLevel", "sheng", "shi", "qu", "individualMemberType", "unitMemberType", "memberType", "mail"];
const SelectFiles = ["userId", "userRegisterState", "unitName", "name", "loginId", "phone", "askForTime", "memberLevel", "sheng", "shi", "qu",
"individualMemberType", "unitMemberType", "memberType", "mail", "documentId"];
let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, SelectFiles, {askForTime:-1}, pageNumber, pageSize);
let dataCount = await findCount(TABLEENUM.用户表, selectParam);
......@@ -141,7 +140,7 @@ export async function pendingReviewList({name, memberType, documentId, phone, ma
/**
* 入会审批-提交资料列表
*/
export async function submitDocument({name, memberType, documentId, phone, mail, sheng, shi, pageNumber, pageSize}) {
export async function submitDocument({name, memberType, documentId, phone, mail, pageNumber, pageSize}) {
if (pageSize > 50 || pageSize < 10) throw new BizError(ERRORENUM.参数错误, "待审核页面大小错误", pageSize);
/**查询条件 */
let selectParam:any = {
......@@ -197,10 +196,9 @@ export async function submitDocument({name, memberType, documentId, phone, mail,
if (documentId) selectParam.documentId = documentId;
if (phone) selectParam.phone = phone;
if (mail) selectParam.mail = mail;
if (sheng) selectParam.sheng = sheng;
if (shi) selectParam.shi = shi;
const SelectFiles = ["userId", "userRegisterState", "unitName", "name", "loginId", "phone", "askForTime", "memberLevel", "individualMemberType", "unitMemberType", "memberType", "mail"];
const SelectFiles = ["userId", "userRegisterState", "unitName", "name", "loginId", "phone", "askForTime", "memberLevel",
"individualMemberType", "unitMemberType", "memberType", "mail", "sheng", "shi", "qu", "documentId"];
let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, SelectFiles, {askForTime:-1}, pageNumber, pageSize);
let dataCount = await findCount(TABLEENUM.用户表, selectParam);
......@@ -211,9 +209,9 @@ export async function submitDocument({name, memberType, documentId, phone, mail,
if (!item.userRegisterState) item.userRegisterState = USERREGISTERSTATE.待审核;
else item.userRegisterState = changeEnumValue(USERREGISTERSTATE, item.userRegisterState);
item.memberLevel = changeEnumValue(MEMBERLEVEL, item.memberLevel);
// item.sheng = getCityNameByCode(item.sheng);
// item.shi = getCityNameByCode(item.shi);
// item.qu = getCityNameByCode(item.qu);
item.sheng = getCityNameByCode(item.sheng);
item.shi = getCityNameByCode(item.shi);
item.qu = getCityNameByCode(item.qu);
if(item.individualMemberType) {
item.memberType = changeEnumValue(MEMBERTYPEECCENUM, info.individualMemberType);
}
......@@ -228,7 +226,7 @@ export async function submitDocument({name, memberType, documentId, phone, mail,
item.askForTime = item.askForTime || item.firstStep;
item.day = moment().diff(item.askForTime, 'days') + "天";
item.day = moment(item.askForTime).format("YYYY-MM-DD");
dataList.push(item);
});
......@@ -273,7 +271,7 @@ export async function delRejectJoin({id}) {
/**
* 入会审批-驳回列表
*/
export async function rejectList({name, memberType, documentId, phone, mail, sheng, shi, pageNumber, pageSize}) {
export async function rejectList({name, memberType, documentId, phone, mail, pageNumber, pageSize}) {
if (pageSize > 50 || pageSize < 10) throw new BizError(ERRORENUM.参数错误, "待审核页面大小错误", pageSize);
/**查询条件 */
let selectParam:any = {
......@@ -328,10 +326,9 @@ export async function rejectList({name, memberType, documentId, phone, mail, she
if (documentId) selectParam.documentId = documentId;
if (phone) selectParam.phone = phone;
if (mail) selectParam.mail = mail;
if (sheng) selectParam.sheng = sheng;
if (shi) selectParam.shi = shi;
const SelectFiles = ["userId", "userRegisterState", "unitName", "name", "loginId", "phone", "askForTime", "memberLevel", "individualMemberType", "unitMemberType", "memberType", "mail"];
const SelectFiles = ["userId", "userRegisterState", "unitName", "name", "loginId", "phone", "askForTime", "memberLevel",
"individualMemberType", "unitMemberType", "memberType", "mail", "sheng", "shi", "qu", "documentId"];
let dbList = await findToSortToPage(TABLEENUM.用户表, selectParam, SelectFiles, {askForTime:-1}, pageNumber, pageSize);
let dataCount = await findCount(TABLEENUM.用户表, selectParam);
......@@ -355,6 +352,9 @@ export async function rejectList({name, memberType, documentId, phone, mail, she
if(item.unitMemberType) {
item.memberType = changeEnumValue(MEMBERTYPEECCENUM, info.unitMemberType);
}
item.sheng = getCityNameByCode(item.sheng);
item.shi = getCityNameByCode(item.shi);
item.qu = getCityNameByCode(item.qu);
//这一行代码是兼容老用户没有 individualMemberType
if (info.memberType == MEMBERTYPE.个人会员) {
......
src/biz/member/finance/invoice.ts
......@@ -33,7 +33,7 @@ import { successResult } from "../../../tools/system";
* @param weChartPR 微信订单号
* @param pageNumber 当前页
*/
export async function billStateList({name, memberType, documentId, invoiceApplyMs, phone, mail, joinStartTime, pageSize, joinEndTime, memberLevel, payState,paymentType, invoiceState, weChartPR, pageNumber}) {
export async function billStateList({name, memberType, documentId, invoiceApplyMs, phone, mail, joinStartTime, joinEndTime, memberLevel, payState,paymentType, invoiceState, weChartPR, pageSize, pageNumber}) {
let testMs = new Date().valueOf();
if (payState != 1 && payState != 2 && payState != 3) throw new BizError(ERRORENUM.参数错误);
let findParam:any = {invoiceStatus:{"$ne":INVOICESTATUS.已开发票}};
......@@ -302,7 +302,8 @@ export async function backInvoice({id}) {
selectConf.push(info.value);
})
let selectFile = ["id", "unitName", "userId", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "paymentNum", "desc", "invoiceMail", "confirmReceiptMs", "payTime"];
let selectFile = ["id", "unitName", "userId", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "paymentNum", "desc",
"invoiceMail", "confirmReceiptMs", "payTime", "invoiceTime"];
let dbList = await find(TABLEENUM.订单表, findParam, selectFile);
let timeChnageList = ["orderCycleStart", "operationTime", "confirmReceiptMs", "payTime"];
let memberChnageList = ["name", "card", "mail"];
......@@ -311,6 +312,7 @@ export async function backInvoice({id}) {
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 orderInfo = await findOnceToSort(TABLEENUM.订单审批历史表, {orderId:info.id,operationBehavior:ORDEREXAMINE.用户提交, refundName:null}, {operationTime:-1}, ["operationTime"]);
let subList = [];
for (let i = 0; i < selectConf.length; i++) {
let key = selectConf[i];
......@@ -333,6 +335,10 @@ export async function backInvoice({id}) {
}
}
if (key == "orderCycle") value = `${moment(info.orderCycleStart).format("YYYY-MM-DD")}至${moment(info.orderCycleEnd).format("YYYY-MM-DD")}`;
if (key == "invoiceTime") {
if (orderInfo && orderInfo.operationTime) value = moment(orderInfo.operationTime).format("YYYY-MM-DD");
else value = "-"
}
// if (key == "payTime") {
// if (info.paymentMethod != PAYMENTTYPE.微信支付) value = "-"
// }
......@@ -413,13 +419,14 @@ export async function billStateBatchAdopt({idList}) {
* @param mail 单位/个人邮箱
* @param joinStartTime 入会开始时间
* @param joinEndTime 入会结束时间
* @param invoiceExamineTime 已开票时间
* @param memberLevel 会员级别/职务 多选
* 会员级别/职务：【普通会员、理事会员、常务理事会员】
* @param paymentType 支付方式
* @param isPay 是否支付
* @param pageNumber 当前页
*/
export async function invoicedList({name, memberType, documentId, invoiceExamineTime, phone, mail, joinStartTime, joinEndTime, memberLevel, paymentType, isPay, weChartPR, pageNumber}) {
export async function invoicedList({name, memberType, documentId, invoiceExamineTime, phone, mail, memberLevel, paymentType, isPay, weChartPR, pageNumber}) {
eccEnumValue("发票列表", "支付类型", PAYMENTTYPE, paymentType);
eccEnumValue("发票列表", "是否支付", ISPAYENUM, isPay );
......@@ -456,15 +463,6 @@ export async function invoicedList({name, memberType, documentId, invoiceExamine
isSelectUser = true;
itemParam.mail = mail;
}
if (joinStartTime) {
isSelectUser = true;
itemParam["joinTime"] = {"$gt":joinStartTime};
}
if (joinEndTime) {
isSelectUser = true;
if (!itemParam["joinTime"]) itemParam["joinTime"] = {};
itemParam["joinTime"]["$lt"] = joinEndTime;
}
if (memberLevel && memberLevel.length) {
isSelectUser = true;
itemParam.memberLevel = {"$in":memberLevel};
......@@ -540,6 +538,7 @@ export async function invoicedList({name, memberType, documentId, invoiceExamine
})
let selectFile = ["id", "unitName", "userId", "orderCycleStart", "orderCycleEnd", "invoiceExamineTime", "money", "paymentMethod", "memberCategory", "paymentNum", "desc", "invoiceMail", "confirmReceiptMs", "payTime"];
let dbList = await find(TABLEENUM.订单表, findParam, selectFile);
let timeChnageList = ["orderCycleStart", "operationTime", "confirmReceiptMs", "payTime"];
......
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", "session"];
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);
......@@ -108,7 +108,10 @@ export async function unitMemberDetails({userId, id}) {
let oldInfo = await findOnce(TABLEENUM.用户表, {userId:id});
if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
let topInfo:any = extractData(oldInfo, ["session", "memberLevel"]);
topInfo.session = getEdition(parseInt(`${topInfo.session/100}`), parseInt(`${topInfo.session%100}`) );
let session = "";
if (!topInfo.session) session = "";
else session = getEdition(parseInt(`${topInfo.session/100}`), parseInt(`${topInfo.session%100}`) );
topInfo.session = session;
/**处理枚举值 */
topInfo.memberLevel = changeEnumValue(MEMBERLEVEL, topInfo.memberLevel);
......@@ -319,7 +322,10 @@ export async function individualMemberDetails({userId, id}) {
let topInfo:any = extractData(oldInfo, TopConfig);
topInfo.memberLevel = changeEnumValue(MEMBERLEVEL, topInfo.memberLevel);
topInfo.session = getEdition(parseInt(`${topInfo.session/100}`), parseInt(`${topInfo.session%100}`) );
let session = "";
if (!topInfo.session) session = "";
else session = getEdition(parseInt(`${topInfo.session/100}`), parseInt(`${topInfo.session%100}`) );
topInfo.session = session;
let basicInfo:any = extractData(oldInfo, IndividualBasicConfig);
// basicInfo.documentType = changeEnumValue(DOCUMENTTYPE, basicInfo.documentType);
......
src/biz/member/memberFees.ts
......@@ -488,7 +488,7 @@ export async function offlinePayment({orderId, paymentNum, offlinePaymentUrl })
paymentNum,
offlinePaymentUrl,
state:ORDERSTATE.已支付,
paymentMethod:PAYMENTTYPE.线下支付,
paymentMethod:PAYMENTTYPE.后台上传,
payTime:new Date().valueOf(),
confirmReceipt:RECEIPTCONFIRMATION.收款确认,
confirmReceiptMs:new Date().valueOf()
......
src/biz/member/order.ts
......@@ -140,7 +140,7 @@ export async function createOrder(id:string, loginId:string, phone:string, unitN
// paymentNum,
// offlinePaymentUrl,
// state:ORDERSTATE.已支付,
// paymentMethod:PAYMENTTYPE.线下支付,
// paymentMethod:PAYMENTTYPE.后台上传,
// payTime:new Date().valueOf(),
// confirmReceipt:RECEIPTCONFIRMATION.待确认
// };
......@@ -415,7 +415,7 @@ export async function getInvoiceStatus({id}) {
paymentNum:weChartPR,
offlinePaymentUrl,
state:ORDERSTATE.已支付,
paymentMethod:PAYMENTTYPE.线下支付,
paymentMethod:PAYMENTTYPE.后台上传,
payTime:new Date().valueOf(),
confirmReceipt:RECEIPTCONFIRMATION.待确认,
invoiceMail,
......@@ -761,7 +761,7 @@ export async function reconfirm({id, weChartPR, offlinePaymentUrl, desc}) {
paymentNum:weChartPR,
offlinePaymentUrl,
state:ORDERSTATE.已支付,
paymentMethod:PAYMENTTYPE.线下支付,
paymentMethod:PAYMENTTYPE.后台上传,
payTime:new Date().valueOf(),
confirmReceipt:RECEIPTCONFIRMATION.待确认,
desc
......
src/config/enum.ts
......@@ -526,7 +526,7 @@ export enum RECEIPTCONFIRMATION {
export enum PAYMENTTYPE {
微信支付 = 1,
银行转账,
线下支付
后台上传
}
......
src/config/outPutConfig.ts
......@@ -43,7 +43,6 @@ export enum UNITAUDITINGCOLUMNS {
标签 = "lableId",
状态 = "memberState",
届次 = "session",
职务 = "memberLevel",
会员职务 = "memberLevel"
}
......@@ -117,7 +116,8 @@ export enum BILLSTATECOLUMNS {
提交时间 = "operationTime", //上传转账凭证的时间
支付时间 = "payTime", //微信支付的时间
会员职务 = "memberLevel",
注册手机号="phone"
注册手机号="phone",
发票申请时间 = "invoiceTime",
}
......
src/routers/member/router.ts
......@@ -552,8 +552,6 @@ export const Config = {
{key:"documentId", type:"String", desc:"身份证", isNull:true},
{key:"phone", type:"String", desc:"登录手机号", isNull:true},
{key:"mail", type:"String", desc:"邮箱", isNull:true},
{key:"sheng", type:"String", desc:"省", isNull:true},
{key:"shi", type:"String", desc:"市", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"},
{key:"pageSize", type:"Number", desc:"一页显示多少数据"},
],
......@@ -584,8 +582,6 @@ export const Config = {
{key:"documentId", type:"String", desc:"身份证", isNull:true},
{key:"phone", type:"String", desc:"登录手机号", isNull:true},
{key:"mail", type:"String", desc:"邮箱", isNull:true},
{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},
......@@ -636,8 +632,6 @@ export const Config = {
{key:"documentId", type:"String", desc:"身份证", isNull:true},
{key:"phone", type:"String", desc:"登录手机号", isNull:true},
{key:"mail", type:"String", desc:"邮箱", isNull:true},
{key:"sheng", type:"String", desc:"省", isNull:true},
{key:"shi", type:"String", desc:"市", isNull:true},
{key:"pageNumber", type:"Number", desc:"当前页"},
{key:"pageSize", type:"Number", desc:"一页显示多少数据"},
],
......
src/routers/order/router.ts
......@@ -178,8 +178,8 @@ export const Config = {
{key:"documentId", type:"String", desc:"身份证", isNull:true},
{key:"phone", type:"String", desc:"手机号", isNull:true},
{key:"mail", type:"String", desc:"邮箱", isNull:true},
{key:"joinStartTime", type:"Number", desc:"入会开始时间", isNull:true},
{key:"joinEndTime", type:"Number", desc:"入会结束时间", isNull:true},
// {key:"joinStartTime", type:"Number", desc:"入会开始时间", isNull:true},
// {key:"joinEndTime", type:"Number", desc:"入会结束时间", isNull:true},
{key:"memberLevel", type:"[Number]", desc:"个人级别职务", isNull:true},
{key:"paymentType", type:"Number", desc:"支付方式", isNull:true},
{key:"isPay", type:"Number", desc:"是否支付", isNull:true},
......
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