Skip to content

Z
zhichan
Commit d6c9e8e5 by 王昆
Options

gsb

parent 715a28dd
Showing with 313 additions and 124 deletions
xgg-admin/app/base/controller/impl/business/businessmenCtl.js
......@@ -58,6 +58,10 @@ class BusinessmenCtl extends CtlBase {
}
}
async signNames (pobj, pobj2, req) {
return system.getResultSuccess([]);
}
async signPage(pobj, pobj2, req) {
try {
......
xgg-admin/app/base/controller/impl/common/deliverCtl.js
......@@ -38,9 +38,67 @@ class DeliverCtl extends CtlBase {
}
}
async enabled(pobj, pobj2, req) {
pobj.isEnabled = Number(pobj.isEnabled || 0);
try {
return await this.deliverSve.enabled(pobj);
} catch (e) {
console.log(e);
return system.getResultFail(500, "接口错误");
}
}
async resetPassword(pobj, pobj2, req) {
let params = {
admin_id: this.trim(pobj.admin_id),
password: this.trim(pobj.password),
}
if(!params.password) {
return system.getResult(null, "请输入密码");
}
try {
return await this.deliverSve.resetPassword(pobj);
} catch (e) {
console.log(e);
return system.getResultFail(500, "接口错误");
}
}
async save(pobj, pobj2, req) {
try {
return await this.deliverSve.save(pobj);
let id = this.trim(pobj.id);
let name = this.trim(pobj.name);
let real_name = this.trim(pobj.real_name);
let ucname = this.trim(pobj.ucname);
let password = this.trim(pobj.password);
let isEnabled = pobj.isEnabled || 0;
if (!name) {
return system.getResult(null, "请输入交付商名称");
}
if (!real_name) {
return system.getResult(null, "请输入管理员名称");
}
if (!ucname) {
return system.getResult(null, "请输入帐号名");
}
if (!id) {
if (!password) {
return system.getResult(null, "请输入密码");
}
}
let params = {
id: id,
name: name,
real_name: real_name,
ucname: ucname,
password: password,
isEnabled: isEnabled,
saas_id: pobj.saas_id,
}
return await this.deliverSve.save(params);
} catch (e) {
console.log(e);
return system.getResultFail(500, "接口错误");
......@@ -57,4 +115,5 @@ class DeliverCtl extends CtlBase {
}
}
module.exports = DeliverCtl;
\ No newline at end of file
xgg-admin/app/base/controller/impl/uc/orgCtl.js
......@@ -6,25 +6,13 @@ class OrgCtl extends CtlBase {
this.orgSve = system.getObject("service.uc.orgSve");
}
/**
* 组织机构 添加
* @param {*} params
*/
async addOrg(params, pobj2, req) {
try {
return await this.orgSve.addOrg(params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
/**
* 组织机构 更新
* @param {*} params
*/
async updOrg(params, pobj2, req) {
async saveOrg(params, pobj2, req) {
try {
return await this.orgSve.updOrg(params);
return await this.orgSve.saveOrg(params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
......
xgg-admin/app/base/controller/impl/uc/userCtl.js
......@@ -81,7 +81,7 @@ class UserCtl extends CtlBase {
async setLogin(user) {
var xggadminsid = "pt_" + uuidv4();
// xggadminsid = "pt_" + "3cb49932-fa02-44f0-90db-9f06fe02e5c7";
xggadminsid = "pt_" + "3cb49932-fa02-44f0-90db-9f06fe02e5c7";
await this.redisClient.setWithEx(xggadminsid, JSON.stringify(user), 60 * 60);
return xggadminsid;
}
......@@ -180,6 +180,43 @@ class UserCtl extends CtlBase {
}
}
async saveUser(params, pobj2, req) {
try {
var user = {
id: params.id,
saas_id: params.saas_id,
ucname: this.trim(params.ucname),
realName: this.trim(params.realName),
password: this.trim(params.password),
mobile: this.trim(params.mobile),
org_id: Number(params.org_id || 0),
roles: params.roles || [],
};
if (!user.ucname) {
return system.getResult(null, "请填写用户名");
}
if (!user.realName) {
return system.getResult(null, "请填写姓名");
}
if (!user.mobile) {
return system.getResult(null, "请填写手机号");
}
if (!user.org_id) {
return system.getResult(null, "请选择组织机构");
}
if (user.id && !user.password) {
return system.getResult(null, "请填写密码");
}
if (!user.roles || user.roles.length == 0) {
return system.getResult(null, "请选择角色");
}
return await this.userSve.saveUser(user);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
async currentUser(qobj, pobj, req) {
return system.getResultSuccess(req.loginUser);
}
......@@ -219,6 +256,19 @@ class UserCtl extends CtlBase {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
async orgUsers(params, pobj2, req) {
if (!params.org_id) {
return system.getResultSuccess([]);
}
try {
return await this.userSve.orgUsers(params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
async resetPassword(params, pobj2, req) {
params.password = this.trim(params.password);
if(!params.password) {
......
xgg-admin/app/base/service/impl/common/deliverSve.js
......@@ -25,9 +25,18 @@ class DeliverService extends ServiceBase {
return rs;
}
async enabled(params) {
var rs = await this.callms("common", "deliverEnable", params);
return rs;
}
async resetPassword(params) {
var rs = await this.callms("common", "deliverResetPassword", params);
return rs;
}
async save(params) {
params.invoiceDivide = system.y2f(params.invoiceDivide);
params.businessmenDivide = system.y2f(params.businessmenDivide);
params.invoiceDivide = 0;
params.businessmenDivide = 0;
var rs = await this.callms("common", "deliverSave", params);
await this.doPercent([rs.data]);
return rs;
......
xgg-admin/app/base/service/impl/uc/orgSve.js
......@@ -5,25 +5,14 @@ class OrgService extends ServiceBase {
super();
}
/**
* 组织机构 添加
* @param {*} params
*/
async addOrg(params) {
try {
return await this.callms("uc", "addOrg", params);
} catch (error) {
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
/**
* 组织机构 更新
* @param {*} params
*/
async updOrg(params) {
async saveOrg(params) {
try {
return await this.callms("uc", "updOrg", params);
return await this.callms("uc", "saveOrg", params);
} catch (error) {
console.log(error);
return system.getResult(null, `系统错误 错误信息 ${error}`);
}
}
......
xgg-admin/app/base/service/impl/uc/userSve.js
......@@ -44,6 +44,14 @@ class UserService extends ServiceBase {
}
}
async saveUser(params) {
return await this.callms("uc", "saveUser", params);
}
async orgUsers(params) {
return await this.callms("uc", "findUsers", params);
}
/**
* 更新
* @param {*} params
......
xgg-admin/app/base/system.js
......@@ -173,8 +173,8 @@ class System {
// var domain = "http://127.0.0.1";
return {
// 公共服务
common: domain + ":3102" + path,
// common: "http://127.0.0.1:3102" + path,
// common: domain + ":3102" + path,
common: "http://127.0.0.1:3102" + path,
// 商户服务
merchant: domain + ":3101" + path,
......@@ -189,8 +189,8 @@ class System {
// invoice: "http://127.0.0.1:3105" + path,
// 用户中心
uc: domain + ":3106" + path ,
// uc: "http://127.0.0.1:3106" + path,
// uc: domain + ":3106" + path ,
uc: "http://127.0.0.1:3106" + path,
}
} else {
var odomain = "http://123.57.217.203"
......
xgg-admin/app/front/entry/public/apidoc/common/deliver.md
......@@ -4,6 +4,9 @@
1. [交付商查询](#info)
1. [交付商添加/修改](#save)
1. [交付商删除](#del)
1. [启用/禁用](#enabled)
1. [修改密码](#resetPassword)
## **<a name="all"> 全部交付商</a>**
[返回到目录](#menu)
......@@ -36,7 +39,7 @@
```
## **<a name="page"> 交付商列表页</a>**
## **<a name="list"> 交付商列表页</a>**
[返回到目录](#menu)
##### URL
[/web/common/deliverCtl/page]
......@@ -65,14 +68,30 @@
"businessmenDivide": 30.25, // 个体户分成比例
"invoiceDivide": 22.21, // 发票分成比例
"isEnabled": 0, // 是否可用 0否 1是
"real_name": "杨庆菊333", // 管理员姓名
"ucname": "kf_admin", // 帐号名
"admin_id": "1631497435000614", // 管理员帐号id, 修改密码时使用
"remark": "备注" // 备注
"created_at": "2019-10-03 10:12:14" // 创建时间
"user": {
"id": "1631497435000614",
"real_name": "杨庆菊333",
"ucname": "kf_admin",
"deliver_id": "13130003843000925",
"isAdmin": 1,
"saas_id": "",
"created_at": "2020-01-19T07:42:35.000Z",
"updated_at": "2020-01-19T07:42:35.000Z",
"deleted_at": null,
"version": 0
}
},
]
},
"requestid": "1e18fd911db84525a964e9a17d8c83d1"
}
```
......@@ -102,8 +121,20 @@
"businessmenDivide": 30.25, // 个体户分成比例
"invoiceDivide": 22.21, // 发票分成比例
"isEnabled": 0, // 是否可用 0否 1是
"remark": "备注" // 备注
"created_at": "2019-10-03 10:12:14" // 创建时间
"real_name": "杨庆菊333", // 管理员姓名
"ucname": "kf_admin", // 帐号名
"admin_id": "1631497435000614", // 管理员帐号id, 修改密码时使用
"remark": "备注" // 备注
"created_at": "2019-10-03 10:12:14" // 创建时间
"user": {
"id": "1631497435000614",
"real_name": "杨庆菊333",
"ucname": "kf_admin",
"deliver_id": "13130003843000925",
"isAdmin": 1,
"saas_id": "",
"version": 0
}
},
"requestid": "7d6c9dd96aed4e00917bdb934d62bfaf"
}
......@@ -120,9 +151,9 @@
{
"id": "", // id
"name": "杨庆菊交付商14", // 交付商名称
"businessmenDivide": 30.25, // 个体户分成比例
"invoiceDivide": 22.21, // 发票分成比例
"remark": "备注" // 备注
"real_name" : "杨庆菊333", // 管理员
"ucname" : "kf_admin", // 账号
"password" : "123123", // 密码
"isEnabled": 0
}
```
......@@ -161,4 +192,56 @@
"requestid": "3f4426683fb44c2d80e55b88faabafc9"
}
```
\ No newline at end of file
```
## **<a name="enabled"> 启用/禁用</a>**
[返回到目录](#menu)
##### URL
[//web/common/deliverCtl/enabled]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
```javascript
{
"id" : "13130003843000925", // 列表id
"isEnabled" : "1" // 0禁用 1启用
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "success",
"data": "",
"requestid": "3f4426683fb44c2d80e55b88faabafc9"
}
```
## **<a name="resetPassword"> 修改密码</a>**
[返回到目录](#menu)
##### URL
[//web/common/deliverCtl/resetPassword]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
```javascript
{
"admin_id": "1631497435000614", // 列表admin_id字段
"password": "1" // 密码
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "success",
"data": "",
"requestid": "3f4426683fb44c2d80e55b88faabafc9"
}
```
xgg-admin/app/front/entry/public/apidoc/uc/org.md
[返回主目录](/doc)
<a name="menu">目录</a>
1. [添加](#addOrg)
1. [添加](#saveOrg)
1. [负责人列表](#orgUsers)
1. [更新（暂不提供）](#updOrg)
1. [删除](#delOrg)
1. [列表(条件)](#listOrg)
......@@ -9,39 +10,30 @@
1. [根据PID查询子目录](#byPid)
1. [结构树](#tree)
## **<a name="addOrg"> 添加</a>**
## **<a name="saveOrg"> 添加</a>**
[返回到目录](#menu)
##### URL
[/web/uc/orgCtl/addOrg]
[/web/uc/orgCtl/saveOrg]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"orgname":"sun", //组织结构的名称 必传
"pid":1, //父结点 必传 默认值：0
"saas_id":3 //saasId 必传
"id": 1, // 组织机构id 空添加 非空修改
"pid": 0, // 上级组织机构id
"orgname": "公司宝", // 组织机构名号曾
"main_ids": "36, 22" // 负责人id，多个以逗号分割
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "操作成功",
"data": {
"is_leaf": true, //是否叶子结点
"version": 0,
"id": 3, //ID
"orgname": "sun", //组织结构的名称
"pid": 1, //父结点
"saas_id": 3, //saasID
"path": "/root/sun",//路径
"updated_at": "2019-11-29T03:03:36.800Z",
"created_at": "2019-11-29T03:03:36.800Z"
},
"data": {},
"bizmsg": "empty",
"requestid": "faf3871bc6a040d9b098ffa33d5a180a"
}
......@@ -49,20 +41,44 @@
```
## **<a name="updOrg"> 更新（暂不提供）</a>**
## **<a name="orgUsers"> 负责人列表</a>**
[返回到目录](#menu)
##### URL
[/web/uc/orgCtl/updOrg]
[/web/uc/userCtl/orgUsers]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"id": 1, // 传入当前修改的组织机构id
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "success",
"data": {
"count": 8,
"rows": [
{
"id": 17, // 编号
"ucname": "guodegang10", // 登录名
"mobile": "1381231332312", // 手机号
"realName": "郭德纲11", // 姓名
},
]
},
"requestid": "defbe7aa7b1045c4b644e1c9eb58fd88"
}
```
## **<a name="delOrg"> 删除</a>**
[返回到目录](#menu)
##### URL
......@@ -87,8 +103,35 @@
#### HTTP请求方式 `POST`
``` javascript
{}
{
"status": 0,
"msg": "success",
"data": {
"id": 17, // id
"ucname": "guodegang10", // 登录名
"uctype": 2, // 用户类型 1平台 2商户 3交付商 4个人
"uctypeId": "", // 用户类型id
"org_id": 3, // 组织机构id
"isMain": 0, // 是否主管
"isEnabled": 1, // 启用/禁用 0禁用 1启用
"created_at": "2019-11-29 10:43:32", // 创建时间
"mobile": "1381231332312", // 手机号
"realName": "郭德纲11", // 姓名
"roles": [ // 拥有角色
{
"role_id": "1" // 角色id
},
{
"role_id": "5"
},
{
"role_id": "6"
}
]
},
"requestid": "dd2731bca15c446595170e1ccf0b2b00"
}
```
......
xgg-admin/app/front/entry/public/apidoc/uc/user.md
[返回主目录](/doc)
<a name="menu">目录</a>
1. [添加](#add)
1. [更新](#upd)
1. [添加/修改](#saveUser)
1. [启用禁用](#enabled)
1. [删除](#del)
1. [明细](#queryById)
1. [列表页](#page)
1. [重置密码](#resetPassword)
## **<a name="add"> 添加</a>**
1. [添加/修改](#saveUser)
## **<a name="add"> 添加/修改</a>**
[返回到目录](#menu)
##### URL
[/web/uc/userCtl/addUser]
[/web/uc/userCtl/saveUser]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"id": "33", // 编号，为空时添加，不为空时修改
"org_id": 3, // 组织机构id
"isMain": 0, // 是否主管
"ucname": "guodegang10", // 用户名/登录名
"password": "123", // 密码
"uctype": "2", // 用户类型 1平台 2商户 3交付商 4个人
"uctypeId": "xxx", // 用户类型id
"mobile": "13811112222", // 手机号
"realName": "郭德纲10", // 姓名
"roles": [ // 角色列表
{
"role_id": 1 // 角色id
},
{
"role_id": 2
}...
]
"password": "123", // 密码
"roles": [1,2] // 角色列表
}
```
#### 返回结果
......@@ -53,46 +44,6 @@
## **<a name="upd"> 更新</a>**
[返回到目录](#menu)
##### URL
[/web/uc/userCtl/updUser]
#### 参数格式 `JSON`
#### HTTP请求方式 `POST`
``` javascript
{
"id": "17", // 用户id
"org_id": 3, // 组织机构id
"isMain": 0, // 是否主管
"uctype": "2", // 用户类型 1平台 2商户 3交付商 4个人
"uctypeId": "", // 用户类型id
"mobile": "13811112222", // 手机号
"realName": "郭德纲10", // 姓名
"roles": [ // 角色列表
{
"role_id": 1 // 角色id
},
{
"role_id": 2
}...
]
}
```
#### 返回结果
```javascript
{
"status": 0,
"msg": "success",
"data": {},
"requestid": "007fd384e47641d2a71e9f3ef6292843"
}
```
## **<a name="enabled"> 启用禁用</a>**
[返回到目录](#menu)
##### URL
......@@ -235,7 +186,7 @@
"count": 8,
"rows": [
{
"id": 17, // id
"id": 17, // 编号
"ucname": "guodegang10", // 登录名
"uctype": 2, // 用户类型 1平台 2商户 3交付商 4个人
"uctypeId": "", // 用户类型id
......@@ -245,12 +196,17 @@
"created_at": "2019-11-29 10:43:32", // 创建时间
"mobile": "1381231332312", // 手机号
"realName": "郭德纲11", // 姓名
"roleIds": "2", // 角色id
"roleNames": "业务员", // 角色名称
"orgname": "", // 组织机构
},
]
},
"requestid": "defbe7aa7b1045c4b644e1c9eb58fd88"
}
```
......
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