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

# Conflicts:
#	allied-creation-gateway/services/appUsers/methods/getPersonalData.yaml

@@ -19,7 +19,7 @@ metadata:
   - method: searchDividendsOrder
     route:
       post: /search
-  - method: listDividendsOrder
+  - method: listDividendsOrders
     route:
       get: /
     params:

 version: v1
 kind: Attribute
 metadata:
-  name: IsOrganization
+  name: isOrganization
   description: 是否组织机构标识，1为是，2为否，默认为否
   type: 
     primitive: boolean

 version: v1
 kind: Attribute
 metadata:
-  name: dividendsPercentage
+  name: dividendsIncentivesPercentage
   description: 分红规则激励百分点
   type: 
     primitive: float64

 version: v1
 kind: Attribute
 metadata:
-  name: dividendsRuleId
+  name: dividendsIncentivesRuleId
   description: 分红规则ID
   type: 
     primitive: int64

 version: v1
 kind: Attribute
 metadata:
-  name: dividendsStage
+  name: dividendsIncentivesStage
   description: 分红规则激励阶段，阶段返回时需要转换为中文数字
   type: 
     primitive: int64

 version: v1
 kind: Attribute
 metadata:
-  name: dividendsStageEnd
+  name: dividendsIncentivesStageEnd
   description: 分红规则激励阶段结束
   type: 
     primitive: datetime

 version: v1
 kind: Attribute
 metadata:
-  name: dividendsStageStart
+  name: dividendsIncentivesStageStart
   description: 分红规则激励阶段开始
   type: 
     primitive: datetime

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

 version: v1
 kind: Attribute
 metadata:
-  name: userAvator
+  name: userAvatar
   description: 用户头像
   type: 
     primitive: string

+version: v1
+kind: Schema
+metadata:
+  name: cooperationContractByUndertaker
+  description: 根据承接人返回共创项目合约
+  attributes:
+  - ref: cooperationContractId
+    required: true
+  - ref: cooperationContractDescription
+    required: true
+  - ref: cooperationContractNumber
+    required: true
+  - ref: cooperationContractName
+    required: true
+  - ref: cooperationMode
+    required: true
+  - ref: cooperationContractSponsor
+    required: true
+  - ref: status
+    required: true
+  - ref: contractUndertaker
+    required: true

@@ -10,5 +10,5 @@ metadata:
     required: true
   - ref: departmentNumber
     required: true
-  - ref: IsOrganization
+  - ref: isOrganization
     required: true

 version: v1
 kind: Schema
 metadata:
-  name: dividendsIncentivesRule
+  name: dividendsIncentivesRules
   description: 金额激励规则DTO
   attributes:
   - ref: referrerPercentage

 version: v1
 kind: Schema
 metadata:
-  name: moneyIncentivesRule
+  name: moneyIncentivesRules
   description: 金额激励规则DTO
   attributes:
   - ref: moneyIncentivesAmount

 version: v1
 kind: Schema
 metadata:
-  name: orderGood
+  name: orderGoods
   description: 订单产品对象
   attributes:
   - ref: orderGoodAmount

@@ -4,7 +4,7 @@ metadata:
   name: userInfo
   description: 用户信息值对象
   attributes:
-  - ref: userAvator
+  - ref: userAvatar
     required: true
   - ref: userEmail
     required: true

@@ -5,7 +5,7 @@ metadata:
   type: query
   description: 返回共创合约反馈服务
   payload:
-  - ref: contractUndertakerFeedbackId
+  - ref: feedbackId
     required: true
   - name: underTakerUid
     description: Attribute描述

@@ -5,7 +5,7 @@ metadata:
   type: command
   description: 移除共创合约反馈服务
   payload:
-  - ref: contractUndertakerFeedbackId
+  - ref: feedbackId
     required: true
   - name: underTakerUid
     description: Attribute描述

@@ -8,7 +8,7 @@ metadata:
   - ref: cooperationContractId
     required: true
   - name: sponsorUid
-    description: Attribute描述
+    description: 发起人uid
     type: 
       primitive: string
   result:

@@ -6,26 +6,14 @@ metadata:
   description: 根据承接人返回共创项目合约
   payload:
   - ref: cooperationContractName
-    requird: false
+    required: 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
+  - name: cooperationContractByUndertaker
+    description: 根据承接人返回的共创项目合约
+    type:
+      array: cooperationContractByUndertaker

 version: v1
 kind: Method
 metadata:
-  name: searchCooperationContract
+  name: searchCooperationMode
   type: query
   description: 查询共创模式
   payload:

@@ -7,12 +7,12 @@ metadata:
   payload:
   - ref: creditAccountOrderNum
     required: true
-  - name: participartorName
+  - name: participatorName
     description: 参与人姓名
     type: 
       primitive: string
   result:
-  - name: creditAccount
+  - name: creditAccounts
     type: 
-      schema: creditAccount
+      array: creditAccount
     required: true

@@ -12,7 +12,7 @@ metadata:
     description: 分红阶段
     required: true
   - name: undertakerUid
-    decription: 承接人UID
+    description: 承接人UID
     type:
       primitive: string
     required: true

@@ -14,5 +14,5 @@ metadata:
   result:
   - name: moneyIncentives
     type: 
-      schema: moneyIncentives
+      array: moneyIncentives
     required: true

@@ -18,11 +18,11 @@ metadata:
   - ref: remarks
     required: true
   - name: salesmanUid
-    description: Attribute描述
+    description: 业务员uid
     type: 
       primitive: string
   - name: operatorUid
-    description: Attribute描述
+    description: 操作人uid
     type: 
       primitive: string
   result:

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

 version: v1
 kind: Attribute
 metadata:
-  name: avator
+  name: avatar
   description: 头像
   type: 
     primitive: string

@@ -10,7 +10,7 @@ metadata:
       required: true
     - ref: updatedAt
       required: true
-    - ref: avator
+    - ref: avatar
       required: true
     - ref: cooperationCompany
       required: true

@@ -5,7 +5,7 @@ metadata:
   type: command
   description: 编辑个人资料
   payload:
-    - name: avator
+    - name: avatar
       description: 头像地址
       type:
         primitive: string
@@ -14,7 +14,7 @@ metadata:
       type:
         primitive: string
   result:
-    - name: avator
+    - name: avatar
       description: 头像地址
       type:
         primitive: string

@@ -10,11 +10,19 @@ metadata:
       type:
         primitive: int64
   result:
+<<<<<<< .mine
     - name: userId
       description: 用户id
       type:
         primitive: int64
     - name: avator
+=======
+    - name: avatar
+
+
+
+
+>>>>>>> .theirs
       description: 头像地址
       type:
         primitive: string

@@ -27,7 +27,7 @@ metadata:
       description: 关联的用户
       type:
         array: int64
-    - ref: avator
+    - ref: avatar
       required: true
   result:
     - name: usersId

@@ -45,7 +45,7 @@ metadata:
       description: 关联的组织结构
       type:
         array: int64
-    - name: avator
+    - name: avatar
       description: 头像
       type:
         primitive: string

 version: v1
 kind: Attribute
 metadata:
-  name: avator
+  name: avatar
   description: 头像
   type: 
     primitive: string

@@ -25,7 +25,7 @@ metadata:
     - name: usersInfo
       description: 用户信息 （冗余，数据存在usersBase里面）
       type:
-        array: usersInfo    
+        schema: usersInfo    
     - name: usersOrg
       description: 用户关联的组织
       type:

@@ -8,7 +8,7 @@ metadata:
       required: true
     - ref: phone
       required: true
-    - ref: avator
+    - ref: avatar
       required: true
     - ref: email
       required: true

@@ -12,7 +12,7 @@ metadata:
     required: true
   - ref: usersCode
     required: true
-  - ref: avator
+  - ref: avatar
     required: true
   - ref: phone
     required: true  

+version: v1
+kind: Method
+metadata:
+  name: refreshIM
+  type: command
+  description: 刷新IM信息
+  payload:
+  - ref: phone
+    required: true
+  result:
+   - name: im
+     description: IM信息
+     type:
+       schema: im

@@ -9,7 +9,7 @@ metadata:
     required: true
   - ref: usersName
     required: true
-  - ref: avator
+  - ref: avatar
     required: true
   - ref: phone
     required: true

@@ -9,7 +9,7 @@ metadata:
     required: true
   - ref: usersName
     required: true
-  - ref: avator
+  - ref: avatar
     required: true
   - ref: phone
     required: true