Merge branch 'esign-admin' of http://gitlab.gongsibao.com/jiangyong/zhichan into esign-admin

esign-admin/app/base/controller/impl/merchant/merchantuserCtl.js

@@ -23,16 +23,43 @@ class MerchantUserCtl extends CtlBase {
       if (!params.real_name) {
         return system.getResult(null, "请选择商户");
       }
+      if (!params.ucname) {
+        return system.getResult(null, "请选择商户");
+      }
+      if (!params.mobile) {
+        return system.getResult(null, "请选择商户");
+      }
       validation.check(params, "real_name", {name: "姓名", is_require: true});
       validation.check(params, "mobile", {name: "联系电话", is_require: true});
       validation.check(params, "ucname", {name: "用户名", is_require: true});
 
       return await this.userSve.saveMerchantUser(params);
     } catch (error) {
-      let msg = error.message;
-      if (msg.startsWith("bpo-validation-error:")) {
-        return system.getResult(null, msg.replace("bpo-validation-error:", ""));
+      return system.getResult(null, `系统错误 错误信息 ${error.name}`);
+    }
+  }
+
+  async info(params, pobj2, req) {
+    try {
+      params.id = Number(params.id || 0);
+      return await this.userSve.info(params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  async page(params, pobj2, req) {
+    try {
+      params.utype = 2;
+      params.uctype_id = this.trim(params.merchant_id);
+      let res = await this.userSve.page(params);
+      if (res.status === 0 && res.data && res.data.rows) {
+        for (let item of res.data.rows) {
+          item.merchant = {id:"todo", name: "todo"};
+        }
       }
+      return res;
+    } catch (error) {
       return system.getResult(null, `系统错误 错误信息 ${error}`);
     }
   }
@@ -47,7 +74,7 @@ class MerchantUserCtl extends CtlBase {
   async enabled(params, pobj2, req) {
     try {
       params.id = Number(params.id || 0);
-      params.enabled = Number(params.enabled || 0);
+      params.is_enabled = Number(params.is_enabled || 0);
       return await this.userSve.enabled(params);
     } catch (error) {
       return system.getResult(null, `系统错误 错误信息 ${error}`);
@@ -55,20 +82,6 @@ class MerchantUserCtl extends CtlBase {
   }
 
 
-  /**
-   * 根据pid查出子目录
-   * @param {*} params
-   */
-  async page(params, pobj2, req) {
-    try {
-      params.uctypeId = params.deliver_id;
-      return await this.userSve.page(params);
-    } catch (error) {
-      console.log(error);
-      return system.getResult(null, `系统错误 错误信息 ${error}`);
-    }
-  }
-
 }
 
 module.exports = MerchantUserCtl;
\ No newline at end of file

esign-admin/app/base/service/impl/uc/userSve.js

@@ -24,15 +24,39 @@ class UserService extends ServiceBase {
 
   async login(params) {
     try {
-      return await this.callms("sve_uc", "login", params);
+      return await this.callms("sve_uc", "adminLogin", params);
     } catch (error) {
       return system.getResult(null, `系统错误 错误信息 ${error}`);
     }
   }
   
+  async page(params) {
+    try {
+      return await this.callms("sve_uc", "userPage", params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
   async info(params) {
     try {
-      return await this.callms("uc", "merchantInfo", params);
+      return await this.callms("sve_uc", "userInfo", params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  async enabled(params) {
+    try {
+      return await this.callms("sve_uc", "userEnabled", params);
+    } catch (error) {
+      return system.getResult(null, `系统错误 错误信息 ${error}`);
+    }
+  }
+
+  async mapByIds(params) {
+    try {
+      return await this.callms("sve_uc", "userMapByIds", params);
     } catch (error) {
       return system.getResult(null, `系统错误 错误信息 ${error}`);
     }

esign-admin/app/base/service/svems.base.js

@@ -220,7 +220,7 @@ class ServiceBase {
     }
     try {
       var params = {
-        "action_process": "xgg-saas-merchant",
+        "action_process": "esign-admin",
         "action_type": apiName,
         "action_body": params || {},
       }

esign-admin/app/front/entry/apidoc.ejs

@@ -12,7 +12,7 @@
 
 <body >
 	<div style="width:100%;text-align: center;font-size: 20px;">
-		薪果果个体工商户API文档
+		电子签约平台API文档
 	</div>
 	<div class="markdown-body" style="margin-left:40px;" id="doc-page">
         <%- str%>

esign-admin/app/front/entry/public/apidoc/README.md

@@ -13,6 +13,8 @@
 ## 商户
 　　1 [商户接口](/doc/merchant/chantaccount.md)
 
+　　2 [商户账号](/doc/merchant/merchantuser.md)
+
 ## 订单
 　　1 [订单接口](/doc/saas/order.md)
 

esign-admin/app/front/entry/public/apidoc/merchant/merchantuser.md

+[返回主目录](/doc)
+
+<a name="menu">目录</a>
+1. [新增/修改](#save)
+1. [用户信息](#info)
+1. [列表](#page)
+1. [激活/冻结](#enabled)
+
+
+## **<a name="login"> 登录</a>**
+[返回到目录](#menu)
+##### URL
+[/web/merchant/merchantuserCtl/save]
+#### 参数格式  `JSON`
+#### HTTP请求方式 `POST`
+
+``` javascript
+
+    {
+        "id":"48",                      // id 新增id="", 修改id=xx
+        "uctype_id": "1",               // 所选商户id
+        "ucname": "m1",                 // 用户名
+        "password": "123123",           // 密码，新增时必填，修改时非必填
+        "real_name": "商户测试1",        // 姓名
+        "mobile": "13011112222",        // 手机号（联系方式）
+        "is_enabled": 1                 // 1激活 0冻结
+    }
+
+```
+
+#### 返回结果
+```javascript
+
+   {
+       "status": 0,
+       "msg": "success",
+       "data": {
+           "loginName": "admin",            // 登录名
+           "mobile": "13012341234",         // 手机号
+           "real_name": "admin测试",        // 姓名
+           "key": "xxx."                    // 登录key，HEADER esignadminsid
+       }
+   }
+
+```
+
+
+## **<a name="info"> 用户信息</a>**
+[返回到目录](#menu)
+##### URL
+[/web/merchant/merchantuserCtl/info]
+#### 参数格式  `JSON`
+#### HTTP请求方式 `POST`
+
+``` javascript
+
+  {
+  	"id": "50"      // 账户id
+  }
+
+```
+#### 返回结果
+```javascript
+  {
+      "status": 0,
+      "msg": "success",
+      "data": {
+          "id": 50,                   // id
+          "ucname": "m3",             // 用户名
+          "password": "",             // 密码，服务端已经置空，前端不用管
+          "real_name": "商户测试1",   // 姓名
+          "mobile": "13011112222",    // 手机号（联系方式）
+          "uctype_id": "1",           // 商户id
+          "is_enabled": 1,            // 0冻结 1激活
+          "created_at": "2020-06-30 15:14:51",    // 创建时间
+      },
+      "requestid": "5bb8ad250832447da534926742efb353"
+  }
+
+```
+
+## **<a name="page"> 列表</a>**
+[返回到目录](#menu)
+##### URL
+[/web/merchant/merchantuserCtl/page]
+#### 参数格式  `JSON`
+#### HTTP请求方式 `POST`
+
+``` javascript
+
+  {
+  	  "currentPage":"2",
+  	  "pageSize": "5",
+      "ucname": "",
+      "merchant_id": ""  商户id
+  }
+
+```
+#### 返回结果
+```javascript
+  {
+      "status": 0,
+      "msg": "success",
+      "data": {
+          "count": 8,
+          "rows": [
+              {
+                "id": 50,                   // id
+                "ucname": "m3",             // 用户名
+                "password": "",             // 密码，服务端已经置空，前端不用管
+                "real_name": "商户测试1",   // 姓名
+                "mobile": "13011112222",    // 手机号（联系方式）
+                "uctype_id": "1",           // 商户id
+                "is_enabled": 1,            // 0冻结 1激活
+                "created_at": "2020-06-30 15:14:51",    // 创建时间
+                "merchant": {               // 商户信息             
+                      "id": "todo",         // 商户id
+                      "name": "todo"        // 商户名称
+                  }
+              }
+          ]
+      },
+      "requestid": "0c2252903a3d4e6abdd0e83938f90648"
+  }
+
+```
+
+## **<a name="enabled"> 激活/冻结</a>**
+[返回到目录](#menu)
+##### URL
+[/web/merchant/merchantuserCtl/enabled]
+#### 参数格式  `JSON`
+#### HTTP请求方式 `POST`
+
+``` javascript
+
+    {
+        "id": "55",
+        "is_enabled":1      // // 0冻结 1激活
+    }
+
+```
+#### 返回结果
+```javascript
+  {
+      "status": 0,
+      "msg": "success",
+      "data":null,
+      "requestid": "0c2252903a3d4e6abdd0e83938f90648"
+  }
+
+```
\ No newline at end of file