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

src/biz/fuHuqQi/user.ts

@@ -148,12 +148,21 @@ export async function updateState(uscc:string, userState:boolean) {
 }
 
 
+/**
+ * 添加孵化器账号
+ * 管理后台端
+ * @param param 表单信息
+ * @returns 
+ */
 export async function addUser(param) {
     checkParamater("新增孵化器账号信息", FuHuaQiUserConfig, param);//校验表单参数
 
+
     let fuhuaqiInfo = await fuhuaqiData.findFuHuaQiByUSCC(param.uscc);
     if ( fuhuaqiInfo ) throw new BizError(ERRORENUM.该孵化器账号信息已存在, `${param.uscc}`);
     
+    const Pwd = param.uscc.slice(param.uscc.length-3);
+    param.pwd = Pwd;
     await fuhuaqiData.createFuHuaQiUser(param);
     
     return {isSuccess:true};

src/biz/guanWeiHui/user.ts

@@ -18,6 +18,7 @@ import { getPwdMd5, getToken } from "../../util/tools";
  * @returns resultUserInfo:{uscc, name} 登录后的信息
  */
 export async function login(loginId:string, pwd:string) {
+    
     let userInfo = await findGuanWeiHuiUserInfoByLoginId(loginId);
     if(!userInfo) throw new BizError(ERRORENUM.账号不存在, loginId);
 

src/routers/admin.ts

@@ -3,6 +3,7 @@ import * as userBiz from '../biz/fuHuqQi/user';
 import * as baseBiz from '../biz/fuHuqQi/base';
 import * as enterpriseBiz from '../biz/enterprise/enterprise';
 import * as financingBiz from '../biz/enterprise/financing';
+import * as guanWeiHuiBiz from '../biz/guanWeiHui/user';
 import { checkReqParam } from '../util/tools';
 import { BizError } from '../util/bizError';
 import { ERRORENUM } from '../config/errorEnum';
@@ -26,7 +27,7 @@ export function setRouter(httpServer) {
     
 
 /**
- * 管理后天登录
+ * 管理后台登录
  * @param req 
  * @param res 
  */
@@ -34,7 +35,7 @@ async function login(req, res) {
     let reqConf = {loginId:'String', pwd:'String'};
     let {uscc, pwd} = checkReqParam(reqConf, req.body);
 
-    let userInfo = await userBiz.login(uscc, pwd);
+    let userInfo = await guanWeiHuiBiz.login(uscc, pwd);
     res.success(userInfo);
 }
 
@@ -134,7 +135,6 @@ async function getMonthList(req, res) {
 async function addUser(req, res) {
     let reqConf = {form: 'Object' };
     let { form } = checkReqParam(reqConf, req.body);
-    const Uscc = req.headers.uscc;
 
     let result = await userBiz.addUser(form);
     res.success(result);