no message

src/biz/member/order.ts

@@ -340,19 +340,22 @@ export async function invoicedList({unitName, paymentType, isPay, pageNumber}) {
     if (paymentType) findParam.paymentMethod = paymentType;
     if (isPay) findParam.state = isPay
 
-    let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "state", "paymentNum" ];
+    let selectFile = ["id", "unitName", "orderCycleStart", "orderCycleEnd", "money", "paymentMethod", "memberCategory", "state", "paymentNum", "userId" ];
     let dbList = await findToPage(TABLEENUM.订单表, findParam, selectFile, pageNumber);
     let dataCount = await findCount(TABLEENUM.订单表, findParam);
 
     let dataList = [];
 
-    let itemFile = ["unitName", "money", "paymentNum"];
-    dbList.forEach(info =>  {
+    let itemFile = ["id", "unitName", "money", "paymentNum", "state", "userId"];
+    dbList.forEach(async info =>  {
         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.memberType = changeEnumValue(MEMBERTYPE, itemData.memberCategory);
         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.memberState = userInfo.memberState;
         dataList.push(itemData);
     });
 

src/biz/register.ts

@@ -199,11 +199,10 @@ export async function unitMemberRegister2({form, keyanForm, id}) {
  * @param userId 
  */
 export async function unitMemberRegister3({application, id}) {
-    let selectUserFiles = ["userId", "registerFlow", "userRegisterState", "application"];
+    let selectUserFiles = ["userId", "registerFlow", "userRegisterState", "application", "memberType"];
     let oldInfo = await findOnce(TABLEENUM.用户表, {userId:id, memberType:MEMBERTYPE.单位会员, isAdmin:STATE.否}, selectUserFiles);
     if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
     if (oldInfo.registerFlow != REGISTERFLOW.完成第二步) throw new BizError(ERRORENUM.重复提交);
-
     if (oldInfo.memberType != MEMBERTYPE.单位会员) throw new BizError(ERRORENUM.流程3不支持会员身份非单位会员);
     
     /**判断是否第一次提交审核 并更新状态*/

src/routers/member/router.ts

@@ -170,7 +170,7 @@ export const Config = {
             subUrl:'/memberdb/registerflowtype',
             param:[
                 {
-                    key:"id", type:"String", desc:"用户id"
+                    key:"id", type:"String", desc:"用户id", isNull:true
                 }
             ],
             bindBiz:registerBiz.registerFlowType