mmm-go-pp / partner01 · 提交

转到一个项目

作者 陈志颖
提交 b7e037f03ceab7fcc0e5cb51ac6bda98f01e1b8c 2 个父辈 24b503f7 5de8cadf

Merge branch 'dev' of http://gitlab.fjmaimaimai.com/mmm-go-pp/partner01 into feature/order

内嵌 并排对比
正在显示 37 个修改的文件 包含 394 行增加 和 1 行删除
  1 +version: v1
  2 +kind: HttpApi
  3 +metadata:
  4 + service: company
  5 + path: /companys
  6 + endpoints:
  7 + - method: createCompany
  8 + route:
  9 + post: /
  10 + - method: updateCompany
  11 + route:
  12 + put: /{companyId}
  13 + - method: getCompany
  14 + route:
  15 + get: /{companyId}
  16 + - method: removeCompany
  17 + route:
  18 + delete: /{companyId}
  19 + - method: listCompany
  20 + route:
  21 + get: /
  22 + params:
  23 + - name: offset
  24 + - name: limit
  1 +version: v1
  2 +kind: HttpApi
  3 +metadata:
  4 + service: partner
  5 + path: /partners
  6 + endpoints:
  7 + - method: partnerCategories
  8 + route:
  9 + get: /categories
  1 +version: v1
  2 +kind: HttpApi
  3 +metadata:
  4 + service: permission
  5 + path: /permissions
  6 + endpoints:
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: companyId
  5 + description: 公司Id
  6 + type:
  7 + primitive: int64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: companyInfo
  5 + description: 公司信息
  6 + type:
  7 + schema: companyInfo
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: abbreviation
  5 + description: 公司简称
  6 + type:
  7 + primitive: string
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: enable
  5 + description: 是否有效【1:有效】【2:无效】
  6 + type:
  7 + primitive: int64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: logo
  5 + description: 公司logo
  6 + type:
  7 + primitive: string
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: name
  5 + description: 公司名称
  6 + type:
  7 + primitive: string
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: phone
  5 + description: 公司联系电话
  6 + type:
  7 + primitive: string
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: remarks
  5 + description: 备注
  6 + type:
  7 + primitive: string
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: status
  5 + description: 状态 1正常 2禁用
  6 + type:
  7 + primitive: int64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: cooperateTime
  5 + description: 合作时间
  6 +
  7 + type:
  8 + primitive: datetime
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: status
  5 + description: 状态（1：启用或者0：禁用）
  6 +
  7 + type:
  8 + primitive: int
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: code
  5 + description: 权限编码
  6 + type:
  7 + primitive: string
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: icon
  5 + description: 图标
  6 + type:
  7 + primitive: string
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: name
  5 + description: 权限名称
  6 + type:
  7 + primitive: string
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: parentId
  5 + description: 父级id
  6 + type:
  7 + primitive: int
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: permissionId
  5 + description: 权限id
  6 + type:
  7 + primitive: int
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: sort
  5 + description: 排序
  6 + type:
  7 + primitive: int
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: accessPartners
  5 + description: 合伙人列表 用户类型为高管时有效
  6 + type:
  7 + array: int64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: userType
  5 + description: 1.高管 2.合伙人 4：游客
  6 + type:
  7 + primitive: int
  1 +version: v1
  2 +kind: Schema
  3 +metadata:
  4 + name: company
  5 + description: 公司信息
  6 + attributes:
  7 + - ref: companyId
  8 + required: true
  9 + - ref: companyInfo
  10 + required: true
  11 + - ref: createAt
  12 + required: true
  13 + - ref: updateAt
  14 + required: true
  15 + - ref: deleteAt
  16 + required: true
  1 +version: v1
  2 +kind: Schema
  3 +metadata:
  4 + name: companyInfo
  5 + description: 公司信息
  6 + attributes:
  7 + - ref: companyId
  8 + required: true
  9 + - ref: name
  10 + required: true
  11 + - ref: abbreviation
  12 + required: true
  13 + - ref: logo
  14 + required: true
  15 + - ref: phone
  16 + required: true
  17 + - ref: status
  18 + required: true
  19 + - ref: remarks
  20 + required: true
  21 + - ref: enable
  22 + required: true
  23 + - name: admin
  24 + description: 公司主管理员
  25 + type:
  26 + schema: userInfo
@@ -10,3 +10,16 @@ metadata: @@ -10,3 +10,16 @@ metadata:
10 required: true 10 required: true
11 - ref: regionInfo 11 - ref: regionInfo
12 required: true 12 required: true
  13 + - ref: status
  14 + required: true
  15 + - ref: cooperateTime
  16 + required: true
  17 + - name: salesmans
  18 + description: 业务员
  19 + type:
  20 + array: salesman
  21 + - name: partnerCategorys
  22 + description: 合伙人类型
  23 + type:
  24 + array: partnerCategory
  25 +
  1 +version: v1
  2 +kind: Schema
  3 +metadata:
  4 + name: permission
  5 + description: 权限
  6 + attributes:
  7 + - ref: permissionId
  8 + required: true
  9 + - ref: name
  10 + required: true
  11 + - ref: code
  12 + required: true
  13 + - ref: parentId
  14 + required: true
  15 + - ref: sort
  16 + required: true
  17 + - ref: icon
  18 + required: true
@@ -6,6 +6,8 @@ metadata: @@ -6,6 +6,8 @@ metadata:
6 attributes: 6 attributes:
7 - ref: userId 7 - ref: userId
8 required: true 8 required: true
  9 + - ref: userType
  10 + required: true
9 - ref: permissions 11 - ref: permissions
10 required: true 12 required: true
11 - ref: companyId 13 - ref: companyId
@@ -15,4 +17,12 @@ metadata: @@ -15,4 +17,12 @@ metadata:
15 - ref: status 17 - ref: status
16 required: true 18 required: true
17 - ref: isSenior 19 - ref: isSenior
18 - required: true  
  20 + required: true
  21 + - ref: accessPartners
  22 + required: true
  23 + - ref: createAt
  24 + required: true
  25 + - ref: updateAt
  26 + required: true
  27 + - ref: deleteAt
  28 + required: true
  1 +version: v1
  2 +kind: Method
  3 +metadata:
  4 + name: createCompany
  5 + type: command
  6 + description: 创建
  7 + payload:
  8 + - ref: name
  9 + required: true
  10 + - ref: abbreviation
  11 + required: true
  12 + - ref: status
  13 + required: true
  14 + - ref: remarks
  15 + required: false
  16 + - name: adminId
  17 + description: 公司主管理员Id
  18 + type:
  19 + primitive: int64
  20 + result:
  21 + - ref: count
  22 + required: true
  23 + - name: company
  24 + type:
  25 + schema: company
  1 +version: v1
  2 +kind: Method
  3 +metadata:
  4 + name: getCompany
  5 + type: query
  6 + description: 返回
  7 + payload:
  8 + - ref: companyId
  9 + required: true
  10 + result:
  11 + - ref: count
  12 + required: true
  13 + - name: company
  14 + type:
  15 + schema: company
  1 +version: v1
  2 +kind: Method
  3 +metadata:
  4 + name: listCompany
  5 + type: query
  6 + description: 返回列表
  7 + payload:
  8 + - ref: offset
  9 + required: true
  10 + - ref: limit
  11 + required: true
  12 + result:
  13 + - ref: count
  14 + required: true
  15 + - name: company
  16 + type:
  17 + schema: company
  1 +version: v1
  2 +kind: Method
  3 +metadata:
  4 + name: removeCompany
  5 + type: command
  6 + description: 移除
  7 + payload:
  8 + - ref: companyId
  9 + required: true
  10 + result:
  11 + - name: company
  12 + type:
  13 + schema: company
  1 +version: v1
  2 +kind: Method
  3 +metadata:
  4 + name: updateCompany
  5 + type: command
  6 + description: 更新
  7 + payload:
  8 + - ref: companyId
  9 + required: true
  10 + - ref: name
  11 + required: false
  12 + - ref: abbreviation
  13 + required: false
  14 + - ref: status
  15 + required: false
  16 + - ref: remarks
  17 + required: false
  18 + - name: adminId
  19 + description: 公司主管理员Id
  20 + type:
  21 + primitive: int64
  22 + required: false
  23 + result:
  24 + - name: company
  25 + type:
  26 + schema: company
  1 +version: v1
  2 +kind: Service
  3 +metadata:
  4 + name: company
  5 + description: 公司服务
  1 +version: v1
  2 +kind: Method
  3 +metadata:
  4 + name: partnerCategories
  5 + type: query
  6 + description: 合伙人分类列表
  7 + result:
  8 + - name: partner
  9 + type:
  10 + array: partnerCategory
  1 +version: v1
  2 +kind: Service
  3 +metadata:
  4 + name: partner
  5 + description: 合伙人服务
  1 +version: v1
  2 +kind: Method
  3 +metadata:
  4 + name: menus
  5 + type: query
  6 + description: 根据当前用户返回权限列表
  7 + payload:
  8 + - ref: userId
  9 + required: true
  10 + result:
  11 + - ref: count
  12 + required: true
  13 + - name: permissions
  14 + type:
  15 + array: permission
  1 +version: v1
  2 +kind: Service
  3 +metadata:
  4 + name: permission
  5 + description: 权限服务