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

+version: v1
+kind: Attribute
+metadata:
+  name: dividendsIncentivesAmount
+  description: 业绩激励分红金额
+  type: 
+    primitive: float64

+version: v1
+kind: Attribute
+metadata:
+  name: roleName
+  description: 角色名称
+  type: 
+    primitive: string

+version: v1
+kind: Attribute
+metadata:
+  name: userBaseId
+  description: 用户基本id
+  type: 
+    primitive: int64

+version: v1
+kind: Attribute
+metadata:
+  name: userAccount
+  description: 用户账号
+  type: 
+    primitive: string

@@ -17,6 +17,7 @@ metadata:
   - ref: cooperationMode
   - ref: cooperationMode
     required: true
     required: true
   - ref: organization
   - ref: organization
+    description: 数据关联组织机构
     required: true
     required: true
   - ref: updatedAt
   - ref: updatedAt
     required: true
     required: true

@@ -25,6 +25,7 @@ metadata:
   - ref: cooperationProjectNumber
   - ref: cooperationProjectNumber
     required: true
     required: true
   - ref: organization
   - ref: organization
+    description: 数据关联组织机构
     required: true
     required: true
   - ref: createdAt
   - ref: createdAt
     required: true
     required: true

@@ -25,6 +25,9 @@ metadata:
   - ref: status
   - ref: status
     description: 合约状态，1启用，2禁用
     description: 合约状态，1启用，2禁用
     required: true
     required: true
+  - ref: organization
+    description: 数据关联组织机构
+    required: true
   - ref: operator
   - ref: operator
     required: true
     required: true
   - ref: operateTime
   - ref: operateTime

@@ -15,6 +15,9 @@ metadata:
   - ref: status
   - ref: status
     description: 共创模式状态，1启用，2禁用
     description: 共创模式状态，1启用，2禁用
     required: true
     required: true
+  - ref: organization
+    description: 数据关联组织机构
+    required: true
   - ref: remarks
   - ref: remarks
     required: true
     required: true
   - ref: operator
   - ref: operator

@@ -21,6 +21,9 @@ metadata:
     required: true
     required: true
   - ref: cooperationProjectUndertakerType
   - ref: cooperationProjectUndertakerType
     required: true
     required: true
+  - ref: organization
+    description: 数据关联组织机构
+    required: true
   - ref: operator
   - ref: operator
     required: true
     required: true
   - ref: operateTime
   - ref: operateTime

@@ -2,7 +2,7 @@ version: v1
 kind: Schema
 kind: Schema
 metadata:
 metadata:
   name: creditAccount
   name: creditAccount
-  description: 账期结算实体
+  description: 账期结算单实体
   attributes:
   attributes:
   - ref: creditAccountId
   - ref: creditAccountId
     required: true
     required: true
@@ -29,6 +29,9 @@ metadata:
   - ref: paymentDocumentAttachment
   - ref: paymentDocumentAttachment
     description: 支付凭证附件 
     description: 支付凭证附件 
     required: true
     required: true
+  - ref: organization
+    description: 数据关联组织机构
+    required: true
   - ref: operator
   - ref: operator
     required: true
     required: true
   - ref: operateTime
   - ref: operateTime

@@ -25,6 +25,9 @@ metadata:
     required: true
     required: true
   - ref: dividendsUser
   - ref: dividendsUser
     required: true
     required: true
+  - ref: organization
+    description: 数据关联组织机构
+    required: true
   - ref: operator
   - ref: operator
     required: true
     required: true
   - ref: operateTime
   - ref: operateTime

+version: v1
+kind: Schema
+metadata:
+  name: dividendsIncentives
+  description: 业绩分红DTO
+  attributes:
+    - ref: cooperationContractNumber
+      required: true
+    - ref: orderOrReturnedOrderNum
+      required: true
+    - ref: originalOrderNum
+      required: true
+    - ref: customerName
+      required: true
+    - ref: region
+      required: true
+    - ref: dividendsIncentivesAmount
+      required: true
+    - ref: orderTime
+      description: 订单/退货单日期
+      required: true

@@ -21,6 +21,9 @@ metadata:
     required: true
     required: true
   - ref: dividendsIncentivesStageStart
   - ref: dividendsIncentivesStageStart
     required: true
     required: true
+  - ref: organization
+    description: 数据关联组织机构
+    required: true
   - ref: updatedAt
   - ref: updatedAt
     required: true
     required: true
   - ref: deletedAt
   - ref: deletedAt

@@ -25,6 +25,9 @@ metadata:
   - ref: customerName
   - ref: customerName
     description: 客户姓名
     description: 客户姓名
     required: true
     required: true
+  - ref: organization
+    description: 数据关联组织机构
+    required: true
   - ref: createdAt
   - ref: createdAt
     required: true
     required: true
   - ref: deletedAt
   - ref: deletedAt

@@ -33,6 +33,7 @@ metadata:
   - ref: dividendTime
   - ref: dividendTime
     required: true
     required: true
   - ref: organization
   - ref: organization
+    description: 数据关联组织机构
     required: true
     required: true
   - ref: createdAt
   - ref: createdAt
     required: true
     required: true

+version: v1
+kind: Schema
+metadata:
+  name: moneyIncentives
+  description: 金额激励分红DTO
+  attributes:
+    - ref: cooperationContractNumber
+      required: true
+    - ref: cooperationContractName
+      required: true
+    - ref: cooperationMode
+      required: true
+    - ref: cooperationContractSponsor
+      requried: true
+    - ref: createdAt
+      description: 共创合约建立时间
+      required: true

@@ -23,6 +23,9 @@ metadata:
     required: true
     required: true
   - ref: salesmanPercentage
   - ref: salesmanPercentage
     required: true
     required: true
+  - ref: organization
+    description: 数据关联组织机构
+    required: true
   - ref: updatedAt
   - ref: updatedAt
     required: true
     required: true
   - ref: deletedAt
   - ref: deletedAt

@@ -6,3 +6,5 @@ metadata:
   attributes:
   attributes:
   - ref: organizationId
   - ref: organizationId
     required: true
     required: true
+  - ref: companyId
+    requried: true

@@ -6,3 +6,5 @@ metadata:
   attributes:
   attributes:
   - ref: roleId
   - ref: roleId
     required: true
     required: true
+  - ref: roleName
+    required: true

@@ -6,7 +6,10 @@ metadata:
   attributes:
   attributes:
   - ref: userId
   - ref: userId
     required: true
     required: true
-  - ref: orgnization
+  - ref: usersBaseId
+    required: true
+  - ref: organization
+    description: 用户关联组织机构
     required: true
     required: true
   - ref: role
   - ref: role
     required: true
     required: true

@@ -6,7 +6,10 @@ metadata:
   attributes:
   attributes:
   - ref: userId
   - ref: userId
     required: true
     required: true
-  - ref: orgnization
+  - ref: usersBaseId
+    required: true
+  - ref: organization
+    description: 用户关联组织机构
     required: true
     required: true
   - ref: role
   - ref: role
     required: true
     required: true
@@ -17,4 +20,5 @@ metadata:
   - ref: status
   - ref: status
     required: true
     required: true
   - ref: company
   - ref: company
+    description: 用户关联公司信息
     required: true
     required: true

@@ -12,3 +12,5 @@ metadata:
     required: true
     required: true
   - ref: userPhone
   - ref: userPhone
     required: true
     required: true
+  - ref: userAcount
+    required: true

@@ -5,8 +5,12 @@ metadata:
   type: query
   type: query
   description: 返回业绩激励分红
   description: 返回业绩激励分红
   payload:
   payload:
+  - ref: offset
+    required: true
+  - ref: limit
+    required: true
   result:
   result:
-  - name: dividendsEstimate
+  - name: dividendsIncentives
     type: 
     type: 
-      schema: dividendsEstimate
+      schema: dividendsIncentives
     required: true
     required: true

@@ -5,8 +5,12 @@ metadata:
   type: query
   type: query
   description: 返回金额激励分红
   description: 返回金额激励分红
   payload:
   payload:
+  - ref: offset
+    required: true
+  - ref: limit
+    required: true
   result:
   result:
-  - name: dividendsEstimate
+  - name: moneyIncentives
     type: 
     type: 
-      schema: dividendsEstimate
+      schema: moneyIncentives
     required: true
     required: true

@@ -5,8 +5,14 @@ metadata:
   type: query
   type: query
   description: 查询业绩分红
   description: 查询业绩分红
   payload:
   payload:
+  - ref: cooperationContractNumber
+    description: 合约编号
+    required: false
+  - ref: orderOrReturnedOrderNum
+    description: 分红订单号/退货单号
+    required: false
   result:
   result:
-  - name: dividendsEstimate
-    type: 
-      schema: dividendsEstimate
+  - name: dividendsIncentives
+    type:
+      schema: dividendsIncentives
     required: true
     required: true

@@ -5,8 +5,14 @@ metadata:
   type: query
   type: query
   description: 查询金额激励分红
   description: 查询金额激励分红
   payload:
   payload:
+  - ref: cooperationContractName
+    description: 共创合约名称
+    required: false
+  - ref: departmentName
+    description: 发起部门名称
+    required: false
   result:
   result:
-  - name: dividendsEstimate
+  - name: moneyIncentives
     type: 
     type: 
-      schema: dividendsEstimate
+      schema: moneyIncentives
     required: true
     required: true