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

src/biz/member/homePage.ts

@@ -116,43 +116,43 @@ export async function unitMemberUpdate({form, keyanForm, userId}) {
  * @param userId 登录的用户id
  */
 export async function getXiaoXiZhongXin ({userId}) {
-    let oldInfo = await findOnce(TABLEENUM.用户表, {userId}, ["lifespanEndTime", "isGracePeriod", "gracePeriodEndTime"]);
-    if (!oldInfo || !oldInfo.lifespanEndTime) throw new BizError(ERRORENUM.目标数据不存在);
+    let oldInfo = await findOnce(TABLEENUM.用户表, {userId}, ["userId", "lifespanEndTime", "isGracePeriod", "gracePeriodEndTime", "lifespanStartTime"]);
+    if (!oldInfo || !oldInfo.userId) throw new BizError(ERRORENUM.目标数据不存在);
 
-    let dataList:any = extractData(oldInfo, ["lifespanStartTime", "lifespanEndTime"]);
+    let dataInfo:any = extractData(oldInfo, ["lifespanStartTime", "lifespanEndTime"]);
 
     const NowMs = new Date().valueOf();
 
     /**判断是否宽限期 */
-    if (dataList.isGracePeriod == STATE.否) {
+    if (dataInfo.isGracePeriod == STATE.否) {
         /**
          * 判断会费到期时间
          */
         switch (oldInfo.lifespanEndTime) {
             case oldInfo.lifespanEndTime > NowMs+(90*24*3600*1000):
-                dataList["membershipFees"] = "大于90天";
+                dataInfo["membershipFees"] = "大于90天";
             break;
             case oldInfo.lifespanEndTime-(90*24*3600*1000) <= NowMs && oldInfo.lifespanEndTime > NowMs-(24*3600*1000):
-                dataList["membershipFees"] = "不足90天";
+                dataInfo["membershipFees"] = "不足90天";
             break;
             case NowMs <= oldInfo.lifespanEndTime+(30*24*3600*1000) && NowMs > oldInfo.lifespanEndTime+(24*3600*1000):
-                dataList["membershipFees"] = "过期30天内";
+                dataInfo["membershipFees"] = "过期30天内";
             break;
             case NowMs > oldInfo.lifespanEndTime+(30*24*3600*1000) && NowMs <= oldInfo.lifespanEndTime+(90*24*3600*1000):
-                dataList["membershipFees"] = "过期90天内";
+                dataInfo["membershipFees"] = "过期90天内";
             break;
             case NowMs > oldInfo.lifespanEndTime+(90*24*3600*1000) && NowMs <= oldInfo.lifespanEndTime+(365*24*3600*1000):
-                dataList["membershipFees"] = "过期1年内";
+                dataInfo["membershipFees"] = "过期1年内";
             break;
             case NowMs > oldInfo.lifespanEndTime+(365*24*3600*1000):
-                dataList["membershipFees"] = "过期1年外";
+                dataInfo["membershipFees"] = "过期1年外";
             break;
         }
     } else {
-        if (oldInfo.gracePeriodEndTime > NowMs) dataList["membershipFees"] = "宽限期中";
+        if (oldInfo.gracePeriodEndTime > NowMs) dataInfo["membershipFees"] = "宽限期中";
     }
 
-    return {dataList};
+    return {dataInfo};
 }
 
 

src/biz/member/user.ts

@@ -19,8 +19,8 @@ import { eccEnumValue } from "../../util/verificationEnum";
  * @param param0 
  * @returns 
  */
-export async function login({loginStr, pwd}) {
-    let selectParam = { "$or":[{loginId:loginStr}, {phone:loginStr}] };
+export async function login({loginId, pwd}) {
+    let selectParam = { "$or":[{loginId:loginId}, {phone:loginId}] };
     let userInfo = await findOnce(TABLEENUM.用户表, selectParam);
     
     if (!userInfo || !userInfo.userId) throw new BizError(ERRORENUM.账号或密码错误);

src/biz/portal/xueHui/xueHuiGaikuo.ts

@@ -10,8 +10,7 @@ import { updateOneData } from "../../../data/update";
 import { generateSystemId, successResult } from "../../../tools/system";
 import { extractData } from "../../../util/piecemeal";
 
-export async function info(secureArgs:any) {
-    let {userId} = secureArgs;
+export async function info(userId:string) {
     let dbInfo = await findOnce(TABLEENUM.学会概括, {});
     if (!dbInfo || !dbInfo.id) {
         dbInfo = JSON.parse(JSON.stringify({
@@ -32,8 +31,7 @@ export async function info(secureArgs:any) {
  * @param secureArgs 
  * @returns 
  */
-export async function update(secureArgs:any) {
-    let {userId, desc, title, imgList} = secureArgs;
+export async function update(userId:string, desc:string, title:string, imgList) {
     await updateOneData(TABLEENUM.学会概括, {}, {desc, title, imgList});
     return successResult();
 }

src/routers/member/router.ts

@@ -162,9 +162,7 @@ export const Config = {
         {
             apiName:"获取当前会员注册流程",
             subUrl:'/memberdb/registerflowtype',
-            param:[
-                {key:"userId", type:"String", desc:"用户id"},
-            ],
+            param:[],
             bindBiz:registerBiz.registerFlowType
         }
     ],
@@ -739,17 +737,13 @@ export const Config = {
         {
             apiName:"消息中心列表",
             subUrl:'/homepage/xiaoxizhongxin',
-            param:[
-                {key:"userId", type:"String", desc:"用户id"}
-            ],
+            param:[],
             bindBiz:homePageBiz.getXiaoXiZhongXin
         },
         {
             apiName:"地图信息",
             subUrl:'/homepage/mapsheng',
-            param:[
-                {key:"userId", type:"String", desc:"用户id"}
-            ],
+            param:[],
             bindBiz:homePageBiz.getSheng
         },
         {

src/routers/router.ts

@@ -30,19 +30,20 @@ export async function setRouter(httpServer){
         await initDoc(orderRouter.FirstName, orderRouter.Config, orderRouter.FirstRouter);//会费相关
         await initDoc(costRouter.FirstName, costRouter.Config, costRouter.FirstRouter);//支付
     }
-    analysisRouter(httpServer, portalRouter.Config, portalRouter.FirstRouter, false);//网站编辑
-    analysisRouter(httpServer, publicRouter.Config, publicRouter.FirstRouter, false);//公用组件
-    analysisRouter(httpServer, memberRouter.Config, memberRouter.FirstRouter, true);//用户路由
-    analysisRouter(httpServer, officalWebsiteRouter.Config, officalWebsiteRouter.FirstRouter, false);//官网路由
-    analysisRouter(httpServer, orderRouter.Config, orderRouter.FirstRouter, true);//会费相关
-    analysisRouter(httpServer, costRouter.Config, costRouter.FirstRouter, true);//支付
+    await analysisRouter(httpServer, portalRouter.Config, portalRouter.FirstRouter, false);//网站编辑
+    await analysisRouter(httpServer, publicRouter.Config, publicRouter.FirstRouter, false);//公用组件
+    await analysisRouter(httpServer, memberRouter.Config, memberRouter.FirstRouter, true);//用户路由
+    await analysisRouter(httpServer, officalWebsiteRouter.Config, officalWebsiteRouter.FirstRouter, false);//官网路由
+    await analysisRouter(httpServer, orderRouter.Config, orderRouter.FirstRouter, true);//会费相关
+    await analysisRouter(httpServer, costRouter.Config, costRouter.FirstRouter, true);//支付
 }
 
-function analysisRouter(httpServer, config, firstRouter, haveMiddleware) {
+
+async function analysisRouter(httpServer, config, firstRouter, haveMiddleware) {
     for (let modelKey in config) {
         config[modelKey].forEach(info => {
             let {apiName, defaultParam, subUrl, param, bindBiz, notMiddleware} = info;
-            httpServer.post(firstRouter+subUrl , haveMiddleware? checkUser : notCheck, async function (req, res) {
+            httpServer.post(firstRouter+subUrl, haveMiddleware? checkUser : notCheck, asyncHandler(async function (req, res) {
                 let chackObjectList = [];
                 let checkStringMap = {};
                 let stringNotMustHaveKeys = [];
@@ -63,7 +64,7 @@ function analysisRouter(httpServer, config, firstRouter, haveMiddleware) {
                 /**校验参数 */
                 if (chackObjectList.length) {
                     chackObjectList.forEach(item => {
-                        if (!req.body[item.key]) throw new BizError(ERRORENUM.参数错误, `缺少参数${item.key}`);
+                        if (!req.body[item.key]) throw new BizError(ERRORENUM.参数错误, `${apiName}`, `缺少参数${item.key}`);
                         eccFormParam(apiName, item.sub, req.body[item.key]);
                         funcParam[item.key] = req.body[item.key];
                     });
@@ -78,13 +79,15 @@ function analysisRouter(httpServer, config, firstRouter, haveMiddleware) {
                 let result = await bindBiz(funcParam);
         
                 res.success(result);
-            });
+            }));
         });   
     }
     
 }
 
 
+
+
 export async function setAdditionalRouter(httpServer) {
     httpServer.post('/pay/wechart/callback', asyncHandler(async (req, res) => {
         await payCallback(req.body);