Skip to content

Z
zhichan
Commit 5992e08d by 王昆
Options

gsb

parent b0065004
Showing with 269 additions and 15 deletions
xgg-saas-admin/app/base/controller/impl/common/deliverCtl.js
...@@ -9,20 +9,67 @@ class DeliverCtl extends CtlBase { ...@@ -9,20 +9,67 @@ class DeliverCtl extends CtlBase {
constructor() { constructor() {
super(); super();
this.deliverSve = system.getObject("service.common.deliverSve"); this.deliverSve = system.getObject("service.common.deliverSve");
this.channelSve = system.getObject("service.saas.channelSve");
} }
async all(pobj, pobj2, req) { async page(pobj, pobj2, req) {
try { try {
return await this.deliverSve.all(pobj); let rs = await this.deliverSve.page(pobj);
await this.channelSve.setChannel2(rs.data.rows);
return system.getResultSuccess(rs);
} catch (e) { } catch (e) {
console.log(e); console.log(e);
return system.getResultFail(500, "接口错误"); return system.getResultFail(500, "接口错误");
} }
} }
async page(pobj, pobj2, req) { async channelList(pobj, pobj2, req) {
try {
let deliver_id = this.trim(pobj.deliver_id);
if (!deliver_id) {
return system.getResultSuccess([]);
}
let rs = await this.deliverSve.deliverChannels({deliver_id: deliver_id}) || {};
let rows = rs.data || [];
await this.channelSve.setChannel(rows);
let list = [];
for (let row of rows) {
let channel = row.channel;
if (!channel) {
continue;
}
channel.deliver_id = deliver_id;
list.push(channel);
}
return system.getResultSuccess(list);
} catch (e) {
console.log(e);
return system.getResultFail(500, "接口错误");
}
}
async bindChannel(pobj, pobj2, req) {
pobj.type = "bind";
return await this.bind(pobj);
}
async unbindChannel(pobj, pobj2, req) {
pobj.type = "unbind";
return await this.bind(pobj);
}
async bind(pobj) {
let deliver_id = this.trim(pobj.deliver_id);
let channel_id = this.trim(pobj.channel_id);
if (!deliver_id || !channel_id) {
return system.getResult(null, `参数错误deliver_id[${deliver_id}], channel_id${channel_id}`);
}
try { try {
return await this.deliverSve.page(pobj); let rs = await this.deliverSve.bindChannel({
deliver_id: deliver_id,
channel_id: channel_id,
type: pobj.type || "bind"
});
return rs;
} catch (e) { } catch (e) {
console.log(e); console.log(e);
return system.getResultFail(500, "接口错误"); return system.getResultFail(500, "接口错误");
......
xgg-saas-admin/app/base/service/impl/common/deliverSve.js
...@@ -10,31 +10,41 @@ class DeliverService extends ServiceBase { ...@@ -10,31 +10,41 @@ class DeliverService extends ServiceBase {
} }
async all(params) { async all(params) {
var rs = await this.callms("common", "deliverAll", params); let rs = await this.callms("common", "deliverAll", params);
await this.doPercent(rs.data); await this.doPercent(rs.data);
return rs; return rs;
} }
async page(params) { async page(params) {
var rs = await this.callms("common", "deliverPage", params); let rs = await this.callms("common", "deliverPage", params);
await this.doPercent(rs.data.rows); await this.doPercent(rs.data.rows);
return rs; return rs;
} }
async bindChannel(params) {
let rs = await this.callms("common", "deliverBindChannel", params);
return rs;
}
async deliverChannels(params) {
let rs = await this.callms("common", "deliverChannels", params);
return rs;
}
async info(params) { async info(params) {
var rs = await this.callms("common", "deliverInfo", params); let rs = await this.callms("common", "deliverInfo", params);
await this.doPercent([rs.data]); await this.doPercent([rs.data]);
return rs; return rs;
} }
async enabled(params) { async enabled(params) {
var rs = await this.callms("common", "deliverEnable", params); let rs = await this.callms("common", "deliverEnable", params);
this.synEnabled(params); this.synEnabled(params);
return rs; return rs;
} }
async synEnabled(params) { async synEnabled(params) {
var rs = await this.callms("common", "deliverInfo", params); let rs = await this.callms("common", "deliverInfo", params);
let deliver = rs.data; let deliver = rs.data;
if(!deliver) { if(!deliver) {
return; return;
...@@ -51,14 +61,14 @@ class DeliverService extends ServiceBase { ...@@ -51,14 +61,14 @@ class DeliverService extends ServiceBase {
} }
async resetPassword(params) { async resetPassword(params) {
var rs = await this.callms("common", "deliverResetPassword", params); let rs = await this.callms("common", "deliverResetPassword", params);
return rs; return rs;
} }
async save(params) { async save(params) {
params.invoiceDivide = 0; params.invoiceDivide = 0;
params.businessmenDivide = 0; params.businessmenDivide = 0;
var rs = await this.callms("common", "deliverSave", params); let rs = await this.callms("common", "deliverSave", params);
await this.doPercent([rs.data]); await this.doPercent([rs.data]);
if(rs && rs.data && rs.data.id) { if(rs && rs.data && rs.data.id) {
this.synSave(rs.data.admin_id, params.password); this.synSave(rs.data.admin_id, params.password);
......
xgg-saas-admin/app/base/service/impl/saas/channelSve.js
...@@ -56,5 +56,31 @@ class ChannelService extends ServiceBase { ...@@ -56,5 +56,31 @@ class ChannelService extends ServiceBase {
row.channel = map[row.channel_id] || {}; row.channel = map[row.channel_id] || {};
} }
} }
async setChannel2(rows) {
if (!rows) {
return;
}
let channelIds = [];
for (let row of rows) {
if (!row) {
continue;
}
if (row.owner_channel_id) {
channelIds.push(row.owner_channel_id);
}
}
if (channelIds.length == 0) {
return;
}
let map = await this.mapByIds({
ids: channelIds
}) || {};
map = map.data || {};
for (let row of rows) {
row.owner_channel = map[row.owner_channel_id] || {};
}
}
} }
module.exports = ChannelService; module.exports = ChannelService;
\ No newline at end of file
xgg-saas-admin/app/base/service/impl/uc/merchantuserSve.js 0 → 100644
const system = require("../../../system");
const ServiceBase = require("../../svems.base")
class MerchantuserService extends ServiceBase {
constructor() {
super();
}
async save(params) {
try {
return await this.callms("uc", "merchantSave", params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
async info(params) {
try {
return await this.callms("uc", "merchantInfo", params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
async enabled(params) {
try {
return await this.callms("uc", "merchantEnabled", params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
async page(params) {
try {
return await this.callms("uc", "merchantPage", params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
async mapByIds(params) {
try {
return await this.callms("uc", "merchantMapByIds", params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
}
module.exports = MerchantuserService;
\ No newline at end of file
xgg-saas-admin/app/base/system.js
...@@ -191,7 +191,7 @@ class System { ...@@ -191,7 +191,7 @@ class System {
let dev = "http://39.107.234.14"; let dev = "http://39.107.234.14";
return { return {
// 公共服务 // 公共服务
common: dev + ":3102" + path, common: local + ":3102" + path,
// 商户服务 // 商户服务
merchant: local + ":3101" + path, merchant: local + ":3101" + path,
...@@ -203,7 +203,7 @@ class System { ...@@ -203,7 +203,7 @@ class System {
invoice: dev + ":3105" + path, invoice: dev + ":3105" + path,
// 用户服务 // 用户服务
uc: local + ":3106" + path, uc: dev + ":3106" + path,
// 交易 // 交易
trade: dev + ":3107" + path, trade: dev + ":3107" + path,
......
xgg-saas-admin/app/front/entry/public/apidoc/common/deliver.md
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
1. [交付商查询](#info) 1. [交付商查询](#info)
1. [交付商添加/修改](#save) 1. [交付商添加/修改](#save)
1. [交付商删除](#del) 1. [交付商删除](#del)
1. [交付商渠道](#channelList)
1. [交付商绑定渠道](#bindChannel)
1. [交付商取消绑定渠道](#unbindChannel)
## **<a name="all"> 全部交付商</a>** ## **<a name="all"> 全部交付商</a>**
[返回到目录](#menu) [返回到目录](#menu)
...@@ -161,4 +164,120 @@ ...@@ -161,4 +164,120 @@
"requestid": "3f4426683fb44c2d80e55b88faabafc9" "requestid": "3f4426683fb44c2d80e55b88faabafc9"
} }
``` ```
\ No newline at end of file
## **<a name="channelList"> 交付商渠道</a>**
[返回到目录](#menu)
##### URL
[/web/common/deliverCtl/channelList]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"deliver_id":"13141670437000352", // 交付商id
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "success",
"data": {
"count": 2,
"rows": [
{
"id": "13575990142000991", // 渠道编号
"name" : "", // 渠道名称,
"short_name" : "", // 渠道简称,
"credit_code" : "", // 统一社会信用代码,
"business_lincense_img" : "", // 营业执照图,
"residence" : "", // 住所,
"tax_type" : "", // 纳税人类型 00一般纳税人 10小规模纳税人,
"business_scope" : "", // 经营范围,
"term" : "", // 经营期限 1长期 2固定日期,
"term_end" : "", // 经营期限固定日期,
"idcard_front" : "", // 身份证正面照片,
"idcard_back" : "", // 身份证反面照片,
"legal_idno" : "", // 身份证号码,
"legal_name" : "", // 法人姓名,
"validity" : "", // 经营期限 1长期 2固定日期,
"validity_end" : "", // 经营期限固定日期,
"account_name" : "", // 对公账户-账户名称,
"account_bank_name" : "", // 对公账户-开户行,
"account_bank_no" : "", // 对公账户-开户账号,
"account_mobile" : "", // 对公账户-联系电话,
"contact_man" : "", // 联系人-联系人姓名,
"contact_mobile" : "", // 联系电话,
"contact_email" : "", // 联系邮箱
},
]
},
"requestid": "4d41d50ef6fa4638a55913df36f76f79"
}
```
## **<a name="bindChannel"> 交付商绑定渠道</a>**
[返回到目录](#menu)
##### URL
[//web/common/deliverCtl/bindChannel]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
```javascript
{
"deliver_id":"13141670437000352", // 交付商id
"channel_id":"13575990015000869" // 渠道id
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "success",
"data": "",
"requestid": "3f4426683fb44c2d80e55b88faabafc9"
}
```
## **<a name="unbindChannel"> 交付商取消绑定渠道</a>**
[返回到目录](#menu)
##### URL
[//web/common/deliverCtl/unbindChannel]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
```javascript
{
"deliver_id":"13141670437000352", // 交付商id
"channel_id":"13575990015000869" // 渠道id
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "success",
"data": "",
"requestid": "3f4426683fb44c2d80e55b88faabafc9"
}
```
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