Commit a26cc645 by chenjinjing

no message

parent fa507b90
...@@ -347,17 +347,19 @@ export async function invoicedList({unitName, paymentType, isPay, pageNumber}) { ...@@ -347,17 +347,19 @@ export async function invoicedList({unitName, paymentType, isPay, pageNumber}) {
let dataList = []; let dataList = [];
let itemFile = ["id", "unitName", "money", "paymentNum", "state", "userId"]; let itemFile = ["id", "unitName", "money", "paymentNum", "state", "userId"];
dbList.forEach(async info => {
for (let i = 0; i < dbList.length; i++) {
let info = dbList[i];
let itemData:any = extractData(info, itemFile); let itemData:any = extractData(info, itemFile);
let userInfo = await findOnce(TABLEENUM.用户表, {userId:itemData.userId}, ["memberState"])
itemData.joinTime = moment(info.orderCycleStart).format("YYYY-MM-DD"); itemData.joinTime = moment(info.orderCycleStart).format("YYYY-MM-DD");
itemData.memberType = changeEnumValue(MEMBERTYPE, itemData.memberCategory); itemData.memberType = changeEnumValue(MEMBERTYPE, itemData.memberCategory);
itemData.paymentMethod = changeEnumValue(MEMBERTYPE, itemData.paymentMethod); itemData.paymentMethod = changeEnumValue(MEMBERTYPE, itemData.paymentMethod);
itemData.cycle = `${moment(info.orderCycleStart).format("YYYY-MM-DD")}${moment(info.orderCycleEnd).format("YYYY-MM-DD")}`; itemData.cycle = `${moment(info.orderCycleStart).format("YYYY-MM-DD")}${moment(info.orderCycleEnd).format("YYYY-MM-DD")}`;
itemData.state = changeEnumValue(ORDERSTATE, itemData.state); itemData.state = changeEnumValue(ORDERSTATE, itemData.state);
let userInfo = await findOnce(TABLEENUM.用户表, {userId:itemData.userId}, ["memberState"])
itemData.memberState = userInfo.memberState; itemData.memberState = userInfo.memberState;
dataList.push(itemData); dataList.push(itemData);
}); }
return {dataList, dataCount}; return {dataList, dataCount};
} }
......
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