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

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

@@ -20,6 +20,14 @@ class MerchantUserCtl extends CtlBase {
         }
     }
 
+    async merchantOfInfo(params, pobj2, req) {
+        try {
+            return await this.merchantSve.merchantOfInfo(params);
+        } catch (error) {
+            return system.getResult(null, `系统错误 错误信息 ${error}`);
+        }
+    }
+
     async addModifyMerchants(params, pobj2, req) {
         try {
             return await this.merchantSve.addModifyMerchants(params);

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

@@ -8,37 +8,49 @@ const logCtl = system.getObject("web.common.oplogCtl");
 class MerchantUserCtl extends CtlBase {
     constructor() {
         super();
-        this.merchantSve = system.getObject("service.merchant.merchantSve");
+        this.merchanttradeSve = system.getObject("service.merchant.merchanttradeSve");
     }
 
 
     async merchanttradesOfList(params, pobj2, req) {
         try {
-            return await this.merchantSve.merchanttradesOfList(params);
+            return await this.merchanttradeSve.merchanttradesOfList(params);
         } catch (error) {
             return system.getResult(null, `系统错误 错误信息 ${error}`);
         }
     }
 
+    //调账添加
     async addMerchanttrades(params, pobj2, req) {
         try {
-            return await this.merchantSve.addMerchanttrades(params);
+            return await this.merchanttradeSve.addMerchanttrades(params);
         } catch (error) {
             return system.getResult(null, `系统错误 错误信息 ${error}`);
         }
     }
 
+    //充值审核
     async auditMerchanttrade(params, pobj2, req) {
         try {
-            return await this.merchantSve.auditMerchanttrade(params);
+            return await this.merchanttradeSve.auditMerchanttrade(params);
         } catch (error) {
             return system.getResult(null, `系统错误 错误信息 ${error}`);
         }
     }
 
+    //资金流水
     async merchanttradesOfListAll(params, pobj2, req) {
         try {
-            return await this.merchantSve.merchanttradesOfListAll(params);
+            return await this.merchanttradeSve.merchanttradesOfListAll(params);
+        } catch (error) {
+            return system.getResult(null, `系统错误 错误信息 ${error}`);
+        }
+    }
+
+    //代客下单流水
+    async valetorder(params, pobj2, req) {
+        try {
+            return await this.merchanttradeSve.valetorder(params);
         } catch (error) {
             return system.getResult(null, `系统错误 错误信息 ${error}`);
         }

esign-admin/app/base/service/impl/merchant/merchantSve.js

 const system = require("../../../system");
 const ServiceBase = require("../../svems.base")
 
-class UserService extends ServiceBase {
+class MerchantService extends ServiceBase {
     constructor() {
         super();
     }
@@ -14,6 +14,14 @@ class UserService extends ServiceBase {
         }
     }
 
+    async merchantOfInfo(params) {
+        try {
+            return await this.callms("sve_merchant", "merchantOfInfo", params);
+        } catch (error) {
+            return system.getResult(null, `系统错误 错误信息 ${error}`);
+        }
+    }
+
     async addModifyMerchants(params) {
         try {
             return await this.callms("sve_merchant", "addModifyMerchants", params);
@@ -39,4 +47,4 @@ class UserService extends ServiceBase {
     }
 }
 
-module.exports = UserService;
+module.exports = MerchantService;

esign-admin/app/base/service/impl/merchant/merchanttradeSve.js

 const system = require("../../../system");
 const ServiceBase = require("../../svems.base")
 
-class UserService extends ServiceBase {
+class MerchanttradeServcie extends ServiceBase {
     constructor() {
         super();
     }
@@ -37,6 +37,14 @@ class UserService extends ServiceBase {
             return system.getResult(null, `系统错误 错误信息 ${error}`);
         }
     }
+
+    async valetorder(params) {
+        try {
+            return await this.callms("sve_merchant", "valetorder", params);
+        } catch (error) {
+            return system.getResult(null, `系统错误 错误信息 ${error}`);
+        }
+    }
 }
 
-module.exports = UserService;
+module.exports = MerchanttradeServcie;

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

@@ -9,7 +9,7 @@
 　　1 [产品接口](/doc/product/product.md)
 
 ## 商户
-　　1 [商户接口](/doc/user/login.md)
+　　1 [商户接口](/doc/merchant/merchant.md)
 
 　　2 [商户账号](/doc/merchant/merchantuser.md)
 

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

 [返回主目录](/doc)
 
 <a name="menu">目录</a>
-1. [新增/修改](#save)
-1. [激活冻结](#enabled)
-1. [列表页](#page)
+1. [新增/修改](#addModifyMerchants)
+1. [列表](#merchantOfList)
+1. [审核](#auditMerchant)
+1. [搜索商户名](#merchantSuggest)
 
-## **<a name="add"> 添加</a>**
+## **<a name="addModifyMerchants"> 新增/修改</a>**
 [返回到目录](#menu)
 ##### URL
-[/web/uc/userCtl/addUser]
+[/web/merchant/merchantCtl/addModifyMerchants]
 #### 参数格式  `JSON`
 #### HTTP请求方式 `POST`
 
@@ -38,10 +39,10 @@
 ```
 
 
-## **<a name="upd"> 更新</a>**
+## **<a name="merchantOfList"> 列表</a>**
 [返回到目录](#menu)
 ##### URL
-[/web/uc/userCtl/updUser]
+[/web/merchant/merchantCtl/merchantOfList]
 #### 参数格式  `JSON`
 #### HTTP请求方式 `POST`
 
@@ -68,10 +69,10 @@
 ```
 
 
-## **<a name="enabled"> 启用禁用</a>**
+## **<a name="auditMerchant"> 审核</a>**
 [返回到目录](#menu)
 ##### URL
-[/web/uc/userCtl/enabled]
+[/web/merchant/merchantCtl/auditMerchant]
 #### 参数格式  `JSON`
 #### HTTP请求方式 `POST`
 
@@ -95,3 +96,60 @@
 
 ```
 
+## **<a name="merchantSuggest"> 搜索商户名</a>**
+[返回到目录](#menu)
+##### URL
+[/web/merchant/merchantCtl/merchantSuggest]
+#### 参数格式  `JSON`
+#### HTTP请求方式 `POST`
+
+``` javascript
+
+    {
+      "id": 1,  //记录ID  必传   
+      "enabled": 0,   // 0禁用 1启用
+    }
+
+```
+
+#### 返回结果
+```javascript
+{
+    "status": 0,
+    "msg": "success",
+    "data": {},
+    "requestid": "007fd384e47641d2a71e9f3ef6292843"
+}
+
+```
+
+
+
+## **<a name="merchantSuggest"> 搜索商户名</a>**
+[返回到目录](#menu)
+##### URL
+[/web/merchant/merchantCtl/merchantSuggest]
+#### 参数格式  `JSON`
+#### HTTP请求方式 `POST`
+
+``` javascript
+
+    {
+      "id": 1,  //记录ID  必传   
+      "enabled": 0,   // 0禁用 1启用
+    }
+
+```
+
+#### 返回结果
+```javascript
+{
+    "status": 0,
+    "msg": "success",
+    "data": {},
+    "requestid": "007fd384e47641d2a71e9f3ef6292843"
+}
+
+```
+
+