Skip to content

Z
zhichan
Commit 4063aa01 by zhaoxiqing
Options

gsb

parent 41bbc574
Showing with 113 additions and 19 deletions
esign-admin/app/base/controller/impl/merchant/merchantCtl.js
...@@ -20,6 +20,14 @@ class MerchantUserCtl extends CtlBase { ...@@ -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) { async addModifyMerchants(params, pobj2, req) {
try { try {
return await this.merchantSve.addModifyMerchants(params); 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"); ...@@ -8,37 +8,49 @@ const logCtl = system.getObject("web.common.oplogCtl");
class MerchantUserCtl extends CtlBase { class MerchantUserCtl extends CtlBase {
constructor() { constructor() {
super(); super();
this.merchantSve = system.getObject("service.merchant.merchantSve"); this.merchanttradeSve = system.getObject("service.merchant.merchanttradeSve");
} }
async merchanttradesOfList(params, pobj2, req) { async merchanttradesOfList(params, pobj2, req) {
try { try {
return await this.merchantSve.merchanttradesOfList(params); return await this.merchanttradeSve.merchanttradesOfList(params);
} catch (error) { } catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
} }
} }
//调账添加
async addMerchanttrades(params, pobj2, req) { async addMerchanttrades(params, pobj2, req) {
try { try {
return await this.merchantSve.addMerchanttrades(params); return await this.merchanttradeSve.addMerchanttrades(params);
} catch (error) { } catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
} }
} }
//充值审核
async auditMerchanttrade(params, pobj2, req) { async auditMerchanttrade(params, pobj2, req) {
try { try {
return await this.merchantSve.auditMerchanttrade(params); return await this.merchanttradeSve.auditMerchanttrade(params);
} catch (error) { } catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
} }
} }
//资金流水
async merchanttradesOfListAll(params, pobj2, req) { async merchanttradesOfListAll(params, pobj2, req) {
try { 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) { } catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
} }
......
esign-admin/app/base/service/impl/merchant/merchantSve.js
const system = require("../../../system"); const system = require("../../../system");
const ServiceBase = require("../../svems.base") const ServiceBase = require("../../svems.base")
class UserService extends ServiceBase { class MerchantService extends ServiceBase {
constructor() { constructor() {
super(); super();
} }
...@@ -14,6 +14,14 @@ class UserService extends ServiceBase { ...@@ -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) { async addModifyMerchants(params) {
try { try {
return await this.callms("sve_merchant", "addModifyMerchants", params); return await this.callms("sve_merchant", "addModifyMerchants", params);
...@@ -39,4 +47,4 @@ class UserService extends ServiceBase { ...@@ -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 system = require("../../../system");
const ServiceBase = require("../../svems.base") const ServiceBase = require("../../svems.base")
class UserService extends ServiceBase { class MerchanttradeServcie extends ServiceBase {
constructor() { constructor() {
super(); super();
} }
...@@ -37,6 +37,14 @@ class UserService extends ServiceBase { ...@@ -37,6 +37,14 @@ class UserService extends ServiceBase {
return system.getResult(null, `系统错误 错误信息 ${error}`); 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 @@ ...@@ -9,7 +9,7 @@
　　1 [产品接口](/doc/product/product.md) 　　1 [产品接口](/doc/product/product.md)
## 商户 ## 商户
　　1 [商户接口](/doc/user/login.md) 　　1 [商户接口](/doc/merchant/merchant.md)
## 订单 ## 订单
　　1 [订单接口](/doc/saas/order.md) 　　1 [订单接口](/doc/saas/order.md)
......
esign-admin/app/front/entry/public/apidoc/merchant/user.md → esign-admin/app/front/entry/public/apidoc/merchant/merchant.md
[返回主目录](/doc) [返回主目录](/doc)
<a name="menu">目录</a> <a name="menu">目录</a>
1. [新增/修改](#save) 1. [新增/修改](#addModifyMerchants)
1. [激活冻结](#enabled) 1. [列表](#merchantOfList)
1. [列表页](#page) 1. [审核](#auditMerchant)
1. [搜索商户名](#merchantSuggest)
## **<a name="add"> 添加</a>** ## **<a name="addModifyMerchants"> 新增/修改</a>**
[返回到目录](#menu) [返回到目录](#menu)
##### URL ##### URL
[/web/uc/userCtl/addUser] [/web/merchant/merchantCtl/addModifyMerchants]
#### 参数格式 `JSON` #### 参数格式 `JSON`
#### HTTP请求方式 `POST` #### HTTP请求方式 `POST`
...@@ -38,10 +39,10 @@ ...@@ -38,10 +39,10 @@
``` ```
## **<a name="upd"> 更新</a>** ## **<a name="merchantOfList"> 列表</a>**
[返回到目录](#menu) [返回到目录](#menu)
##### URL ##### URL
[/web/uc/userCtl/updUser] [/web/merchant/merchantCtl/merchantOfList]
#### 参数格式 `JSON` #### 参数格式 `JSON`
#### HTTP请求方式 `POST` #### HTTP请求方式 `POST`
...@@ -68,10 +69,10 @@ ...@@ -68,10 +69,10 @@
``` ```
## **<a name="enabled"> 启用禁用</a>** ## **<a name="auditMerchant"> 审核</a>**
[返回到目录](#menu) [返回到目录](#menu)
##### URL ##### URL
[/web/uc/userCtl/enabled] [/web/merchant/merchantCtl/auditMerchant]
#### 参数格式 `JSON` #### 参数格式 `JSON`
#### HTTP请求方式 `POST` #### HTTP请求方式 `POST`
...@@ -95,3 +96,60 @@ ...@@ -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"
}
```
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment