Skip to content

W
wenHuaBu_adminServer
Commit 4072cff7 by chenjinjing
Options

no message

parent 4d1c5323
Showing with 27 additions and 23 deletions
src/biz/member/apply.ts
......@@ -34,8 +34,8 @@ export async function applyList({name, joinStartTime, joinEndTime, memberCategor
if (name) {
selectParam["$and"] = [{
"$or":[
{unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}}
{unitName:{"$regex":`${name}`}, memberType:MEMBERTYPE.单位会员},
{name:{"$regex":`${name}`}, memberType:MEMBERTYPE.个人会员}
]
}]
}
......
src/biz/member/examine.ts
......@@ -49,8 +49,8 @@ export async function pendingReviewList({name, memberType, documentId, phone, ma
if (!selectParam["$and"]) selectParam["$and"] = [];
selectParam["$and"] = [
{"$or":[
{unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}}
{unitName:{"$regex":`${name}`}, memberType:MEMBERTYPE.单位会员},
{name:{"$regex":`${name}`}, memberType:MEMBERTYPE.个人会员}
]}
];
}
......
src/biz/member/memberFees.ts
......@@ -173,8 +173,8 @@ export async function getPaid({name, memberType, documentId, phone, mail, joinSt
if (name) {
selectParam["$or"] = [
{unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}}
{unitName:{"$regex":`${name}`}, memberType:MEMBERTYPE.单位会员},
{name:{"$regex":`${name}`}, memberType:MEMBERTYPE.个人会员}
]
}
// if (memberType.length) {
......@@ -286,8 +286,8 @@ export async function unpaidList({name, memberType, documentId, phone, mail, joi
if (memberLevel.length) selectParam.memberLevel = {"$in":memberLevel};
if (name) {
selectParam["$or"] = [
{unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}}
{unitName:{"$regex":`${name}`}, memberType:MEMBERTYPE.单位会员},
{name:{"$regex":`${name}`}, memberType:MEMBERTYPE.个人会员}
]
}
if (joinStartTime) {
......@@ -382,8 +382,8 @@ export async function getRenewalPeriod({name, memberType, documentId, phone, mai
if (!selectParam["$and"]) selectParam["$and"] = [];
selectParam["$and"].push({
"$or":[
{unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}}
{unitName:{"$regex":`${name}`}, memberType:MEMBERTYPE.单位会员},
{name:{"$regex":`${name}`}, memberType:MEMBERTYPE.个人会员}
]
});
}
......@@ -556,8 +556,8 @@ export async function getGracePeriod({name, memberType, documentId, phone, mail,
}
if (name) {
selectParam["$or"] = [
{unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}}
{unitName:{"$regex":`${name}`}, memberType:MEMBERTYPE.单位会员},
{name:{"$regex":`${name}`}, memberType:MEMBERTYPE.个人会员}
]
}
if (joinStartTime) {
......
src/biz/member/order.ts
......@@ -178,8 +178,8 @@ export async function paidList({name, memberType, documentId, phone, mail, joinS
}
if (name) {
findParam["$or"] = [
{unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}}
{unitName:{"$regex":`${name}`}, memberType:MEMBERTYPE.单位会员},
{name:{"$regex":`${name}`}, memberType:MEMBERTYPE.个人会员}
]
}
if (memberType.length) {
......@@ -416,9 +416,10 @@ export async function confirmReceiptHistory({id}) {
* 会员级别/职务：【普通会员、理事会员、常务理事会员】
* @param paymentType 支付方式
* @param isPay 是否支付
* @param weChartPR 微信订单号
* @param pageNumber 当前页
*/
export async function billStateList({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, paymentType, isPay, pageNumber}) {
export async function billStateList({name, memberType, documentId, phone, mail, joinStartTime, joinEndTime, memberLevel, paymentType, isPay, weChartPR, pageNumber}) {
eccEnumValue("发票列表", "是否支付", ISPAYENUM, isPay );
let findParam:any = {
invoiceStatus:INVOICESTATUS.未开发票
......@@ -426,8 +427,8 @@ export async function billStateList({name, memberType, documentId, phone, mail,
if (name) {
findParam["$or"] = [
{unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}}
{unitName:{"$regex":`${name}`}, memberType:MEMBERTYPE.单位会员},
{name:{"$regex":`${name}`}, memberType:MEMBERTYPE.个人会员}
]
}
if (memberType && memberType.length) {
......@@ -453,14 +454,15 @@ export async function billStateList({name, memberType, documentId, phone, mail,
findParam.paymentMethod = paymentType;
}
if (isPay) findParam.state = isPay;
if (weChartPR) findParam.weChartPR = {"$regex":`${weChartPR}`};
let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "state", "paymentNum", "userId", "desc", "invoiceMail"];
let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "state", "paymentNum", "userId", "desc", "invoiceMail", "weChartCreatePayMs"];
let dbList = await findToPage(TABLEENUM.订单表, findParam, selectFile, pageNumber);
let dataCount = await findCount(TABLEENUM.订单表, findParam);
let dataList = [];
let itemFile = ["id", "userId", "unitName", "money", "paymentNum", "memberCategory", "state", "paymentMethod", "desc", "invoiceMail"];
let itemFile = ["id", "userId", "unitName", "money", "paymentNum", "memberCategory", "state", "paymentMethod", "desc", "invoiceMail", "weChartCreatePayMs"];
for (let i= 0; i < dbList.length; i++) {
let info = dbList[i];
let itemData:any = extractData(info, itemFile);
......@@ -473,6 +475,7 @@ export async function billStateList({name, memberType, documentId, phone, mail,
let userInfomation = await findOnce(TABLEENUM.用户表, {userId:itemData.userId}, ["userId", "memberState", "name"]);
itemData.memberState = changeEnumValue(MEMBERSTATE, userInfomation.memberState);
itemData.cycle = `${moment(info.orderCycleStart).format("YYYY-MM-DD")}至${moment(info.orderCycleEnd).format("YYYY-MM-DD")}`;
itemData.weChartCreatePayMs = moment(info.weChartCreatePayMs).format("YYYY-MM-DD");
itemData.name = userInfomation.name;
dataList.push(itemData);
}
......@@ -676,8 +679,8 @@ export async function invoicedList({name, memberType, documentId, phone, mail, j
};
if (name) {
findParam["$or"] = [
{unitName:{"$regex":`${name}`}},
{name:{"$regex":`${name}`}}
{unitName:{"$regex":`${name}`}, memberType:MEMBERTYPE.单位会员},
{name:{"$regex":`${name}`}, memberType:MEMBERTYPE.个人会员}
]
}
if (memberType && memberType.length) {
......@@ -1145,7 +1148,7 @@ export async function refundList({pageNumber}) {
let dataList = [];
let itemFile = ["id", "unitName", "money", "userId", "memberCategory", "refundBankCarId", "refundBankName"];
let itemFile = ["id", "name", "unitName", "money", "userId", "memberCategory", "refundBankCarId", "refundBankName"];
for (let i = 0; i < dbList.length; i++) {
let info = dbList[i];
......@@ -1154,7 +1157,7 @@ export async function refundList({pageNumber}) {
itemData.memberType = changeEnumValue(MEMBERTYPE, itemData.memberCategory);
itemData.cycle = `${moment(info.orderCycleStart).format("YYYY-MM-DD")}至${moment(info.orderCycleEnd).format("YYYY-MM-DD")}`;
let userInfo = await findOnce(TABLEENUM.用户表, {userId:itemData.userId}, ["memberState", "name"]);
itemData.name = userInfo.name;
if (userInfo) itemData.name = userInfo.name;
if (!info.isReplenishReturnInfo) itemData.state = "资料补充中";
else {
......
src/routers/order/router.ts
......@@ -68,6 +68,7 @@ export const Config = {
{key:"memberLevel", type:"[Number]", desc:"个人级别职务", isNull:true},
{key:"paymentType", type:"Number", desc:"支付方式", isNull:true},
{key:"isPay", type:"Number", desc:"是否支付", isNull:true},
{key:"weChartPR", type:"String", desc:"微信支付单号", isNull:true},
{key:"pageNumber", type:"Number", desc:"分页-当前页面"}
],
bindBiz:orderBiz.billStateList
......
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