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

+version: v1
+kind: HttpApi
+metadata:
+  service: dividendsReturnedOrder
+  path: /dividends-returned-orders
+  endpoints: 
+  - method: createDividendsReturnedOrder
+    route:
+      post: /  
+  - method: updateDividendsReturnedOrder
+    route:
+      put: /{dividendsReturnedOrderId}
+  - method: getDividendsReturnedOrder
+    route:
+      get: /{dividendsReturnedOrderId}
+  - method: removeDividendsReturnedOrder
+    route:
+      delete: /{dividendsReturnedOrderId}
+  - method: searchDividendsReturnedOrder
+    route:
+      post: /search
+  - method: importDividendsReturnedOrder
+    route:
+      post: /import
+  - method: listDividendsReturnedOrder
+    route:
+      get: /
+    params:
+      - name: offset
+      - name: limit

+version: v1
+kind: Attribute
+metadata:
+  name: dividendsReturnedCustomerName
+  description: 退货客户名称
+  type: 
+    primitive: string

+version: v1
+kind: Attribute
+metadata:
+  name: dividendsReturnedDate
+  description: 退货日期
+  type: 
+    primitive: datetime

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

+version: v1
+kind: Attribute
+metadata:
+  name: dividendsReturnedOrderRefund
+  description: 退货金额
+  type: 
+    primitive: float64

 version: v1
 version: v1
 kind: Attribute
 kind: Attribute
 metadata:
 metadata:
-  name: dividendsOriginalReturnedOrderNum
+  name: originalOrderNum
   description: 来源单号，源单号，订单号
   description: 来源单号，源单号，订单号
   type: 
   type: 
     primitive: string
     primitive: string

+version: v1
+kind: Schema
+metadata:
+  name: dividendsReturnedOrder
+  description: 分红退货单实体
+  attributes:
+  - ref: dividendsReturnedOrderId
+    required: true
+  - ref: dividendsReturnedOrderNumber
+    description: 分红退货单号
+    required: true
+  - ref: dividendsReturnedOrderRefund
+    required: true
+  - ref: originalOrderNum
+    description: 源单号（原始订单号）
+    required: true
+  - ref: dividendsOrderNumber
+    description: 关联分红订单号
+    required: true
+  - ref: dividendsReturnedCustomerName
+    description: 退货客户姓名
+    required: true
+  - ref: dividendsReturnedDate
+    required: true
+  - ref: region
+    description: 退货区域
+    required: true
+  - ref: remarks
+    description: 备注
+    required: true
+  - ref: dividendStatus
+    required: true
+  - ref: dividendTime
+    required: true
+  - ref: organization
+    required: true
+  - ref: createdAt
+    required: true
+  - ref: deletedAt
+    required: true
+  - ref: updatedAt
+    required: true
+  - ref: operator
+    required: true
+  - ref: operateTime
+    required: true

@@ -2,7 +2,7 @@ version: v1
 kind: Schema
 kind: Schema
 metadata:
 metadata:
   name: orderGood
   name: orderGood
-  description: 订单产品领域实体
+  description: 订单产品领域实体（包括分红订单、分红退货单）
   attributes:
   attributes:
   - ref: orderGoodId
   - ref: orderGoodId
     required: true
     required: true

+version: v1
+kind: Method
+metadata:
+  name: createDividendsReturnedOrder
+  type: command
+  description: 创建分红退货单服务
+  payload:
+  - ref: dividendsReturnedOrderRefund
+    required: true
+  - ref: dividendsReturnedCustomerName
+    required: true
+  - ref: originalOrderNum
+    required: true
+  - ref: remarks
+    required: true
+  - ref: dividendsReturnedDate
+    required: true
+  - name: regionName
+    description: 退货区域名称
+    type: 
+      primitive: string
+  - name: orderGoods
+    description: 订单产品列表
+    type:
+      array: orderGoods
+  result:
+  - name: dividendsReturnedOrder
+    type: 
+      schema: dividendsReturnedOrder
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: getDividendsReturnedOrder
+  type: query
+  description: 返回分红退货单服务
+  result:
+  - name: dividendsReturnedOrders
+    type: 
+      schema: dividendsReturnedOrder
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: importDividendsReturnedOrder
+  type: command
+  description: 导入分红退货单
+  payload:
+  - name: file
+    description: 导入文件
+    type: 
+      primitive: string
+  - name: where
+    description: 参数列表
+    type: 
+      primitive: string
+  result:
+  - name: dividendsReturnedOrder
+    type: 
+      schema: dividendsReturnedOrder
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: listDividendsReturnedOrder
+  type: query
+  description: 返回分红退货单服务列表
+  payload:
+  - ref: offset
+    required: true
+  - ref: limit
+    required: true
+  result:
+  - ref: count
+    required: true 
+  - name: dividendsReturnedOrders
+    type: 
+      array: dividendsReturnedOrder
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: removeDividendsReturnedOrder
+  type: command
+  description: 移除分红退货单服务
+  result:
+  - name: dividendsReturnedOrder
+    type: 
+      schema: dividendsReturnedOrder
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: searchDividendsReturnedOrder
+  type: query
+  description: 查找分红退货单
+  payload:
+  - ref: dividendsReturnedCustomerName
+    description: 退货客户姓名
+    required: false
+  - ref: dividendsReturnedOrderNumber
+    description: 分红退货单号
+    required: false
+  - ref: pageSize
+    required: false
+  - ref: pageNumber
+    required: false
+  result:
+  - name: dividendsReturnedOrders
+    type: 
+      array: dividendsReturnedOrder
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: updateDividendsReturnedOrder
+  type: command
+  description: 更新分红退货单服务
+  payload:
+  - ref: dividendsReturnedOrderRefund
+    required: true
+  - ref: dividendsReturnedCustomerName
+    required: true
+  - ref: originalOrderNum
+    required: true
+  - ref: remarks
+    required: true
+  - ref: dividendsReturnedDate
+    required: true
+  - name: regionName
+    description: 退货区域
+    type: 
+      primitive: string
+  - name: orderGoods
+    description: 订单产品列表
+    type:
+      array: orderGoods
+  result:
+  - name: dividendsReturnedOrder
+    type: 
+      schema: dividendsReturnedOrder
+    required: true

+version: v1
+kind: Service
+metadata:
+  name: dividendsReturnedOrder
+  description: 分红退货单服务

@@ -13,9 +13,15 @@ metadata:
   - method: phoneAuthResetPassword
   - method: phoneAuthResetPassword
     route:
     route:
       post: /reset-password
       post: /reset-password
+  - method: phoneAuthChangePassword
+    route:
+      post: /change-password    
   - method: phoneAuthResetPhone
   - method: phoneAuthResetPhone
     route:
     route:
       post: /reset-phone   
       post: /reset-phone   
   - method: destoryAccount
   - method: destoryAccount
     route:
     route:
       post: /destory-account
       post: /destory-account
+  - method: usersInfo
+    route:
+      post: /usersInfo   

@@ -2,7 +2,7 @@ version: v1
 kind: HttpApi
 kind: HttpApi
 metadata:
 metadata:
   service: usersBase
   service: usersBase
-  path: /users-bases
+  path: /users-base
   endpoints: 
   endpoints: 
   - method: createUsersBase
   - method: createUsersBase
     route:
     route:

+version: v1
+kind: Attribute
+metadata:
+  name: organizationId
+  description: 组织ID
+  type:
+    primitive: int64

-version: v1
-kind: Schema
-metadata:
-  name: phoneAuth
-  description: 手机认证
-  attributes:
-    - ref: phone
-      required: true
-    - ref: password
-      required: true

@@ -10,10 +10,10 @@ metadata:
       description: 用户信息
       description: 用户信息
       type:
       type:
         schema: usersInfo
         schema: usersInfo
-    - name: phoneAuth
-      description: 手机认证
-      type:
-        schema: phoneAuth
+    - ref: phone
+      required: true
+    - ref: password
+      required: true
     - name: im
     - name: im
       description: IM信息
       description: IM信息
       type:
       type:

+version: v1
+kind: Method
+metadata:
+  name: phoneAuthChangePassword
+  type: command
+  description: 修改密码
+  payload:
+  - ref: usersId
+    required: true
+  - name: oldPassword
+    description: 旧密码
+    type: 
+      primitive: string
+    required: true
+  - name: newPassword
+    description: 新密码
+    type: 
+      primitive: string
+    required: true
+  result:
+  - ref: code
+    required: true
+  - ref: msg
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: usersInfo
+  type: query
+  description: 用户信息 （暂时没有使用）
+  result:
+  - ref: usersId
+    required: true
+  - ref: usersName
+    required: true
+  - ref: avator
+    required: true
+  - ref: phone
+    required: true
+  - name: company
+    description: 公司信息
+    type:
+      schema: company  
+  - name: org
+    description: 当前登录的组织
+    type:
+      schema: org
+    required: true
+  - name: usersOrgs
+    description: 用户关联的组织
+    type:
+      array: org
+  - ref: accessMenus
+    required: true
+  - name: im
+    description: 网易云信IM信息
+    type:
+      schema: im

@@ -11,6 +11,8 @@ metadata:
       description: 用户列表
       description: 用户列表
       type:
       type:
         array: users
         array: users
+    - ref: password
+      required: true    
   result:
   result:
     - name: code
     - name: code
       type:
       type:

@@ -35,6 +35,8 @@ metadata:
       description: 启用状态(启用:1 禁用:2)
       description: 启用状态(启用:1 禁用:2)
       type:
       type:
         primitive: int
         primitive: int
+    - ref: password
+      required: true    
   result:
   result:
     - name: users
     - name: users
       type:
       type:

@@ -11,8 +11,10 @@ metadata:
       required: true
       required: true
     - ref: companyId
     - ref: companyId
       required: false 
       required: false 
-    - ref: orgId
+    - ref: organizationId
       required: false 
       required: false 
+    - ref: departmentId
+      required: false   
     - ref: usersName
     - ref: usersName
       required: false
       required: false
     - ref: depName
     - ref: depName