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

src/biz/member/examine.ts

@@ -115,8 +115,7 @@ export async function adopt({id, session}) {
         subType = userInfo.individualMemberType;
     }
 
-    //todo 创建一条初始订单
-    
+    //创建初始订单
     await createOrder(id, userInfo.loginId, userInfo.phone, unitName, NowMs + 1000, MEMBERLEVEL.普通会员, userInfo.memberType, subType, true);
 
     await updateOneData(TABLEENUM.用户表, {userId:id}, updateInfo);
@@ -136,6 +135,79 @@ export async function adopt({id, session}) {
 
 
 /**
+ * 批量通过
+ * @param param0 
+ */
+export async function batchAdopt({idList, session}) {
+    //限制长度
+    if (idList.length >= 10) throw new BizError(ERRORENUM.批量操作超过个数限制);
+
+    let thisDate = new Date();
+    const NowMs = thisDate.valueOf();
+
+    for (let i = 0; i < idList.length; i++) {
+        let id = idList[i];
+        if (!id) continue;//空id跳过
+
+        let userInfo = await findOnce(TABLEENUM.用户表, {userId:id, isAdmin:STATE.否}, ["userId", "registerFlow", "loginId","userRegisterState", "memberType", "unitName", "name", "phone", "sheng"]);
+        if (!userInfo || !userInfo.userId) throw new BizError(ERRORENUM.目标数据不存在, id);
+        if (userInfo.memberType == MEMBERTYPE.个人会员 && userInfo.registerFlow != REGISTERFLOW.完成第二步) {
+            throw new BizError(ERRORENUM.不具备审批条件, `${userInfo.userId}为个人会员，并没有完成第二步`);
+        }
+        if (userInfo.memberType == MEMBERTYPE.单位会员 && userInfo.registerFlow != REGISTERFLOW.完成第三步) {
+            throw new BizError(ERRORENUM.不具备审批条件, `${userInfo.userId}为单位会员，并没有完成第三步`);
+        }
+        if (userInfo.userRegisterState == USERREGISTERSTATE.驳回修改) {
+            throw new BizError(ERRORENUM.不具备审批条件, `${userInfo.userId}当前状态为驳回修改`);
+        }
+        if (userInfo.userRegisterState == USERREGISTERSTATE.通过) {
+            throw new BizError(ERRORENUM.重复提交, `${userInfo.userId}当前状态为已通过`);
+        }
+
+        let userCount = await findCount(TABLEENUM.用户表, {isAdmin:0, memberType:userInfo.memberType,  userRegisterState:USERREGISTERSTATE.通过});
+        let memberNum = getMenberNum(thisDate, userInfo.sheng, userCount, userInfo.memberType);
+    
+        let updateInfo:any = {
+            auditTime:NowMs,
+            joinTime:NowMs,
+            userRegisterState:USERREGISTERSTATE.通过,
+            session:session,
+            paymentStatus:PAYMENTSTATUS.未支付,
+            lifespanStartTime:NowMs,
+            lifespanEndTime:NowMs + 1000,
+            memberLevel:MEMBERLEVEL.普通会员,
+            memberState:MEMBERSTATE.异常,
+            memberNum
+        };
+        let unitName = userInfo.unitName;
+        let subType = userInfo.unitMemberType;
+        if (userInfo.memberType == MEMBERTYPE.个人会员) {
+            updateInfo.individualMemberType = INDIVIDUALMEMBERTYPE.普通会员;
+            subType = userInfo.individualMemberType;
+        }
+        
+        //创建初始订单
+        await createOrder(id, userInfo.loginId, userInfo.phone, unitName, NowMs + 1000, MEMBERLEVEL.普通会员, userInfo.memberType, subType, true);
+    
+        await updateOneData(TABLEENUM.用户表, {userId:id}, updateInfo);
+    
+        /**提交审批历史信息 */
+        let addApprovalHistory = {
+            id:generateSystemId(TABLEENUM.审批历史表, id),
+            userId:id,
+            operationTime:NowMs,
+            operationBehavior:OPERATIONREHAVIOR.通过,
+            remarks:"通过"
+        };
+        await addManyData(TABLEENUM.审批历史表, addApprovalHistory);
+
+    }
+
+    return successResult();
+}
+
+
+/**
  * 驳回 success
  * @param userId 
  * @param remarks 驳回理由

src/config/errorEnum.ts

@@ -53,7 +53,8 @@ export enum ERRORENUM {
     不存在该手机号的账号,
     该动态未开放,
     找不到该机构,
-    源文章已被删除
+    源文章已被删除,
+    批量操作超过个数限制
 }
 
 export enum ERRORCODEENUM {

src/routers/member/router.ts

@@ -441,6 +441,15 @@ export const Config = {
             bindBiz:examineBiz.adopt
         },
         {
+            apiName:"批量通过审批",
+            subUrl:'/examine/batchadopt', 
+            param:[
+                {key:"idList", type:"[String]", desc:"批量审核的用户列表"},
+                {key:"session", type:"Number", desc:"审批届次"},
+            ],
+            bindBiz:examineBiz.batchAdopt
+        },
+        {
             apiName:"驳回审批",
             subUrl:'/examine/reject', 
             param:[

src/routers/router.ts

@@ -19,18 +19,18 @@ import * as asyncHandler from 'express-async-handler';
 import { payCallback } from "../biz/member/cost";
 import { checkUser } from "../middleware/user";
 
-const Look = false;//true更新文档
+const Look = true;//true更新文档
 
 export async function setRouter(httpServer){
     if (Look) {
         await getDoc();
         // await initDoc(portalRouter.FirstName, portalRouter.Config, portalRouter.FirstRouter);//网站编辑
         // await initDoc(publicRouter.FirstName, publicRouter.Config, publicRouter.FirstRouter);//公用组件
-        // await initDoc(memberRouter.FirstName, memberRouter.Config, memberRouter.FirstRouter);//用户路由
+        await initDoc(memberRouter.FirstName, memberRouter.Config, memberRouter.FirstRouter);//用户路由
         // await initDoc(officalWebsiteRouter.FirstName, officalWebsiteRouter.Config, officalWebsiteRouter.FirstRouter);//官网路由
         // await initDoc(orderRouter.FirstName, orderRouter.Config, orderRouter.FirstRouter);//会费相关
         // await initDoc(costRouter.FirstName, costRouter.Config, costRouter.FirstRouter);//支付
-        await initDoc(outPutRouter.FirstName, outPutRouter.Config, outPutRouter.FirstRouter);//导出路由
+        // await initDoc(outPutRouter.FirstName, outPutRouter.Config, outPutRouter.FirstRouter);//导出路由
     }
     analysisRouter(httpServer, portalRouter.Config, portalRouter.FirstRouter, true);//网站编辑
     analysisRouter(httpServer, publicRouter.Config, publicRouter.FirstRouter, false);//公用组件