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

@@ -9,10 +9,10 @@ metadata:
         post: /
     - method: updateDictionary
       route:
-        put: /{Id}
+        put: /{dictionaryId}
     - method: getDictionary
       route:
-        get: /{Id}
+        get: /{dictionaryId}
     - method: listDictionary
       route:
         get: /

+version: v1
+kind: HttpApi
+metadata:
+  service: noticePersonal
+  path: /notice-personal
+  endpoints:
+    - method: getNoticePersonalList
+      route:
+        post: /
+    - method: agreeJoinCreationProject
+      route:
+        post: /agree-join-creation-project
+    - method: informExpectedDividends
+      route:
+        post: /inform-expected-dividends
+    - method: refuseJoinCreationProject
+      route:
+        post: /refuse-join-creation-project
+    - method: informJoinCreationContract
+      route:
+        post: /inform-join-creation-contract
+
+    - method: creditAccountEstimate
+      route:
+        post: /credit-account/dividends-estimate
+    - method: creditAccountPayment
+      route:
+        post: /notice-personal/credit-account/payment

 version: v1
 kind: Attribute
 metadata:
-  - name: noticePersonalId
+  name: noticePersonalId
   description: 编号id
   type:
     primitive: int64

+version: v1
+kind: Attribute
+metadata:
+  name: orgId
+  description: 组织id
+  type:
+    primitive: int64

+version: v1
+kind: Attribute
+metadata:
+  name: userBaseId
+  description: 账户id
+  type:
+    primitive: int64

+version: v1
+kind: Attribute
+metadata:
+  name: orgId
+  description: 组织id
+  type:
+    primitive: int64

@@ -20,12 +20,10 @@ metadata:
       description: 备注信息
       type:
         primitive: string
-    - name: canDelete
-      description: 是否可以删除【1：不可以】【2：可以】
+    - name: isShow
+      description: 是否可见【1：不可以】【2：可以】
       type:
         primitive: int
-    - name: canEdit
-      description: 是否可以编辑【1：不可以】【2：可以】
     - name: dictItems
       description: 字典值列表
       type:

@@ -24,9 +24,11 @@ metadata:
       required: true
     - ref: noticePersonalId
       required: true
-  - ref: organizationId
+    - ref: orgId
       required: true
     - ref: sysCode
       required: true
     - ref: userId
       required: true
+    - ref: userBaseId
+      required: true

 version: v1
 kind: Schema
 metadata:
-  name: noticSetting
+  name: noticeSetting
   description: 编排消息通知内容
   attributes:
     - ref: companyId
@@ -16,7 +16,7 @@ metadata:
       required: true
     - ref: noticeSettingId
       required: true
-  - ref: organizationId
+    - ref: orgId
       required: true
     - ref: sysCode
       required: true

+version: v1
+kind: Schema
+metadata:
+  name: noticeSettingModule
+  description: 编排消息模块列表
+  attributes:
+    - ref: module
+      required: true
+    - name: moduleAction
+      description: 模块环节
+      type:
+        array: string

+version: v1
+kind: Schema
+metadata:
+  name: noticeSettingParam
+  description: 编排消息需要的变量
+  attributes:
+    - name: paramCode
+      description: 变量的代码标识
+      type:
+        primitive: string
+    - name: paramName
+      description: 变量名称描述
+    - ref: moduleAction
+      required: true
+    - ref: module
+      required: true

@@ -5,8 +5,10 @@ metadata:
   type: query
   description: 返回数据字典设置
   payload:
-    - ref: dictCode
-      required: true
+    - name: dictCode
+      description: 字典编码
+      type:
+        primitive: string
   result:
     - name: dictionary
       type:

@@ -5,8 +5,10 @@ metadata:
   type: command
   description: 移除数据字典设置
   payload:
-  - ref: dictionaryId
-    required: true
+    - name: dictionaryId
+      description: 字典编号 主键
+      type:
+        primitive: int
   result:
     - name: dictionary
       type:

@@ -3,12 +3,24 @@ kind: Method
 metadata:
   name: agreeJoinCreationProject
   type: command
-  description: 消息：共创申请审核通过
+  description: 设置消息：共创申请审核通过
   payload:
     - name: userId
       description: 接收方用户id
       type:
         primitive: int64
+    - name: userBaseId
+      description: 接收方用户id
+      type:
+        primitive: int64
+    - name: orgId
+      description: 接收方用户组织id
+      type:
+        primitive: int64
+    - name: companyId
+      description: 接收方用户企业id
+      type:
+        primitive: int64
     - name: creationProjectId
       description: 共创项目id
       type:
@@ -22,5 +34,7 @@ metadata:
       type:
         primitive: string
   result:
-    - ref: noticePersonalId
-      required: true
+    - name: noticePersonal
+      description: 个人消息
+      type:
+        schema: noticePersonal

+version: v1
+kind: Method
+metadata:
+  name: creditAccountEstimate
+  type: command
+  description: 设置消息：共创申请审核通过
+  payload:
+    - name: userId
+      description: 接收方用户id
+      type:
+        primitive: int64
+    - name: userBaseId
+      description: 接收方用户id
+      type:
+        primitive: int64
+    - name: orgId
+      description: 接收方用户组织id
+      type:
+        primitive: int64
+    - name: companyId
+      description: 接收方用户企业id
+      type:
+        primitive: int64
+    - name: creditAccountOrderNum
+      description: 结算单号
+      type:
+        primitive: string
+    - name: settlementAmount
+      description: 结算金额
+      type:
+        primitive: string
+    - name: creditAccountId
+      description: 结算单id
+      type:
+        primitive: int64
+    - name: dividendsEstimateId
+      description: 预算单id
+      type:
+        primitive: int64
+    - name: dividendsEstimateOrderNumber
+      description: 预算单号
+      type:
+        primitive: string
+  result:
+    - name: noticePersonal
+      description: 个人消息
+      type:
+        schema: noticePersonal

+version: v1
+kind: Method
+metadata:
+  name: creditAccountPayment
+  type: command
+  description: 设置消息：共创申请审核通过
+  payload:
+    - name: userId
+      description: 接收方用户id
+      type:
+        primitive: int64
+    - name: userBaseId
+      description: 接收方用户id
+      type:
+        primitive: int64
+    - name: orgId
+      description: 接收方用户组织id
+      type:
+        primitive: int64
+    - name: companyId
+      description: 接收方用户企业id
+      type:
+        primitive: int64
+    - name: creditAccountOrderNum
+      description: 结算单号
+      type:
+        primitive: string
+    - name: settlementAmount
+      description: 结算金额
+      type:
+        primitive: string
+    - name: creditAccountId
+      description: 结算单id
+      type:
+        primitive: int64
+    - name: actuallyPaidAmount
+      description: 实际结算金额
+      type:
+        primitive: string
+  result:
+    - name: noticePersonal
+      description: 个人消息
+      type:
+        schema: noticePersonal

@@ -20,7 +20,7 @@ metadata:
     - name: isRead
       description: 是否是已读
       type:
-        primitive: int
+        primitive: int64
   result:
     - name: noticePersonal
       type:

@@ -3,10 +3,22 @@ kind: Method
 metadata:
   name: informExpectedDividends
   type: command
-  description: 消息：分红预算消息
+  description: 设置消息：分红预算消息
   payload:
     - name: userId
-      description: 用户id
+      description: 接收方用户id
+      type:
+        primitive: int64
+    - name: userBaseId
+      description: 接收方用户id
+      type:
+        primitive: int64
+    - name: orgId
+      description: 接收方用户组织id
+      type:
+        primitive: int64
+    - name: companyId
+      description: 接收方用户企业id
       type:
         primitive: int64
     - name: creationProjectId
@@ -34,5 +46,7 @@ metadata:
       type:
         primitive: string
   result:
-    - ref: noticePersonalId
-      required: true
+    - name: noticePersonal
+      description: 个人消息
+      type:
+        schema: noticePersonal

@@ -3,12 +3,24 @@ kind: Method
 metadata:
   name: informJoinCreationContract
   type: command
-  description: 消息：共创确认
+  description: 设置消息：共创确认
   payload:
     - name: userId
       description: 接收方用户id
       type:
         primitive: int64
+    - name: userBaseId
+      description: 接收方用户id
+      type:
+        primitive: int64
+    - name: orgId
+      description: 接收方用户组织id
+      type:
+        primitive: int64
+    - name: companyId
+      description: 接收方用户企业id
+      type:
+        primitive: int64
     - name: creationProjectId
       description: 共创项目id
       type:
@@ -30,5 +42,7 @@ metadata:
       type:
         primitive: string
   result:
-    - ref: noticePersonalId
-      required: true
+    - name: noticePersonal
+      description: 个人消息
+      type:
+        schema: noticePersonal

@@ -3,12 +3,24 @@ kind: Method
 metadata:
   name: refuseJoinCreationProject
   type: command
-  description: 消息：共创申请审核拒绝
+  description: 设置消息：共创申请审核拒绝
   payload:
     - name: userId
       description: 接收方用户id
       type:
         primitive: int64
+    - name: userBaseId
+      description: 接收方用户id
+      type:
+        primitive: int64
+    - name: orgId
+      description: 接收方用户组织id
+      type:
+        primitive: int64
+    - name: companyId
+      description: 接收方用户企业id
+      type:
+        primitive: int64
     - name: creationProjectId
       description: 共创项目id
       type:
@@ -22,5 +34,7 @@ metadata:
       type:
         primitive: string
   result:
-    - ref: noticePersonalId
-      required: true
+    - name: noticePersonal
+      description: 个人消息
+      type:
+        schema: noticePersonal

@@ -5,9 +5,9 @@ metadata:
   type: command
   description: 更新编排消息通知内容
   payload:
-    - name: dictionary
+    - name: noticeSetting
       type:
-        schema: dictionary
+        schema: noticeSetting
       required: true
   result:
     - name: noticeSetting

@@ -22,6 +22,9 @@ metadata:
   - method: searchCooperationProject
     route:
       post: /search
+  - method: checkUndertaker
+    route:
+      post: /check
   - method: listCooperationProject
     route:
       get: /

+version: v1
+kind: Attribute
+metadata:
+  name: rank
+  description: 排名
+  type: 
+    primitive: int32

+version: v1
+kind: Attribute
+metadata:
+  name: rankAmount
+  description: 排名金额
+  type: 
+    primitive: float64

+version: v1
+kind: Attribute
+metadata:
+  name: cooperationProject
+  description: 共创项目
+  type: 
+    schema: cooperationProject

+version: v1
+kind: Attribute
+metadata:
+  name: data
+  description: 柱状图数据二维数组
+  type: 
+    array: any

+version: v1
+kind: Attribute
+metadata:
+  name: dimension
+  description: 结算分布坐标值
+  type: 
+    array: any

+version: v1
+kind: Attribute
+metadata:
+  name: series
+  description: 结算分布坐标值
+  type: 
+    array: float64

+version: v1
+kind: Attribute
+metadata:
+  name: xAxis
+  description: 结算分布X轴标签
+  type: 
+    array: string

@@ -4,4 +4,4 @@ metadata:
   name: annualDividendsExpense
   description: 分红支出-年度分红支出
   type: 
-    primitive: float64
+    schema: annualDividendsExpense

 version: v1
 kind: Attribute
 metadata:
-  name: dividendsExpenseDetails
+  name: dividendsExpenseDetail
   description: 企业分红支出明细
   type: 
-    schema: dividendsExpenseDetails
+    schema: dividendsExpenseDetail

@@ -4,4 +4,4 @@ metadata:
   name: quarterDividendsExpense
   description: 分红支出-季度分红支出
   type: 
-    primitive: float64
+    schema: quarterDividendsExpense

@@ -4,4 +4,4 @@ metadata:
   name: totalDividendsExpense
   description: 合约分红-全部分红支出
   type: 
-    primitive: float64
+    schema: totalDividendsExpense

+version: v1
+kind: Attribute
+metadata:
+  name: totalExpense
+  description: 总支出
+  type: 
+    primitive: float64

+version: v1
+kind: Attribute
+metadata:
+  name: code
+  description: 菜单编码
+  type: 
+    primitive: string

+version: v1
+kind: Schema
+metadata:
+  name: annualDividendsExpense
+  description: 企业年度分红总支出
+  attributes:
+  - ref: totalExpense
+    required: true
+  - ref: dividendsExpenseDetail
+    required: true

@@ -22,7 +22,8 @@ metadata:
     required: true
   - ref: cooperationApplyTime
     required: true
-  - ref: cooperationProjectNumber
+  - ref: cooperationProject
+    description: 共创项目编号
     required: true
   - ref: org
     description: 数据所属组织机构

@@ -11,6 +11,7 @@ metadata:
   - ref: cooperationContractName
     required: true
   - ref: cooperationContractNumber
+    description: 共创合约编号
     required: true
   - ref: cooperationContractReferrer
     required: true
@@ -21,6 +22,7 @@ metadata:
   - ref: cooperationContractSponsor
     required: true
   - ref: cooperationMode
+    description: 共创模式或者合伙模式
     required: true
   - ref: status
     description: 合约状态，1启用，2禁用

@@ -7,7 +7,7 @@ metadata:
   - ref: cooperationModeId
     required: true
   - ref: cooperationModeNumber
-    description: 模式编码，唯一确定
+    description: 共创模式编码，唯一确定
     required: true
   - ref: cooperationModeName
     description: 模式名称，唯一确定

+version: v1
+kind: Schema
+metadata:
+  name: creditAccountDistribution
+  description: 账期结算分布（柱状图）
+  attributes:
+  - ref: series
+    required: true
+  - ref: xAxis
+    required: true

+version: v1
+kind: Schema
+metadata:
+  name: creditAccountRanking
+  description: 账期结算单排名
+  attributes:
+  - ref: rank
+    required: true
+  - ref: rankAmount
+    required: true
+  - ref: userName
+    required: true

 version: v1
 kind: Schema
 metadata:
-  name: dividendsExpenseDetails
+  name: dividendsExpenseDetail
   description: 企业分红支出明细
   attributes:
   - ref: toBeAccounted

+version: v1
+kind: Schema
+metadata:
+  name: dividendsExpenseStatistics
+  description: 企业分红支出统计
+  attributes:
+  - ref: annualDividendsExpense
+    required: true
+  - ref: quarterDividendsExpense
+    required: true
+  - ref: totalDividendsExpense
+    required: true

+version: v1
+kind: Schema
+metadata:
+  name: quarterDividendsExpense
+  description: 企业季度分红支出
+  attributes:
+  - ref: totalExpense
+    required: true
+  - ref: dividendsExpenseDetail
+    required: true

+version: v1
+kind: Schema
+metadata:
+  name: totalDividendsExpense
+  description: 企业分红总支出
+  attributes:
+  - ref: totalExpense
+    required: true
+  - ref: dividendsExpenseDetail
+    required: true

@@ -17,6 +17,8 @@ metadata:
       primitive: string
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -13,6 +13,8 @@ metadata:
       primitive: string
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -16,6 +16,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -13,6 +13,8 @@ metadata:
       primitive: string
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -17,6 +17,8 @@ metadata:
       primitive: string
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   - name: matchWord
@@ -29,3 +31,5 @@ metadata:
     type: 
       array: contractUndertakerFeedback
     required: true
+  - ref: count
+    required: true

@@ -17,6 +17,8 @@ metadata:
       primitive: string
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -3,7 +3,7 @@ kind: Method
 metadata:
   name: agreeCooperationApplication
   type: command
-  description: 同意共创申请
+  description: 审核-同意共创申请
   payload:
   - ref: cooperationApplicationId
     required: true
@@ -11,6 +11,12 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    description: 组织机构id
+    required: true
+  - ref: code 
+    description: 菜单编码，APP端必须
+    required: true
   - ref: userId
     required: true
   result:

@@ -19,6 +19,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -19,6 +19,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -3,7 +3,7 @@ kind: Method
 metadata:
   name: rejectCooperationApplication
   type: command
-  description: 拒绝共创申请
+  description: 审核-拒绝共创申请
   payload:
   - ref: cooperationApplicationId
     required: true
@@ -11,6 +11,12 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    description: 组织机构id
+    required: true
+  - ref: code
+    description: 菜单模块编码，APP端必须
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -20,6 +20,8 @@ metadata:
     required: false
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:
@@ -27,3 +29,5 @@ metadata:
     type: 
       array: cooperationApplication
     required: true
+  - ref: count
+    required: true

@@ -19,6 +19,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -42,6 +42,8 @@ metadata:
       array: relevant
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -13,6 +13,8 @@ metadata:
       primitive: string
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -17,6 +17,8 @@ metadata:
       primitive: string
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -14,6 +14,8 @@ metadata:
     required: false
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:
@@ -21,3 +23,5 @@ metadata:
     description: 根据承接人返回的共创项目合约
     type:
       array: cooperationContractByUndertaker
+  - ref: count
+    required: true

@@ -25,6 +25,8 @@ metadata:
       primitive: string
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -17,6 +17,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -15,6 +15,8 @@ metadata:
     required: false
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:
@@ -22,3 +24,5 @@ metadata:
     type: 
       array: cooperationContractChangeLog
     required: true
+  - ref: count
+    required: true

@@ -17,6 +17,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -27,3 +27,4 @@ metadata:
     type: 
       schema: cooperationGoodsStatistics
     required: true
+

@@ -13,6 +13,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -17,6 +17,8 @@ metadata:
       primitive: string
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:
@@ -24,3 +26,5 @@ metadata:
     type: 
       array: cooperationMode
     required: true
+  - ref: count
+    required: true

@@ -13,6 +13,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -18,3 +18,4 @@ metadata:
     type: 
       schema: cooperationModeStatistics
     required: true
+

@@ -18,3 +18,4 @@ metadata:
     type: 
       schema: cooperationPersonStatistics
     required: true
+

+version: v1
+kind: Method
+metadata:
+  name: checkUndertaker
+  type: query
+  description: 判断当前勾选的承接对象是否存在用户
+  payload:
+  - ref: cooperationProjectUndertakerType
+    required: true
+  - ref: cooperationProjectId
+    required: true
+  result:
+  - name: cooperationProject
+    type: 
+      schema: cooperationProject
+    required: true

@@ -24,6 +24,8 @@ metadata:
     required: false
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -17,6 +17,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -18,6 +18,8 @@ metadata:
     required: false
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:
@@ -25,3 +27,5 @@ metadata:
     type: 
       array: cooperationProject
     required: true
+  - ref: count
+    required: true

@@ -24,6 +24,8 @@ metadata:
     required: false
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -7,6 +7,8 @@ metadata:
   payload:
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

+version: v1
+kind: Method
+metadata:
+  name: creditAccountRanking
+  type: query
+  description: 账期结算单排名
+  payload:
+  - ref: companyId
+    required: true
+  - ref: orgId
+    required: true
+  - ref: userId
+    required: true
+  - name: period
+    description: 统计周期
+    type: 
+      primitive: string
+  result:
+  - name: creditAccountRanking
+    type: 
+      schema: creditAccountRanking
+    required: true

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -3,7 +3,7 @@ kind: Method
 metadata:
   name: payCreditAccount
   type: command
-  description: 支付账期结算
+  description: 支付账期结算（支付分红）
   payload:
   - ref: actuallyPaidAmount
     required: true
@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -13,8 +13,13 @@ metadata:
       primitive: string
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
+  - ref: paymentStatus
+    description: 账期结算支付状态，1待支付，2已支付，APP端结算记录返回已结算的账期结算单
+    required: true
   - name: period
     description: 结算周期，按年“2021”或者按月结算”2021-07“
     type:
@@ -25,8 +30,10 @@ metadata:
     type: 
       array: creditAccount
     required: true
+  - ref: count
+    required: true
   - name: sum
-    description: 本月结算或本年度结算
+    description: 本月结算或本年度结算总和
     type:
       primitive: float64
     required: true

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -18,3 +18,4 @@ metadata:
     type: 
       schema: currentMonthDividendsStatistics
     required: true
+    

@@ -7,6 +7,8 @@ metadata:
   payload:
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -7,6 +7,8 @@ metadata:
   payload:
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -13,6 +13,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -18,6 +18,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,12 +11,14 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:
-  - ref: count
-    required: true 
   - name: dividendsEstimates
     type: 
       array: dividendsEstimate
     required: true
+  - ref: count
+    required: true 

@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:
@@ -18,3 +20,5 @@ metadata:
     type: 
       schema: dividendsIncentives
     required: true
+  - ref: count
+    required: true

@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:
@@ -18,3 +20,5 @@ metadata:
     type: 
       schema: moneyIncentives
     required: true
+  - ref: count
+    required: true

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:
@@ -18,3 +20,5 @@ metadata:
     type: 
       schema: dividendsEstimate
     required: true
+  - ref: count
+    required: true 

@@ -13,6 +13,8 @@ metadata:
     required: false
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:
@@ -20,3 +22,5 @@ metadata:
     type:
       schema: dividendsIncentives
     required: true
+  - ref: count
+    required: true 

@@ -13,6 +13,8 @@ metadata:
     required: false
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:
@@ -20,3 +22,5 @@ metadata:
     type: 
       array: moneyIncentives
     required: true
+  - ref: count
+    required: true

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

+version: v1
+kind: Method
+metadata:
+  name: searchDividendsExpenseStatistics
+  type: query
+  description: 返回企业分红支出统计
+  payload:
+  - ref: companyId
+    required: true
+  - ref: orgId
+    required: true
+  - ref: userId
+    required: true
+  result:
+  - name: dividendsExpenseStatistics
+    type: 
+      schema: dividendsExpenseStatistics
+    required: true

+version: v1
+kind: Service
+metadata:
+  name: dividendsExpenseStatistics
+  description: 企业分红支出统计服务

@@ -21,6 +21,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,12 +11,14 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:
-  - ref: count
-    required: true 
   - name: dividendsIncentivesRules
     type: 
       array: dividendsIncentivesRule
     required: true
+  - ref: count
+    required: true 

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -21,6 +21,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -31,6 +31,8 @@ metadata:
       array: orderGoods
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,12 +11,14 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:
-  - ref: count
-    required: true 
   - name: dividendsOrders
     type: 
       array: dividendsOrder
     required: true
+  - ref: count
+    required: true

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -15,6 +15,8 @@ metadata:
     required: false
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:
@@ -22,3 +24,5 @@ metadata:
     type: 
       array: dividendsOrder
     required: true
+  - ref: count
+    required: true 

@@ -27,6 +27,8 @@ metadata:
       primitive: string
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -25,6 +25,8 @@ metadata:
       array: orderGoods
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -15,6 +15,8 @@ metadata:
       primitive: string
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,12 +11,14 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result: 
-  - ref: count
-    required: true 
   - name: dividendsReturnedOrders
     type: 
       array: dividendsReturnedOrder
     required: true
+  - ref: count
+    required: true

@@ -7,6 +7,8 @@ metadata:
   payload:
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -17,6 +17,8 @@ metadata:
     required: false
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:
@@ -24,3 +26,5 @@ metadata:
     type: 
       array: dividendsReturnedOrder
     required: true
+  - ref: count
+    required: true

@@ -25,6 +25,8 @@ metadata:
       array: orderGoods
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -17,6 +17,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,12 +11,14 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result: 
-  - ref: count
-    required: true 
   - name: moneyIncentivesRules
     type: 
       array: moneyIncentivesRule
     required: true
+  - ref: count
+    required: true

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -17,6 +17,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result: