作者 陈志颖

feat:调整业务关联组织信息

正在显示 26 个修改的文件 包含 138 行增加12 行删除
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: dividendsIncentivesAmount
  5 + description: 业绩激励分红金额
  6 + type:
  7 + primitive: float64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: roleName
  5 + description: 角色名称
  6 + type:
  7 + primitive: string
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: userBaseId
  5 + description: 用户基本id
  6 + type:
  7 + primitive: int64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: userAccount
  5 + description: 用户账号
  6 + type:
  7 + primitive: string
@@ -17,6 +17,7 @@ metadata: @@ -17,6 +17,7 @@ metadata:
17 - ref: cooperationMode 17 - ref: cooperationMode
18 required: true 18 required: true
19 - ref: organization 19 - ref: organization
  20 + description: 数据关联组织机构
20 required: true 21 required: true
21 - ref: updatedAt 22 - ref: updatedAt
22 required: true 23 required: true
@@ -25,6 +25,7 @@ metadata: @@ -25,6 +25,7 @@ metadata:
25 - ref: cooperationProjectNumber 25 - ref: cooperationProjectNumber
26 required: true 26 required: true
27 - ref: organization 27 - ref: organization
  28 + description: 数据关联组织机构
28 required: true 29 required: true
29 - ref: createdAt 30 - ref: createdAt
30 required: true 31 required: true
@@ -25,6 +25,9 @@ metadata: @@ -25,6 +25,9 @@ metadata:
25 - ref: status 25 - ref: status
26 description: 合约状态,1启用,2禁用 26 description: 合约状态,1启用,2禁用
27 required: true 27 required: true
  28 + - ref: organization
  29 + description: 数据关联组织机构
  30 + required: true
28 - ref: operator 31 - ref: operator
29 required: true 32 required: true
30 - ref: operateTime 33 - ref: operateTime
@@ -15,6 +15,9 @@ metadata: @@ -15,6 +15,9 @@ metadata:
15 - ref: status 15 - ref: status
16 description: 共创模式状态,1启用,2禁用 16 description: 共创模式状态,1启用,2禁用
17 required: true 17 required: true
  18 + - ref: organization
  19 + description: 数据关联组织机构
  20 + required: true
18 - ref: remarks 21 - ref: remarks
19 required: true 22 required: true
20 - ref: operator 23 - ref: operator
@@ -21,6 +21,9 @@ metadata: @@ -21,6 +21,9 @@ metadata:
21 required: true 21 required: true
22 - ref: cooperationProjectUndertakerType 22 - ref: cooperationProjectUndertakerType
23 required: true 23 required: true
  24 + - ref: organization
  25 + description: 数据关联组织机构
  26 + required: true
24 - ref: operator 27 - ref: operator
25 required: true 28 required: true
26 - ref: operateTime 29 - ref: operateTime
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 name: creditAccount 4 name: creditAccount
5 - description: 账期结算实体 5 + description: 账期结算实体
6 attributes: 6 attributes:
7 - ref: creditAccountId 7 - ref: creditAccountId
8 required: true 8 required: true
@@ -29,6 +29,9 @@ metadata: @@ -29,6 +29,9 @@ metadata:
29 - ref: paymentDocumentAttachment 29 - ref: paymentDocumentAttachment
30 description: 支付凭证附件 30 description: 支付凭证附件
31 required: true 31 required: true
  32 + - ref: organization
  33 + description: 数据关联组织机构
  34 + required: true
32 - ref: operator 35 - ref: operator
33 required: true 36 required: true
34 - ref: operateTime 37 - ref: operateTime
@@ -25,6 +25,9 @@ metadata: @@ -25,6 +25,9 @@ metadata:
25 required: true 25 required: true
26 - ref: dividendsUser 26 - ref: dividendsUser
27 required: true 27 required: true
  28 + - ref: organization
  29 + description: 数据关联组织机构
  30 + required: true
28 - ref: operator 31 - ref: operator
29 required: true 32 required: true
30 - ref: operateTime 33 - ref: operateTime
  1 +version: v1
  2 +kind: Schema
  3 +metadata:
  4 + name: dividendsIncentives
  5 + description: 业绩分红DTO
  6 + attributes:
  7 + - ref: cooperationContractNumber
  8 + required: true
  9 + - ref: orderOrReturnedOrderNum
  10 + required: true
  11 + - ref: originalOrderNum
  12 + required: true
  13 + - ref: customerName
  14 + required: true
  15 + - ref: region
  16 + required: true
  17 + - ref: dividendsIncentivesAmount
  18 + required: true
  19 + - ref: orderTime
  20 + description: 订单/退货单日期
  21 + required: true
@@ -21,6 +21,9 @@ metadata: @@ -21,6 +21,9 @@ metadata:
21 required: true 21 required: true
22 - ref: dividendsIncentivesStageStart 22 - ref: dividendsIncentivesStageStart
23 required: true 23 required: true
  24 + - ref: organization
  25 + description: 数据关联组织机构
  26 + required: true
24 - ref: updatedAt 27 - ref: updatedAt
25 required: true 28 required: true
26 - ref: deletedAt 29 - ref: deletedAt
@@ -25,6 +25,9 @@ metadata: @@ -25,6 +25,9 @@ metadata:
25 - ref: customerName 25 - ref: customerName
26 description: 客户姓名 26 description: 客户姓名
27 required: true 27 required: true
  28 + - ref: organization
  29 + description: 数据关联组织机构
  30 + required: true
28 - ref: createdAt 31 - ref: createdAt
29 required: true 32 required: true
30 - ref: deletedAt 33 - ref: deletedAt
@@ -33,6 +33,7 @@ metadata: @@ -33,6 +33,7 @@ metadata:
33 - ref: dividendTime 33 - ref: dividendTime
34 required: true 34 required: true
35 - ref: organization 35 - ref: organization
  36 + description: 数据关联组织机构
36 required: true 37 required: true
37 - ref: createdAt 38 - ref: createdAt
38 required: true 39 required: true
  1 +version: v1
  2 +kind: Schema
  3 +metadata:
  4 + name: moneyIncentives
  5 + description: 金额激励分红DTO
  6 + attributes:
  7 + - ref: cooperationContractNumber
  8 + required: true
  9 + - ref: cooperationContractName
  10 + required: true
  11 + - ref: cooperationMode
  12 + required: true
  13 + - ref: cooperationContractSponsor
  14 + requried: true
  15 + - ref: createdAt
  16 + description: 共创合约建立时间
  17 + required: true
@@ -23,6 +23,9 @@ metadata: @@ -23,6 +23,9 @@ metadata:
23 required: true 23 required: true
24 - ref: salesmanPercentage 24 - ref: salesmanPercentage
25 required: true 25 required: true
  26 + - ref: organization
  27 + description: 数据关联组织机构
  28 + required: true
26 - ref: updatedAt 29 - ref: updatedAt
27 required: true 30 required: true
28 - ref: deletedAt 31 - ref: deletedAt
@@ -6,3 +6,5 @@ metadata: @@ -6,3 +6,5 @@ metadata:
6 attributes: 6 attributes:
7 - ref: organizationId 7 - ref: organizationId
8 required: true 8 required: true
  9 + - ref: companyId
  10 + requried: true
@@ -6,3 +6,5 @@ metadata: @@ -6,3 +6,5 @@ metadata:
6 attributes: 6 attributes:
7 - ref: roleId 7 - ref: roleId
8 required: true 8 required: true
  9 + - ref: roleName
  10 + required: true
@@ -6,7 +6,10 @@ metadata: @@ -6,7 +6,10 @@ metadata:
6 attributes: 6 attributes:
7 - ref: userId 7 - ref: userId
8 required: true 8 required: true
9 - - ref: orgnization 9 + - ref: usersBaseId
  10 + required: true
  11 + - ref: organization
  12 + description: 用户关联组织机构
10 required: true 13 required: true
11 - ref: role 14 - ref: role
12 required: true 15 required: true
@@ -6,7 +6,10 @@ metadata: @@ -6,7 +6,10 @@ metadata:
6 attributes: 6 attributes:
7 - ref: userId 7 - ref: userId
8 required: true 8 required: true
9 - - ref: orgnization 9 + - ref: usersBaseId
  10 + required: true
  11 + - ref: organization
  12 + description: 用户关联组织机构
10 required: true 13 required: true
11 - ref: role 14 - ref: role
12 required: true 15 required: true
@@ -17,4 +20,5 @@ metadata: @@ -17,4 +20,5 @@ metadata:
17 - ref: status 20 - ref: status
18 required: true 21 required: true
19 - ref: company 22 - ref: company
  23 + description: 用户关联公司信息
20 required: true 24 required: true
@@ -12,3 +12,5 @@ metadata: @@ -12,3 +12,5 @@ metadata:
12 required: true 12 required: true
13 - ref: userPhone 13 - ref: userPhone
14 required: true 14 required: true
  15 + - ref: userAcount
  16 + required: true
@@ -5,8 +5,12 @@ metadata: @@ -5,8 +5,12 @@ metadata:
5 type: query 5 type: query
6 description: 返回业绩激励分红 6 description: 返回业绩激励分红
7 payload: 7 payload:
  8 + - ref: offset
  9 + required: true
  10 + - ref: limit
  11 + required: true
8 result: 12 result:
9 - - name: dividendsEstimate 13 + - name: dividendsIncentives
10 type: 14 type:
11 - schema: dividendsEstimate 15 + schema: dividendsIncentives
12 required: true 16 required: true
@@ -5,8 +5,12 @@ metadata: @@ -5,8 +5,12 @@ metadata:
5 type: query 5 type: query
6 description: 返回金额激励分红 6 description: 返回金额激励分红
7 payload: 7 payload:
  8 + - ref: offset
  9 + required: true
  10 + - ref: limit
  11 + required: true
8 result: 12 result:
9 - - name: dividendsEstimate 13 + - name: moneyIncentives
10 type: 14 type:
11 - schema: dividendsEstimate 15 + schema: moneyIncentives
12 required: true 16 required: true
@@ -5,8 +5,14 @@ metadata: @@ -5,8 +5,14 @@ metadata:
5 type: query 5 type: query
6 description: 查询业绩分红 6 description: 查询业绩分红
7 payload: 7 payload:
  8 + - ref: cooperationContractNumber
  9 + description: 合约编号
  10 + required: false
  11 + - ref: orderOrReturnedOrderNum
  12 + description: 分红订单号/退货单号
  13 + required: false
8 result: 14 result:
9 - - name: dividendsEstimate  
10 - type:  
11 - schema: dividendsEstimate 15 + - name: dividendsIncentives
  16 + type:
  17 + schema: dividendsIncentives
12 required: true 18 required: true
@@ -5,8 +5,14 @@ metadata: @@ -5,8 +5,14 @@ metadata:
5 type: query 5 type: query
6 description: 查询金额激励分红 6 description: 查询金额激励分红
7 payload: 7 payload:
  8 + - ref: cooperationContractName
  9 + description: 共创合约名称
  10 + required: false
  11 + - ref: departmentName
  12 + description: 发起部门名称
  13 + required: false
8 result: 14 result:
9 - - name: dividendsEstimate 15 + - name: moneyIncentives
10 type: 16 type:
11 - schema: dividendsEstimate 17 + schema: moneyIncentives
12 required: true 18 required: true