allied-creation / document · 提交

转到一个项目

作者 tangxuhui
提交 fa731ce45fd007d3935fe7a132ead4b4c2196f9d 2 个父辈 c2ab12f0 234a8acd

Merge branch 'master' of http://gitlab.fjmaimaimai.com/allied-creation/document 

# Conflicts:
#	allied-creation-gateway/services/appUsers/methods/getPersonalData.yaml
内嵌 并排对比
正在显示 38 个修改的文件 包含 86 行增加 和 61 行删除
@@ -19,7 +19,7 @@ metadata: @@ -19,7 +19,7 @@ metadata:
19 - method: searchDividendsOrder 19 - method: searchDividendsOrder
20 route: 20 route:
21 post: /search 21 post: /search
22 - - method: listDividendsOrder 22 + - method: listDividendsOrders
23 route: 23 route:
24 get: / 24 get: /
25 params: 25 params:
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: IsOrganization 4 + name: isOrganization
5 description: 是否组织机构标识，1为是，2为否，默认为否 5 description: 是否组织机构标识，1为是，2为否，默认为否
6 type: 6 type:
7 primitive: boolean 7 primitive: boolean
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: dividendsPercentage 4 + name: dividendsIncentivesPercentage
5 description: 分红规则激励百分点 5 description: 分红规则激励百分点
6 type: 6 type:
7 primitive: float64 7 primitive: float64
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: dividendsRuleId 4 + name: dividendsIncentivesRuleId
5 description: 分红规则ID 5 description: 分红规则ID
6 type: 6 type:
7 primitive: int64 7 primitive: int64
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: dividendsStage 4 + name: dividendsIncentivesStage
5 description: 分红规则激励阶段，阶段返回时需要转换为中文数字 5 description: 分红规则激励阶段，阶段返回时需要转换为中文数字
6 type: 6 type:
7 primitive: int64 7 primitive: int64
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: dividendsStageEnd 4 + name: dividendsIncentivesStageEnd
5 description: 分红规则激励阶段结束 5 description: 分红规则激励阶段结束
6 type: 6 type:
7 primitive: datetime 7 primitive: datetime
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: dividendsStageStart 4 + name: dividendsIncentivesStageStart
5 description: 分红规则激励阶段开始 5 description: 分红规则激励阶段开始
6 type: 6 type:
7 primitive: datetime 7 primitive: datetime
1 -version: v1  
2 -kind: Attribute  
3 -metadata:  
4 - name: userAccount  
5 - description: 用户账号  
6 - type:  
7 - primitive: string  
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: userAvator 4 + name: userAvatar
5 description: 用户头像 5 description: 用户头像
6 type: 6 type:
7 primitive: string 7 primitive: string
  1 +version: v1
  2 +kind: Schema
  3 +metadata:
  4 + name: cooperationContractByUndertaker
  5 + description: 根据承接人返回共创项目合约
  6 + attributes:
  7 + - ref: cooperationContractId
  8 + required: true
  9 + - ref: cooperationContractDescription
  10 + required: true
  11 + - ref: cooperationContractNumber
  12 + required: true
  13 + - ref: cooperationContractName
  14 + required: true
  15 + - ref: cooperationMode
  16 + required: true
  17 + - ref: cooperationContractSponsor
  18 + required: true
  19 + - ref: status
  20 + required: true
  21 + - ref: contractUndertaker
  22 + required: true
@@ -10,5 +10,5 @@ metadata: @@ -10,5 +10,5 @@ metadata:
10 required: true 10 required: true
11 - ref: departmentNumber 11 - ref: departmentNumber
12 required: true 12 required: true
13 - - ref: IsOrganization 13 + - ref: isOrganization
14 required: true 14 required: true
1 version: v1 1 version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 - name: dividendsIncentivesRule 4 + name: dividendsIncentivesRules
5 description: 金额激励规则DTO 5 description: 金额激励规则DTO
6 attributes: 6 attributes:
7 - ref: referrerPercentage 7 - ref: referrerPercentage
1 version: v1 1 version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 - name: moneyIncentivesRule 4 + name: moneyIncentivesRules
5 description: 金额激励规则DTO 5 description: 金额激励规则DTO
6 attributes: 6 attributes:
7 - ref: moneyIncentivesAmount 7 - ref: moneyIncentivesAmount
1 version: v1 1 version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 - name: orderGood 4 + name: orderGoods
5 description: 订单产品对象 5 description: 订单产品对象
6 attributes: 6 attributes:
7 - ref: orderGoodAmount 7 - ref: orderGoodAmount
@@ -4,7 +4,7 @@ metadata: @@ -4,7 +4,7 @@ metadata:
4 name: userInfo 4 name: userInfo
5 description: 用户信息值对象 5 description: 用户信息值对象
6 attributes: 6 attributes:
7 - - ref: userAvator 7 + - ref: userAvatar
8 required: true 8 required: true
9 - ref: userEmail 9 - ref: userEmail
10 required: true 10 required: true
@@ -5,7 +5,7 @@ metadata: @@ -5,7 +5,7 @@ metadata:
5 type: query 5 type: query
6 description: 返回共创合约反馈服务 6 description: 返回共创合约反馈服务
7 payload: 7 payload:
8 - - ref: contractUndertakerFeedbackId 8 + - ref: feedbackId
9 required: true 9 required: true
10 - name: underTakerUid 10 - name: underTakerUid
11 description: Attribute描述 11 description: Attribute描述
@@ -5,7 +5,7 @@ metadata: @@ -5,7 +5,7 @@ metadata:
5 type: command 5 type: command
6 description: 移除共创合约反馈服务 6 description: 移除共创合约反馈服务
7 payload: 7 payload:
8 - - ref: contractUndertakerFeedbackId 8 + - ref: feedbackId
9 required: true 9 required: true
10 - name: underTakerUid 10 - name: underTakerUid
11 description: Attribute描述 11 description: Attribute描述
@@ -8,7 +8,7 @@ metadata: @@ -8,7 +8,7 @@ metadata:
8 - ref: cooperationContractId 8 - ref: cooperationContractId
9 required: true 9 required: true
10 - name: sponsorUid 10 - name: sponsorUid
11 - description: Attribute描述 11 + description: 发起人uid
12 type: 12 type:
13 primitive: string 13 primitive: string
14 result: 14 result:
@@ -6,26 +6,14 @@ metadata: @@ -6,26 +6,14 @@ metadata:
6 description: 根据承接人返回共创项目合约 6 description: 根据承接人返回共创项目合约
7 payload: 7 payload:
8 - ref: cooperationContractName 8 - ref: cooperationContractName
9 - requird: false 9 + required: false
10 - name: sponsorName 10 - name: sponsorName
11 description: 项目发起人姓名 11 description: 项目发起人姓名
12 type: 12 type:
13 primitive: string 13 primitive: string
14 required: false 14 required: false
15 result: 15 result:
16 - - ref: cooperationContractDescription  
17 - required: true  
18 - - ref: cooperationContractId  
19 - required: true  
20 - - ref: contractUndertaker  
21 - required: true  
22 - - ref: cooperationContractNumber  
23 - required: true  
24 - - ref: cooperationContractName  
25 - required: true  
26 - - ref: cooperationMode  
27 - required: true  
28 - - ref: cooperationContractSponsor  
29 - required: true  
30 - - ref: status  
31 - required: true 16 + - name: cooperationContractByUndertaker
  17 + description: 根据承接人返回的共创项目合约
  18 + type:
  19 + array: cooperationContractByUndertaker
1 version: v1 1 version: v1
2 kind: Method 2 kind: Method
3 metadata: 3 metadata:
4 - name: searchCooperationContract 4 + name: searchCooperationMode
5 type: query 5 type: query
6 description: 查询共创模式 6 description: 查询共创模式
7 payload: 7 payload:
@@ -7,12 +7,12 @@ metadata: @@ -7,12 +7,12 @@ metadata:
7 payload: 7 payload:
8 - ref: creditAccountOrderNum 8 - ref: creditAccountOrderNum
9 required: true 9 required: true
10 - - name: participartorName 10 + - name: participatorName
11 description: 参与人姓名 11 description: 参与人姓名
12 type: 12 type:
13 primitive: string 13 primitive: string
14 result: 14 result:
15 - - name: creditAccount 15 + - name: creditAccounts
16 type: 16 type:
17 - schema: creditAccount 17 + array: creditAccount
18 required: true 18 required: true
@@ -12,7 +12,7 @@ metadata: @@ -12,7 +12,7 @@ metadata:
12 description: 分红阶段 12 description: 分红阶段
13 required: true 13 required: true
14 - name: undertakerUid 14 - name: undertakerUid
15 - decription: 承接人UID 15 + description: 承接人UID
16 type: 16 type:
17 primitive: string 17 primitive: string
18 required: true 18 required: true
@@ -14,5 +14,5 @@ metadata: @@ -14,5 +14,5 @@ metadata:
14 result: 14 result:
15 - name: moneyIncentives 15 - name: moneyIncentives
16 type: 16 type:
17 - schema: moneyIncentives 17 + array: moneyIncentives
18 required: true 18 required: true
@@ -18,11 +18,11 @@ metadata: @@ -18,11 +18,11 @@ metadata:
18 - ref: remarks 18 - ref: remarks
19 required: true 19 required: true
20 - name: salesmanUid 20 - name: salesmanUid
21 - description: Attribute描述 21 + description: 业务员uid
22 type: 22 type:
23 primitive: string 23 primitive: string
24 - name: operatorUid 24 - name: operatorUid
25 - description: Attribute描述 25 + description: 操作人uid
26 type: 26 type:
27 primitive: string 27 primitive: string
28 result: 28 result:
@@ -6,7 +6,7 @@ metadata: @@ -6,7 +6,7 @@ metadata:
6 description: 返回分红退货单服务 6 description: 返回分红退货单服务
7 payload: 7 payload:
8 - ref: dividendsReturnedOrderId 8 - ref: dividendsReturnedOrderId
9 - require: true 9 + required: true
10 result: 10 result:
11 - name: dividendsReturnedOrders 11 - name: dividendsReturnedOrders
12 type: 12 type:
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: avator 4 + name: avatar
5 description: 头像 5 description: 头像
6 type: 6 type:
7 primitive: string 7 primitive: string
@@ -10,7 +10,7 @@ metadata: @@ -10,7 +10,7 @@ metadata:
10 required: true 10 required: true
11 - ref: updatedAt 11 - ref: updatedAt
12 required: true 12 required: true
13 - - ref: avator 13 + - ref: avatar
14 required: true 14 required: true
15 - ref: cooperationCompany 15 - ref: cooperationCompany
16 required: true 16 required: true
@@ -5,7 +5,7 @@ metadata: @@ -5,7 +5,7 @@ metadata:
5 type: command 5 type: command
6 description: 编辑个人资料 6 description: 编辑个人资料
7 payload: 7 payload:
8 - - name: avator 8 + - name: avatar
9 description: 头像地址 9 description: 头像地址
10 type: 10 type:
11 primitive: string 11 primitive: string
@@ -14,7 +14,7 @@ metadata: @@ -14,7 +14,7 @@ metadata:
14 type: 14 type:
15 primitive: string 15 primitive: string
16 result: 16 result:
17 - - name: avator 17 + - name: avatar
18 description: 头像地址 18 description: 头像地址
19 type: 19 type:
20 primitive: string 20 primitive: string
@@ -10,11 +10,19 @@ metadata: @@ -10,11 +10,19 @@ metadata:
10 type: 10 type:
11 primitive: int64 11 primitive: int64
12 result: 12 result:
  13 +<<<<<<< .mine
13 - name: userId 14 - name: userId
14 description: 用户id 15 description: 用户id
15 type: 16 type:
16 primitive: int64 17 primitive: int64
17 - name: avator 18 - name: avator
  19 +=======
  20 + - name: avatar
  21 +
  22 +
  23 +
  24 +
  25 +>>>>>>> .theirs
18 description: 头像地址 26 description: 头像地址
19 type: 27 type:
20 primitive: string 28 primitive: string
@@ -27,7 +27,7 @@ metadata: @@ -27,7 +27,7 @@ metadata:
27 description: 关联的用户 27 description: 关联的用户
28 type: 28 type:
29 array: int64 29 array: int64
30 - - ref: avator 30 + - ref: avatar
31 required: true 31 required: true
32 result: 32 result:
33 - name: usersId 33 - name: usersId
@@ -45,7 +45,7 @@ metadata: @@ -45,7 +45,7 @@ metadata:
45 description: 关联的组织结构 45 description: 关联的组织结构
46 type: 46 type:
47 array: int64 47 array: int64
48 - - name: avator 48 + - name: avatar
49 description: 头像 49 description: 头像
50 type: 50 type:
51 primitive: string 51 primitive: string
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: avator 4 + name: avatar
5 description: 头像 5 description: 头像
6 type: 6 type:
7 primitive: string 7 primitive: string
@@ -25,7 +25,7 @@ metadata: @@ -25,7 +25,7 @@ metadata:
25 - name: usersInfo 25 - name: usersInfo
26 description: 用户信息 （冗余，数据存在usersBase里面） 26 description: 用户信息 （冗余，数据存在usersBase里面）
27 type: 27 type:
28 - array: usersInfo 28 + schema: usersInfo
29 - name: usersOrg 29 - name: usersOrg
30 description: 用户关联的组织 30 description: 用户关联的组织
31 type: 31 type:
@@ -8,7 +8,7 @@ metadata: @@ -8,7 +8,7 @@ metadata:
8 required: true 8 required: true
9 - ref: phone 9 - ref: phone
10 required: true 10 required: true
11 - - ref: avator 11 + - ref: avatar
12 required: true 12 required: true
13 - ref: email 13 - ref: email
14 required: true 14 required: true
@@ -12,7 +12,7 @@ metadata: @@ -12,7 +12,7 @@ metadata:
12 required: true 12 required: true
13 - ref: usersCode 13 - ref: usersCode
14 required: true 14 required: true
15 - - ref: avator 15 + - ref: avatar
16 required: true 16 required: true
17 - ref: phone 17 - ref: phone
18 required: true 18 required: true
  1 +version: v1
  2 +kind: Method
  3 +metadata:
  4 + name: refreshIM
  5 + type: command
  6 + description: 刷新IM信息
  7 + payload:
  8 + - ref: phone
  9 + required: true
  10 + result:
  11 + - name: im
  12 + description: IM信息
  13 + type:
  14 + schema: im
@@ -9,7 +9,7 @@ metadata: @@ -9,7 +9,7 @@ metadata:
9 required: true 9 required: true
10 - ref: usersName 10 - ref: usersName
11 required: true 11 required: true
12 - - ref: avator 12 + - ref: avatar
13 required: true 13 required: true
14 - ref: phone 14 - ref: phone
15 required: true 15 required: true
@@ -9,7 +9,7 @@ metadata: @@ -9,7 +9,7 @@ metadata:
9 required: true 9 required: true
10 - ref: usersName 10 - ref: usersName
11 required: true 11 required: true
12 - - ref: avator 12 + - ref: avatar
13 required: true 13 required: true
14 - ref: phone 14 - ref: phone
15 required: true 15 required: true