Commit d793fb9c by lixinming

no message

parent f9e9962f
......@@ -46,7 +46,7 @@ export async function pendingReviewList({unitName, joinTime, memberType, sheng,
if (shi) selectParam.shi = shi;
if (qu) selectParam.qu = qu;
const SelectFiles = ["userId", "userRegisterState", "unitName", "loginId", "phone", "askForTime", "memberLevel", "sheng", "shi", "qu"];
const SelectFiles = ["userId", "userRegisterState", "unitName", "loginId", "phone", "askForTime", "memberLevel", "sheng", "shi", "qu", "memberType"];
let dbList = await findToPage(TABLEENUM.用户表, selectParam, SelectFiles, pageNumber);
let dataCount = await findCount(TABLEENUM.用户表, selectParam);
......@@ -60,6 +60,7 @@ export async function pendingReviewList({unitName, joinTime, memberType, sheng,
item.sheng = getCityNameByCode(item.sheng);
item.shi = getCityNameByCode(item.shi);
item.qu = getCityNameByCode(item.qu);
item.memberType = changeEnumValue(MEMBERTYPE, info.memberType);
dataList.push(item);
});
......
......@@ -90,7 +90,7 @@ export async function unitMemberDetails({id}) {
let basicInfo:any = extractData(oldInfo, UnitBasicConfig);
/**获取订单表新社会信用代码和新发票抬头 */
let orderInfo = await findOnce(TABLEENUM.订单表, {userId:id});
if (!orderInfo || !orderInfo.userId) {
if (!orderInfo.newUscc || ! orderInfo.newUnitName) {
basicInfo.newUscc = "-";
basicInfo.newUnitName = "-";
} else {
......
......@@ -84,7 +84,6 @@ export async function firstOrderList({unitName, joinTime, memberType, orderState
if (unitName) findParam.unitName = {"$regex":unitName};
if (memberType) findParam.memberCategory = memberType;
if (orderState) findParam.state = orderState;
let selectFile = ["id", "unitName", "loginId", "phone", "orderCycleStart", "orderCycleEnd", "memberCategory", "state"];
let dbList = await findToPage(TABLEENUM.订单表, findParam, selectFile, pageNumber);
let dataCount = await findCount(TABLEENUM.订单表, findParam);
......
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