Skip to content

Z
zhichan
Commit c0962d5d by 王昆
Options

s

parent 37506f38
Showing with 114 additions and 80 deletions
xgg-saas-platform/app/base/controller/impl/saas/mainCtl.js 0 → 100644
var system = require("../../../system")
const CtlBase = require("../../ctlms.base");
class MainCtl extends CtlBase {
constructor() {
super();
this.mainSve = system.getObject("service.saas.mainSve");
}
async dics(params, pobj2, req) {
try {
return await this.mainSve.dics(params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
async info(params, pobj2, req) {
try {
return await this.mainSve.info(params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
async page(params, pobj2, req) {
try {
return await this.mainSve.page(params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
async save(params, pobj2, req) {
try {
return await this.mainSve.save(params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
}
module.exports = MainCtl;
\ No newline at end of file
xgg-saas-platform/app/base/service/impl/saas/mainSve.js 0 → 100644
const system = require("../../../system");
const ServiceBase = require("../../svems.base")
const settings = require("../../../../config/settings")
class MainService extends ServiceBase {
constructor() {
super();
}
async dics(params) {
var rs = await this.callms("merchant", "mainDics", params || {});
return rs;
}
async page(params) {
var rs = await this.callms("merchant", "mainPage", params);
return rs;
}
async save(params) {
var rs = await this.callms("merchant", "mainSave", params);
return rs;
}
async info(params) {
var rs = await this.callms("merchant", "mainInfo", params);
return rs;
}
}
module.exports = MainService;
\ No newline at end of file
xgg-saas-platform/app/base/service/svems.base.js
...@@ -220,7 +220,7 @@ class ServiceBase { ...@@ -220,7 +220,7 @@ class ServiceBase {
} }
try { try {
var params = { var params = {
"action_process": "xgg-deliver", "action_process": "xgg-saas-platform",
"action_type": apiName, "action_type": apiName,
"action_body": params || {}, "action_body": params || {},
} }
......
xgg-saas-platform/app/base/system.js
...@@ -178,7 +178,7 @@ class System { ...@@ -178,7 +178,7 @@ class System {
// common: "http://127.0.0.1:3102" + path, // common: "http://127.0.0.1:3102" + path,
// 商户服务 // 商户服务
merchant: domain2 + ":3101" + path, merchant: domain + ":3101" + path,
// merchant: "http://127.0.0.1:3101" + path, // merchant: "http://127.0.0.1:3101" + path,
// 订单服务 // 订单服务
......
xgg-saas-platform/app/config/routes/doc.js
...@@ -40,7 +40,7 @@ module.exports = function (app) { ...@@ -40,7 +40,7 @@ module.exports = function (app) {
var forder = req.params["forder"]; var forder = req.params["forder"];
var fileName = req.params["fileName"] || "README.md"; var fileName = req.params["fileName"] || "README.md";
var path = process.cwd() + "/app/front/entry/public/apidoc"; var path = process.cwd() + "/app/front/entry/public/apidoc";
// var path = process.cwd() + "/xgg-saas-platform/app/front/entry/public/apidoc"; var path = process.cwd() + "/xgg-saas-platform/app/front/entry/public/apidoc";
if(forder) { if(forder) {
path = path + "/" + forder + "/" + fileName; path = path + "/" + forder + "/" + fileName;
} else { } else {
......
xgg-saas-platform/app/config/routes/web.js
...@@ -63,8 +63,6 @@ module.exports = function (app) { ...@@ -63,8 +63,6 @@ module.exports = function (app) {
if(req.loginUser) { if(req.loginUser) {
req.query = req.query || {}; req.query = req.query || {};
req.query.saas_id = req.loginUser.saas_id; req.query.saas_id = req.loginUser.saas_id;
req.query.deliverId = req.loginUser.deliver_id || "";
req.query.deliver_id = req.loginUser.deliver_id || "";
} }
params.push(methodName); params.push(methodName);
params.push(req.body); params.push(req.body);
...@@ -96,8 +94,6 @@ module.exports = function (app) { ...@@ -96,8 +94,6 @@ module.exports = function (app) {
if(req.loginUser) { if(req.loginUser) {
req.body.saas_id = req.loginUser.saas_id; req.body.saas_id = req.loginUser.saas_id;
req.body.deliverId = req.loginUser.deliver_id || "";
req.body.deliver_id = req.loginUser.deliver_id || "";
} }
params.push(methodName); params.push(methodName);
......
xgg-saas-platform/app/front/entry/public/apidoc/merchant/main.md → xgg-saas-platform/app/front/entry/public/apidoc/saas/main.md
...@@ -3,71 +3,52 @@ ...@@ -3,71 +3,52 @@
1. [详情](#info) 1. [详情](#info)
1. [添加/修改](#save) 1. [添加/修改](#save)
## **<a name="titleList"> 抬头列表</a>** ## **<a name="list"> 列表</a>**
[返回到目录](#menu) [返回到目录](#menu)
##### URL ##### URL
[/web/merchant/merchanttitleCtl/merchantTitleList] [/web/saas/mainCtl/page]
#### 参数格式 `JSON` #### 参数格式 `JSON`
#### HTTP请求方式 `POST` #### HTTP请求方式 `POST`
``` javascript ``` javascript
{ {
"action_process": "test",
"action_type": "merchantTitleList",
"action_body": {
"currentPage": "1", "currentPage": "1",
"pageSize": "3", "pageSize": "10",
"merchantId": "" // 商户id "name": "" // 主体名称
} }
}
``` ```
#### 返回结果 #### 返回结果
```javascript ```javascript
{ {
"status":0, "status": 0,
"msg":"success", "msg": "success",
"data":{ "data": {
"count":27, "count": 2,
"rows":[ "rows": [
{ {
"id":"13662688292002677", "id": 50000, // id
"merchant_id":"11065403484481165", "name": "name2", // 主体名称
"taxNo":"sssssssss", "bank_account": "bank_accoun2", // 账户名称
"invoiceAddr":"朝来高科技产业园33333", "bank_name": "bank_name 2", // 开户银行
"invoiceMobile":"13838383838", "bank_no": "bank_no2", // 银行账户
"accountName":"宋毅", "created_at": "2020-03-20 05:48:49", // 创建时间
"accountPublic":"xxxx对公账户22222",
"isDefault":1,
"created_at":"2019-10-10 09:32:04",
"merchantName":"测试公司录入3334"
}, },
{
"id":"13661984313001961",
"merchant_id":"11064624178480175",
"taxNo":"12212134杨庆菊3",
"invoiceAddr":"杨庆菊的地址",
"invoiceMobile":"杨庆菊的手机号",
"accountName":"杨庆菊的账户名",
"accountPublic":"杨庆菊的对公账户",
"isDefault":1,
"created_at":"2019-10-02 05:59:05",
"merchantName":"杨庆菊的公司2"
}
] ]
}, },
"requestid":"2fd6b5ac87fa401bb19bf27cb27d3697" "requestid": "4d41d50ef6fa4638a55913df36f76f79"
} }
``` ```
## **<a name="titleInfo"> 抬头信息</a>** ## **<a name="info"> 详情</a>**
[返回到目录](#menu) [返回到目录](#menu)
##### URL ##### URL
[/web/merchant/merchanttitleCtl/merchantTitleInfo] [/web/saas/mainCtl/info]
#### 参数格式 `JSON` #### 参数格式 `JSON`
#### HTTP请求方式 `POST` #### HTTP请求方式 `POST`
...@@ -85,26 +66,22 @@ ...@@ -85,26 +66,22 @@
"status": 0, "status": 0,
"msg": "success", "msg": "success",
"data": { "data": {
"id": "13661985486002511", // id "id": 50000, // id
"merchant_id": "11064624178480175", // 商户id "name": "name2", // 主体名称
"merchantName": "杨庆菊的公司2", // 商户名称 "bank_account": "bank_accoun2", // 账户名称
"taxNo": "杨庆菊客户的号", // 纳税人识别号 "bank_name": "bank_name 2", // 开户银行
"invoiceAddr": "杨庆菊客户的地址", // 开票地址 "bank_no": "bank_no2", // 银行账户
"invoiceMobile": "杨庆菊客户开票手机号", // 开票电话 "created_at": "2020-03-20 05:48:49", // 创建时间
"accountName": "杨庆菊客户的账户名称", // 开户名称
"accountPublic": "杨庆菊客户的对公账户", // 对公账户
"isDefault": 0, // 是否默认 0否 1是
"created_at": "2019-10-02 06:18", // 创建时间
}, },
"requestid": "cf6320a1b615423b8a9ceb3b66b713f1" "requestid": "cf6320a1b615423b8a9ceb3b66b713f1"
} }
``` ```
## **<a name="saveTitle"> 添加/修改抬头</a>** ## **<a name="save"> 添加/修改抬头</a>**
[返回到目录](#menu) [返回到目录](#menu)
##### URL ##### URL
[/web/merchant/merchanttitleCtl/merchantTitleSave] [/web/saas/mainCtl/save]
#### 参数格式 `JSON` #### 参数格式 `JSON`
#### HTTP请求方式 `POST` #### HTTP请求方式 `POST`
...@@ -122,37 +99,23 @@ ...@@ -122,37 +99,23 @@
"isDefault" : true, // 是否设置默认 "isDefault" : true, // 是否设置默认
} }
```
#### 返回结果
```javascript
{ {
"status": 0, "id": 0, // 抬头id，为空或者不填写该字段时新增，指定具体id时修改
"msg": "success", "name": "name2", // 主体名称
"data": {} "bank_account": "bank_accoun2", // 账户名称
"bank_name": "bank_name 2", // 开户银行
"bank_no": "bank_no2", // 银行账户
} }
``` ```
## **<a name="setDefault"> 设置默认</a>**
[返回到目录](#menu)
##### URL
[/web/merchant/merchanttitleCtl/merchantTitleDefault]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"id": "13661984313001961" // 抬头id
}
```
#### 返回结果 #### 返回结果
```javascript ```javascript
{ {
"status": 0, "status": 0,
"msg": "success" "msg": "success",
"data": {}
} }
``` ```
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