Skip to content

Z
zhichan
Commit 2fb7c0cc by 王昆
Options

gsb

parent ccf276ff
Showing with 217 additions and 27 deletions
xgg-saas-admin/app/base/controller/impl/saas/channelCtl.js
...@@ -6,6 +6,7 @@ class ChannelCtl extends CtlBase { ...@@ -6,6 +6,7 @@ class ChannelCtl extends CtlBase {
this.channelSve = system.getObject("service.saas.channelSve"); this.channelSve = system.getObject("service.saas.channelSve");
this.saasbusinessSve = system.getObject("service.saas.saasbusinessSve"); this.saasbusinessSve = system.getObject("service.saas.saasbusinessSve");
this.businessscopeSve = system.getObject("service.common.businessscopeSve"); this.businessscopeSve = system.getObject("service.common.businessscopeSve");
this.platformuserSve = system.getObject("service.uc.platformuserSve");
} }
async dics(params, pobj2, req) { async dics(params, pobj2, req) {
...@@ -39,20 +40,25 @@ class ChannelCtl extends CtlBase { ...@@ -39,20 +40,25 @@ class ChannelCtl extends CtlBase {
if (check.status !== 0) { if (check.status !== 0) {
return check; return check;
} }
// 此操作涉及到三个微服务，没有事务！没有事务！没有事务！！！ let id = params.id;
// 1. 创建saas记录 if (!id) {
let saasrs = await this.saasbusinessSve.openSaasBusiness({ // 1. 创建saas记录
"companyName": params.name, let saasrs = await this.saasbusinessSve.openSaasBusiness({
"domain": "ss-platform", "companyName": params.name,
"mobile": "18811051022", "domain": "ss-platform"
"passwd": "051022", });
"realName": "张娇" let saas_id = saasrs.data.id;
}); if (!saas_id) {
// 2. 经营范围创建 return system.getResult(null, `渠道[${params.name}]saas信息创建失败`);
}
// 2. 经营范围创建
await this.businessscopeSve.setDefaultBusinessScope({saas_id: saas_id});
params.saas_id = saas_id;
}
// 3. 渠道增加 // 3. 渠道增加
return await this.channelSve.save(params);
// return await this.channelSve.save(params);
} catch (error) { } catch (error) {
console.log(error);
return system.getResult(null, `系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
} }
} }
...@@ -119,6 +125,43 @@ class ChannelCtl extends CtlBase { ...@@ -119,6 +125,43 @@ class ChannelCtl extends CtlBase {
return system.getResultSuccess(); return system.getResultSuccess();
} }
async userSave(params, pobj2, req) {
try {
let channel_id = params.channel_id;
if (!channel_id) {
return system.getResult("请选择渠道");
}
let channel = await this.channelSve.info({id: params.channel_id}) || {};
if (channel.status !== 0 || !channel.data || !channel.data.id) {
return system.getResult(null, `所选渠道不存在`)
}
channel = channel.data;
params.saas_id = channel.saas_id;
return await this.platformuserSve.save(params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
async userInfo(params, pobj2, req) {
try {
let rs = await this.platformuserSve.info(params);
await this.channelSve.setChannel([rs.data]);
return system.getResultSuccess(rs);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
async userPage(params, pobj2, req) {
try {
let rs = await this.platformuserSve.page(params);
await this.channelSve.setChannel(rs.data.rows);
return rs;
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
} }
module.exports = ChannelCtl; module.exports = ChannelCtl;
\ No newline at end of file
xgg-saas-admin/app/base/service/impl/saas/channelSve.js
...@@ -30,5 +30,31 @@ class ChannelService extends ServiceBase { ...@@ -30,5 +30,31 @@ class ChannelService extends ServiceBase {
var rs = await this.callms("merchant", "channelMapByIds", params); var rs = await this.callms("merchant", "channelMapByIds", params);
return rs; return rs;
} }
async setChannel(rows) {
if (!rows) {
return;
}
let channelIds = [];
for (let row of rows) {
if (!row) {
continue;
}
if (row.channel_id) {
channelIds.push(row.channel_id);
}
}
if (channelIds.length == 0) {
return;
}
let map = await this.mapByIds({
ids: channelIds
}) || {};
map = map.data || {};
for (let row of rows) {
row.channel = map[row.channel_id] || {};
}
}
} }
module.exports = ChannelService; module.exports = ChannelService;
\ No newline at end of file
xgg-saas-admin/app/base/service/impl/uc/merchantuserSve.js → xgg-saas-admin/app/base/service/impl/uc/platformuserSve.js
const system = require("../../../system"); const system = require("../../../system");
const ServiceBase = require("../../svems.base") const ServiceBase = require("../../svems.base")
class MerchantuserService extends ServiceBase { class PlatformUserService extends ServiceBase {
constructor() { constructor() {
super(); super();
} }
async save(params) { async save(params) {
try { try {
return await this.callms("uc", "merchantSave", params); return await this.callms("uc", "platformUserSave", params);
} catch (error) { } catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
} }
...@@ -16,15 +16,7 @@ class MerchantuserService extends ServiceBase { ...@@ -16,15 +16,7 @@ class MerchantuserService extends ServiceBase {
async info(params) { async info(params) {
try { try {
return await this.callms("uc", "merchantInfo", params); return await this.callms("uc", "platformInfo", params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
async enabled(params) {
try {
return await this.callms("uc", "merchantEnabled", params);
} catch (error) { } catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
} }
...@@ -32,7 +24,7 @@ class MerchantuserService extends ServiceBase { ...@@ -32,7 +24,7 @@ class MerchantuserService extends ServiceBase {
async page(params) { async page(params) {
try { try {
return await this.callms("uc", "merchantPage", params); return await this.callms("uc", "platformUserPage", params);
} catch (error) { } catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
} }
...@@ -40,7 +32,7 @@ class MerchantuserService extends ServiceBase { ...@@ -40,7 +32,7 @@ class MerchantuserService extends ServiceBase {
async mapByIds(params) { async mapByIds(params) {
try { try {
return await this.callms("uc", "merchantMapByIds", params); return await this.callms("uc", "platformMapByIds", params);
} catch (error) { } catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`); return system.getResult(null, `系统错误 错误信息 ${error}`);
} }
...@@ -48,4 +40,4 @@ class MerchantuserService extends ServiceBase { ...@@ -48,4 +40,4 @@ class MerchantuserService extends ServiceBase {
} }
module.exports = MerchantuserService; module.exports = PlatformUserService;
\ No newline at end of file \ No newline at end of file
xgg-saas-admin/app/front/entry/public/apidoc/saas/channel.md
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
1. [列表](#list) 1. [列表](#list)
1. [详情](#info) 1. [详情](#info)
1. [添加/修改](#save) 1. [添加/修改](#save)
1. [渠道账户列表](#userPage)
1. [渠道账信息](#userInfo)
1. [渠道账添加/修改](#userSave)
## **<a name="dics"> 字典</a>** ## **<a name="dics"> 字典</a>**
[返回到目录](#menu) [返回到目录](#menu)
...@@ -192,3 +195,126 @@ ...@@ -192,3 +195,126 @@
} }
``` ```
## **<a name="userPage"> 渠道账户列表</a>**
[返回到目录](#menu)
##### URL
[/web/saas/channelCtl/userPage]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"currentPage": "1",
"pageSize": "10",
"channel_id": "", // 渠道id
"realName": "李四", // 姓名
"ucname": "" // 账号
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "success",
"data": {
"count": 1,
"rows": [
{
"id": "", // 账户id
"saas_merchant_id": "", // 商户id
"ucname": "", // 账号
"mobile": "", // 手机号
"realName": "", // 姓名
"password": "", // 密码
"isEnabled": "", // 是否启用 0否 1是
"created_at": "", // 创建时间
// 渠道信息
"channel": {
"name": "", // 渠道名称
"short_name": "", // 简称
}
}
]
},
"requestid": "a4c7b5ce853d45cda37fbd93c7360353"
}
```
## **<a name="userInfo"> 渠道账信息</a>**
[返回到目录](#menu)
##### URL
[/web/saas/channelCtl/userInfo]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"id": 39, // 账号id
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "success",
"data":{
"id": "", // 账户id
"channel_id": "", // 渠道id
"ucname": "", // 账号
"mobile": "", // 手机号
"realName": "", // 姓名
"password": "", // 密码
"isEnabled": "", // 是否启用 0否 1是
"created_at": "", // 创建时间
// 渠道信息
"channel": {
"name": "", // 渠道名称
"short_name": "", // 简称
}
},
"requestid": "a4c7b5ce853d45cda37fbd93c7360353"
}
```
## **<a name="userSave"> 渠道账添加/修改</a>**
[返回到目录](#menu)
##### URL
[/web/saas/channelCtl/userSave]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"id": 39, // 账号id 0添加 其他修改
"channel_id": "1124761", // 渠道id
"realName": "李四", // 姓名
"ucname": "lisi", // 账号
"mobile": "13555555555", // 手机号
"password": "78438f14c7c", // 密码
"isEnabled": 1
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "success",
"data": {...},
"requestid": "a4c7b5ce853d45cda37fbd93c7360353"
}
```
\ No newline at end of file
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