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

src/biz/member/examine.ts

@@ -58,8 +58,8 @@ export async function pendingReviewList({unitName, joinTime, memberType, sheng,
  * @param id 待审核列表返回的用户id 
  * @returns 
  */
-export async function adopt({id}) {
-    let userInfo = await findOnce(TABLEENUM.用户表, {userId:id, isAdmin:STATE.否}, ["userId", "registerFlow", "userRegisterState", "memberType", "unitName", "name"]);
+export async function adopt({id, session}) {
+    let userInfo = await findOnce(TABLEENUM.用户表, {userId:id, isAdmin:STATE.否, session}, ["userId", "registerFlow", "userRegisterState", "memberType", "unitName", "name"]);
     if (!userInfo || !userInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
     if (userInfo.memberType == MEMBERTYPE.个人会员 && userInfo.registerFlow != REGISTERFLOW.完成第二步) {
         throw new BizError(ERRORENUM.不具备审批条件, `${userInfo.userId}为个人会员，并没有完成第二步`);

src/biz/member/order.ts

@@ -318,7 +318,7 @@ export async function backInvoice({id}) {
  * 发票管理-已开发票 success
  * @param param0 
  */
-export async function InvoicedList({unitName, paymentType, isPay, pageNumber}) {
+export async function invoicedList({unitName, paymentType, isPay, pageNumber}) {
     eccEnumValue("发票列表", "支付类型", PAYMENTTYPE, paymentType);
     eccEnumValue("发票列表", "是否支付", ISPAYENUM, isPay );
 

src/biz/member/rightsMgmt.ts

@@ -25,12 +25,15 @@ export async function adminList({pageNumber}) {
     let dataList = [];
     dbList.forEach(info => {
         let {userId, memberState, loginId, adminLv, adminType} = info;
+        let memberStateStr = "正常";
+        if (memberState == MEMBERSTATE.冻结管理员) memberStateStr = "冻结";
+        
         dataList.push({
             userId,
-            memberState:changeEnumValue(MEMBERSTATE, memberState),
+            memberState:memberStateStr,
             loginId,
-            adminType,
-            adminLv
+            adminType:changeEnumValue(ADMINTYPE, adminType),
+            adminLv:changeEnumValue(ADMINLV, adminLv)
         });
     });
 
@@ -64,6 +67,7 @@ export async function addAdmin({userId, form}) {
     return sysTools.successResult();
 }
 
+
 export async function initAdmin() {
     let userInfo = await findOnce(TABLEENUM.用户表, {loginId:'admin'});    
     if (!userInfo || !userInfo.userId) {
@@ -80,6 +84,7 @@ export async function initAdmin() {
     console.log("初始化admin账号成功");
 }
 
+
 /**
  * 修改密码
  * @param userId 登录的用户id 

src/routers/member/router.ts

@@ -369,7 +369,8 @@ export const Config = {
             apiName:"通过审批",
             subUrl:'/examine/adopt', 
             param:[
-                {key:"id", type:"String", desc:"待审核列表返回的用户id"}
+                {key:"id", type:"String", desc:"待审核列表返回的用户id"},
+                {key:"session", type:"String", desc:"审批届次"},
             ],
             bindBiz:examineBiz.adopt
         },
@@ -622,6 +623,7 @@ export const Config = {
             apiName:"删除管理员",
             subUrl:'/rightsmgmt/deleteadmin',
             param:[
+                {key:"id", type:"String", desc:"列表返回的用户id"}
             ],
             bindBiz:rightsMgmtBiz.deleteAdmin
         },

src/routers/order/router.ts

@@ -75,7 +75,34 @@ export const Config = {
             ],
             bindBiz:orderBiz.confirmReceiptOut
         },
-        
+        {
+            apiName:"上传发票",
+            subUrl:'/order/invoice/examine/upinvoice', 
+            param:[
+                {key:"id", type:"String", desc:"订单id"},
+                {key:"invoiceUrl", type:"String", desc:"发票地址"},
+            ],
+            bindBiz:orderBiz.upInvoice
+        },
+        {
+            apiName:"退回发票",
+            subUrl:'/order/invoice/examine/backinvoice', 
+            param:[
+                {key:"id", type:"String", desc:"订单id"}
+            ],
+            bindBiz:orderBiz.backInvoice
+        },
+        {
+            apiName:"发票管理-已开发票",
+            subUrl:'/order/invoice/examine/invoicedlist', 
+            param:[
+                {key:"unitName", type:"String", desc:"单位名称"},
+                {key:"paymentType", type:"Number", desc:"会员类型"},
+                {key:"isPay", type:"Number", desc:"是否支付"},
+                {key:"pageNumber", type:"Number", desc:"当前页"},
+            ],
+            bindBiz:orderBiz.invoicedList
+        },
     ],
     "会员个人页":[
         {