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

@@ -19,6 +19,9 @@ metadata:
   - method: searchCooperationContract
     route:
       post: /search
+  - method: searchCooperationContractByUndertaker
+    route:
+      post: /search-by-undertaker
   - method: listCooperationContract
     route:
       get: /

+version: v1
+kind: HttpApi
+metadata:
+  service: creditAccount
+  path: /credit-accounts
+  endpoints: 
+  - method: createCreditAccount
+    route:
+      post: /  
+  - method: updateCreditAccount
+    route:
+      put: /{creditAccountId}
+  - method: getCreditAccount
+    route:
+      get: /{creditAccountId}
+  - method: removeCreditAccount
+    route:
+      delete: /{creditAccountId}
+  - method: searchCreditAccount
+    route:
+      post: /search
+  - method: payCreditAccount
+    route:
+      post: /pay
+  - method: listCreditAccount
+    route:
+      get: /
+    params:
+      - name: offset
+      - name: limit

+version: v1
+kind: HttpApi
+metadata:
+  service: dividendsEstimate
+  path: /dividends-estimates
+  endpoints: 
+  - method: createDividendsEstimate
+    route:
+      post: /  
+  - method: updateDividendsEstimate
+    route:
+      put: /{dividendsEstimateId}
+  - method: getDividendsEstimate
+    route:
+      get: /{dividendsEstimateId}
+  - method: removeDividendsEstimate
+    route:
+      delete: /{dividendsEstimateId}
+  - method: cancelDividendsEstimate
+    route:
+      post: /{dividendsEstimateId}/cancel
+  - method: searchDividendsEstimate
+    route:
+      post: /search
+  - method: estimateDividendsIncentives
+    route:
+      post: /estimate-dividends-incentives
+  - method: estimateMoneyIncentives
+    route:
+      post: /estimate-money-incentives
+  - method: listMoneyIncentives
+    route:
+      get: /list-money-incentives
+  - method: searchMoneyIncentives
+    route:
+      post: /search-money-incentives
+  - method: listDividendsIncentives
+    route:
+      get: /list-dividends-incentives
+  - method: searchDividendsIncentives
+    route:
+      post: /search-dividends-incentives
+  - method: listDividendsEstimate
+    route:
+      get: /
+    params:
+      - name: offset
+      - name: limit

@@ -4,4 +4,4 @@ metadata:
   name: cooperationContractUndertakers
   description: 共创合约承接人列表
   type: 
-    array: user
+    array: undertaker

+version: v1
+kind: Attribute
+metadata:
+  name: actuallyPaidAmount
+  description: 账期结算实付金额
+  type: 
+    primitive: float64

@@ -2,6 +2,6 @@ version: v1
 kind: Attribute
 metadata:
   name: creditAccountId
-  description: 账期结算记录ID
+  description: 账期结算单ID
   type: 
     primitive: int64

+version: v1
+kind: Attribute
+metadata:
+  name: creditAccountOrderNum
+  description: 账期结算单号
+  type: 
+    primitive: string

+version: v1
+kind: Attribute
+metadata:
+  name: paymentDocumentAttachment
+  description: 支付凭证附件
+  type: 
+    schema: attachment

+version: v1
+kind: Attribute
+metadata:
+  name: paymentStatus
+  description: 共创账期结算支付状态，1待支付，2已支付
+  type: 
+    primitive: int32

+version: v1
+kind: Attribute
+metadata:
+  name: paymentTime
+  description: 共创账期结算支付时间
+  type: 
+    primitive: datetime

+version: v1
+kind: Attribute
+metadata:
+  name: settlementAmount
+  description: 账期结算金额
+  type: 
+    primitive: float64

+version: v1
+kind: Attribute
+metadata:
+  name: settlementTime
+  description: 共创账期结算时间
+  type: 
+    primitive: datetime

+version: v1
+kind: Attribute
+metadata:
+  name: dividendsAccountStatus
+  description: 分红结算状态，1待结算，2已结算
+  type: 
+    primitive: int32

+version: v1
+kind: Attribute
+metadata:
+  name: dividendsAmount
+  description: 分红金额
+  type: 
+    primitive: float64

@@ -2,6 +2,6 @@ version: v1
 kind: Attribute
 metadata:
   name: dividendsEstimateId
-  description: 分红预算记录ID
+  description: 承接人分红预算记录ID
   type: 
     primitive: int64

+version: v1
+kind: Attribute
+metadata:
+  name: dividendsEstimateOrderNumber
+  description: 承接人分红预算单号
+  type: 
+    primitive: string

+version: v1
+kind: Attribute
+metadata:
+  name: dividendsEstimateTime
+  description: 分红预算时间
+  type: 
+    primitive: datetime

+version: v1
+kind: Attribute
+metadata:
+  name: dividendsParticipateType
+  description: 参与分红类型，1承接人，2推荐人，3关联业务员
+  type: 
+    primitive: int32

+version: v1
+kind: Attribute
+metadata:
+  name: dividendsType
+  description: 分红类型，1订单分红，2退货冲销，3金额激励
+  type: 
+    primitive: int32

+version: v1
+kind: Attribute
+metadata:
+  name: dividendsUser
+  description: 分红用户
+  type: 
+    schema: user

+version: v1
+kind: Attribute
+metadata:
+  name: orderOrReturnedOrderNum
+  description: 分红订单号或退货单号
+  type: 
+    primitive: string

+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
     required: true
   - ref: organization
+    description: 数据关联组织机构
     required: true
   - ref: updatedAt
     required: true

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

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

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

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

+version: v1
+kind: Schema
+metadata:
+  name: creditAccount
+  description: 账期结算单实体
+  attributes:
+  - ref: creditAccountId
+    required: true
+  - ref: actuallyPaidAmount
+    required: true
+  - ref: creditAccountOrderNum
+    required: true
+  - ref: paymentStatus
+    description: 账期结算支付状态，1待支付，2已支付
+    required: true
+  - ref: paymentTime
+    required: true
+  - ref: settlementAmount
+    required: true
+  - ref: settlementTime
+    required: true
+  - ref: cooperationContractNumber
+    required: true
+  - name: participator
+    description: 参与人uid，包括承接人、推荐人、关联业务员
+    required: true
+    type:
+      array: int64
+  - ref: paymentDocumentAttachment
+    description: 支付凭证附件 
+    required: true
+  - ref: organization
+    description: 数据关联组织机构
+    required: true
+  - ref: operator
+    required: true
+  - ref: operateTime
+    required: true
+  - ref: createdAt
+    required: true
+  - ref: deletedAt
+    required: true
+  - ref: updatedAt
+    required: true

+version: v1
+kind: Schema
+metadata:
+  name: dividendsEstimate
+  description: 分红预算实体
+  attributes:
+  - ref: dividendsEstimateId
+    required: true
+  - ref: dividendsAccountStatus
+    description: 分红结算状态
+    required: true
+  - ref: dividendsAmount
+    required: true
+  - ref: dividendsEstimateOrderNumber
+    required: true
+  - ref: dividendsEstimateTime
+    required: true
+  - ref: dividendsParticipateType
+    required: true
+  - ref: dividendsType
+    required: true
+  - ref: orderOrReturnedOrderNum
+    required: true
+  - ref: cooperationProjectNumber
+    required: true
+  - ref: dividendsUser
+    required: true
+  - ref: organization
+    description: 数据关联组织机构
+    required: true
+  - ref: operator
+    required: true
+  - ref: operateTime
+    required: true
+  - ref: createdAt
+    required: true
+  - ref: deletedAt
+    required: true
+  - ref: updatedAt
+    required: true

+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
   - ref: dividendsIncentivesStageStart
     required: true
+  - ref: organization
+    description: 数据关联组织机构
+    required: true
   - ref: updatedAt
     required: true
   - ref: deletedAt

@@ -2,7 +2,7 @@ version: v1
 kind: Schema
 metadata:
   name: dividendsIncentivesRule
-  description: 金额激励规则实体
+  description: 金额激励规则DTO
   attributes:
   - ref: referrerPercentage
     required: true

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

@@ -33,6 +33,7 @@ metadata:
   - ref: dividendTime
     required: true
   - ref: organization
+    description: 数据关联组织机构
     required: true
   - ref: createdAt
     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
   - ref: salesmanPercentage
     required: true
+  - ref: organization
+    description: 数据关联组织机构
+    required: true
   - ref: updatedAt
     required: true
   - ref: deletedAt

@@ -2,7 +2,7 @@ version: v1
 kind: Schema
 metadata:
   name: moneyIncentivesRule
-  description: 金额激励规则实体
+  description: 金额激励规则DTO
   attributes:
   - ref: moneyIncentivesAmount
     required: true

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

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

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

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

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

+version: v1
+kind: Method
+metadata:
+  name: searchCooperationContractByUndertaker
+  type: query
+  description: 根据承接人返回共创项目合约
+  payload:
+  - ref: cooperationContractName
+    requird: false
+  - name: sponsorName
+    description: 项目发起人姓名
+    type:
+      primitive: string
+    required: false
+  result:
+  - ref: cooperationContractDescription
+    required: true
+  - ref: cooperationContractId
+    required: true
+  - ref: contractUndertaker
+    required: true
+  - ref: cooperationContractNumber
+    required: true
+  - ref: cooperationContractName
+    required: true
+  - ref: cooperationMode
+    required: true
+  - ref: cooperationContractSponsor
+    required: true
+  - ref: status
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: createCreditAccount
+  type: command
+  description: 创建账期结算单服务
+  result:
+  - name: creditAccount
+    type: 
+      schema: creditAccount
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: getCreditAccount
+  type: query
+  description: 返回账期结算单服务
+  payload:
+  - ref: creditAccountId
+    required: true
+  result:
+  - name: creditAccount
+    type: 
+      schema: creditAccount
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: listCreditAccount
+  type: query
+  description: 返回账期结算单服务列表
+  payload:
+  - ref: offset
+    required: true
+  - ref: limit
+    required: true
+  result:
+  - ref: count
+    required: true 
+  - name: creditAccounts
+    type: 
+      array: creditAccount
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: payCreditAccount
+  type: command
+  description: 支付账期结算
+  payload:
+  - ref: actuallyPaidAmount
+    required: true
+  - ref: remarks
+    required: true
+  result:
+  - name: creditAccount
+    type: 
+      schema: creditAccount
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: removeCreditAccount
+  type: command
+  description: 移除账期结算单服务
+  payload:
+  - ref: creditAccountId
+    required: true
+  result:
+  - name: creditAccount
+    type: 
+      schema: creditAccount
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: searchCreditAccount
+  type: query
+  description: 查询账期结算单
+  payload:
+  - ref: creditAccountOrderNum
+    required: true
+  - name: participartorName
+    description: 参与人姓名
+    type: 
+      primitive: string
+  result:
+  - name: creditAccount
+    type: 
+      schema: creditAccount
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: updateCreditAccount
+  type: command
+  description: 更新账期结算单服务
+  payload:
+  - ref: creditAccountId
+    required: true
+  result:
+  - name: creditAccount
+    type: 
+      schema: creditAccount
+    required: true

+version: v1
+kind: Service
+metadata:
+  name: creditAccount
+  description: 账期结算单服务

+version: v1
+kind: Method
+metadata:
+  name: cancelDividendsEstimate
+  type: command
+  description: 取消分红预算
+  result:
+  - name: dividendsEstimate
+    type: 
+      schema: dividendsEstimate
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: createDividendsEstimate
+  type: command
+  description: 创建分红预算服务
+  result:
+  - name: dividendsEstimate
+    type: 
+      schema: dividendsEstimate
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: estimateDividendsIncentives
+  type: command
+  description: 确定预算分红激励
+  payload:
+  - ref: orderOrReturnedOrderNum
+    description: 分红订单号/退货单号
+    required: true
+  - ref: cooperationContractNumber
+    description: 合约编号
+    required: true
+  result:
+  - name: dividendsEstimate
+    type: 
+      schema: dividendsEstimate
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: estimateMoneyIncentives
+  type: command
+  description: 确定预算金额激励分红
+  payload:
+  - ref: cooperationContractNumber
+    description: 共创项目合约编号
+    required: true
+  - ref: dividendsIncentivesStage
+    description: 分红阶段
+    required: true
+  - name: undertakerUid
+    decription: 承接人UID
+    type:
+      primitive: string
+    required: true
+  result:
+  - name: dividendsEstimate
+    type: 
+      schema: dividendsEstimate
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: getDividendsEstimate
+  type: query
+  description: 返回分红预算服务
+  payload:
+  - ref: dividendsEstimateId
+    required: true
+  result:
+  - name: dividendsEstimate
+    type: 
+      schema: dividendsEstimate
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: listDividendsEstimate
+  type: query
+  description: 返回分红预算服务列表
+  payload:
+  - ref: offset
+    required: true
+  - ref: limit
+    required: true
+  result:
+  - ref: count
+    required: true 
+  - name: dividendsEstimates
+    type: 
+      array: dividendsEstimate
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: listDividendsIncentives
+  type: query
+  description: 返回业绩激励分红
+  payload:
+  - ref: offset
+    required: true
+  - ref: limit
+    required: true
+  result:
+  - name: dividendsIncentives
+    type: 
+      schema: dividendsIncentives
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: listMoneyIncentives
+  type: query
+  description: 返回金额激励分红
+  payload:
+  - ref: offset
+    required: true
+  - ref: limit
+    required: true
+  result:
+  - name: moneyIncentives
+    type: 
+      schema: moneyIncentives
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: removeDividendsEstimate
+  type: command
+  description: 移除分红预算服务
+  payload:
+  - ref: dividendsEstimateId
+    required: true
+  result:
+  - name: dividendsEstimate
+    type: 
+      schema: dividendsEstimate
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: searchDividendsEstimate
+  type: query
+  description: 查询分红预算单
+  payload:
+  - ref: dividendsEstimateOrderNumber
+    required: true
+  - ref: dividendsType
+    required: true
+  result:
+  - name: dividendsEstimate
+    type: 
+      schema: dividendsEstimate
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: searchDividendsIncentives
+  type: query
+  description: 查询业绩分红
+  payload:
+  - ref: cooperationContractNumber
+    description: 合约编号
+    required: false
+  - ref: orderOrReturnedOrderNum
+    description: 分红订单号/退货单号
+    required: false
+  result:
+  - name: dividendsIncentives
+    type:
+      schema: dividendsIncentives
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: searchMoneyIncentives
+  type: query
+  description: 查询金额激励分红
+  payload:
+  - ref: cooperationContractName
+    description: 共创合约名称
+    required: false
+  - ref: departmentName
+    description: 发起部门名称
+    required: false
+  result:
+  - name: moneyIncentives
+    type: 
+      schema: moneyIncentives
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: updateDividendsEstimate
+  type: command
+  description: 更新分红预算服务
+  payload:
+  - ref: dividendsEstimateId
+    required: true
+  result:
+  - name: dividendsEstimate
+    type: 
+      schema: dividendsEstimate
+    required: true

+version: v1
+kind: Service
+metadata:
+  name: dividendsEstimate
+  description: 分红预算服务

@@ -4,6 +4,9 @@ metadata:
   name: getDividendsReturnedOrder
   type: query
   description: 返回分红退货单服务
+  payload:
+  - ref: dividendsReturnedOrderId
+    require: true
   result:
   - name: dividendsReturnedOrders
     type: 

@@ -5,7 +5,7 @@ metadata:
   type: query
   description: 返回项目金额激励规则服务
   payload:
-  - ref: moneyIncentivesRulesId
+  - ref: moneyIncentivesRuleId
     required: true
   result:
   - name: moneyIncentivesRule

@@ -2,6 +2,6 @@ version: v1
 kind: Attribute
 metadata:
   name: isPublish
-  description: 菜单是否公开状态(上架、下架)，[0:隐藏],[1:显示],默认显示
+  description: 菜单是否公开状态(上架、下架)，[2:隐藏],[1:显示],默认显示
   type: 
     primitive: int

@@ -22,6 +22,10 @@ metadata:
       description: 所属部门
       type:
         primitive: int64
+    - name: usersInfo
+      description: 用户信息 （冗余，数据存在usersBase里面）
+      type:
+        array: usersInfo    
     - name: usersOrg
       description: 用户关联的组织
       type:

@@ -6,6 +6,8 @@ metadata:
   attributes:
   - ref: usersId
     required: true
+  - ref: usersBaseId
+    required: true  
   - ref: usersName
     required: true
   - ref: usersCode

@@ -36,7 +36,11 @@ metadata:
       type:
         primitive: int
     - ref: password
-      required: true    
+      required: true
+    - name: usersInfo
+      description: 用户信息 
+      type:
+        array: usersInfo          
   result:
     - name: users
       type: