Merge branch 'dev'

+version: v1
+kind: HttpApi
+metadata:
+  service: dividendsOrder
+  path: /dividends-orders
+  endpoints: 
+  - method: createDividendsOrder
+    route:
+      post: /  
+  - method: updateDividendsOrder
+    route:
+      put: /{dividendsOrderId}
+  - method: getDividendsOrder
+    route:
+      get: /{dividendsOrderId}
+  - method: removeDividendsOrder
+    route:
+      delete: /{dividendsOrderId}
+  - method: searchDividendsOrder
+    route:
+      post: /search
+  - method: listDividendsOrder
+    route:
+      get: /
+    params:
+      - name: offset
+      - name: limit

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

+version: v1
+kind: Attribute
+metadata:
+  name: dividendStatus
+  description: 分红订单分红状态，1待分红，2已分红，3部分分红
+  type: 
+    primitive: int32

+version: v1
+kind: Attribute
+metadata:
+  name: dividendTime
+  description: 分红订单分红时间
+  type: 
+    primitive: datetime

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

@@ -2,6 +2,6 @@ version: v1
 kind: Attribute
 metadata:
   name: dividendsOrderNumber
-  description: 分红订单源单号
+  description: 分红订单号
   type: 
     primitive: int64

+version: v1
+kind: Attribute
+metadata:
+  name: dividendsOriginalOrderNum
+  description: 分红订单原单号
+  type: 
+    primitive: string

+version: v1
+kind: Attribute
+metadata:
+  name: orderSalesman
+  description: 订单业务员
+  type: 
+    schema: user

+version: v1
+kind: Attribute
+metadata:
+  name: orderTime
+  description: 订单产生时间
+  type: 
+    primitive: datetime

+version: v1
+kind: Attribute
+metadata:
+  name: region
+  description: 区域
+  type: 
+    schema: regionInfo

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

 version: v1
 kind: Attribute
 metadata:
-  name: dividendsReturnedId
+  name: dividendsReturnedOrderId
   description: 分红退货单记录ID
   type: 
     primitive: string

+version: v1
+kind: Attribute
+metadata:
+  name: orderGoodAmount
+  description: 订单产品金额
+  type: 
+    primitive: float64

+version: v1
+kind: Attribute
+metadata:
+  name: orderGoodExpense
+  description: 订单产品费用
+  type: 
+    primitive: float64

 version: v1
 kind: Attribute
 metadata:
-  name: regionId
-  description: 区域ID
+  name: orderGoodId
+  description: 订单产品
   type: 
     primitive: int64

+version: v1
+kind: Attribute
+metadata:
+  name: orderGoodName
+  description: 订单产品名称
+  type: 
+    primitive: string

+version: v1
+kind: Attribute
+metadata:
+  name: orderGoodPrice
+  description: 订单产品单价
+  type: 
+    primitive: float64

+version: v1
+kind: Attribute
+metadata:
+  name: orderGoodQuantity
+  description: 订单产品数量
+  type: 
+    primitive: int64

+version: v1
+kind: Attribute
+metadata:
+  name: regionNumber
+  description: 区域编号
+  type: 
+    primitive: string

+version: v1
+kind: Schema
+metadata:
+  name: dividendsOrder
+  description: 分红订单实体
+  attributes:
+  - ref: dividendsOrderId
+    required: true
+  - ref: dividendsOrderNumber
+    required: true
+  - ref: dividendsOriginalOrderNum
+    required: true
+  - ref: dividendsOrderAmount
+    required: true
+  - ref: orderSalesman
+    required: true
+  - ref: orderTime
+    required: true
+  - ref: dividendTime
+    required: true
+  - ref: dividendStatus
+    required: true
+  - ref: region
+    required: true
+  - ref: customerName
+    description: 客户姓名
+    required: true
+  - ref: createdAt
+    required: true
+  - ref: deletedAt
+    required: true
+  - ref: updatedAt
+    required: true
+  - ref: operateTime
+    required: true
+  - ref: operator
+    required: true

+version: v1
+kind: Schema
+metadata:
+  name: orderGood
+  description: 订单产品领域实体
+  attributes:
+  - ref: orderGoodId
+    required: true
+  - ref: orderGoodAmount
+    required: true
+  - ref: orderGoodName
+    required: true
+  - ref: orderGoodPrice
+    required: true
+  - ref: orderGoodQuantity
+    required: true
+  - ref: dividendsOrderNumber
+    description: 关联分红订单号
+    required: true
+  - ref: cooperationContractNumber
+    description: 关联的共创合约编号
+    required: true
+  - ref: orderGoodExpense
+    description: 订单产品费用
+    required: true
+  - ref: createdAt
+    required: true
+  - ref: deletedAt
+    required: true
+  - ref: updatedAt
+    required: true

+version: v1
+kind: Schema
+metadata:
+  name: orderGood
+  description: 订单产品对象
+  attributes:
+  - ref: orderGoodAmount
+    required: true
+  - ref: orderGoodName
+    required: true
+  - ref: orderGoodPrice
+    required: true
+  - ref: orderGoodQuantity
+    required: true
+  - ref: dividendsOrderNumber
+    description: 关联分红订单号
+    required: true
+  - ref: cooperationContractNumber
+    description: 关联的共创合约编号
+    required: true
+  - ref: orderGoodExpense
+    description: 订单产品费用
+    required: true
+  - ref: createdAt
+    required: true
+  - ref: deletedAt
+    required: true
+  - ref: updatedAt
+    required: true

@@ -4,7 +4,7 @@ metadata:
   name: regionInfo
   description: 区域信息值对象
   attributes:
-  - ref: regionId
+  - ref: regionNumber
     required: true
   - ref: regionName
     required: true

+version: v1
+kind: Method
+metadata:
+  name: createDividendsOrder
+  type: command
+  description: 创建分红订单实体对象
+  payload:
+  - ref: customerName
+    required: true
+  - ref: dividendsOrderAmount
+    required: true
+  - ref: dividendsOrderNumber
+    required: true
+  - ref: dividendsOriginalOrderNum
+    required: true
+  - ref: orderTime
+    required: true
+  - ref: remarks
+    required: true
+  - name: salesmanUid
+    description: 订单业务员uid
+    type: 
+      primitive: string
+  - name: operatorUid
+    description: 订单操作人uid
+    type: 
+      primitive: string
+  - name: orderGoods
+    description: 订单产品列表
+    type:
+      array: orderGoods
+  result:
+  - name: dividendsOrder
+    type: 
+      schema: dividendsOrder
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: getDividendsOrder
+  type: query
+  description: 返回分红订单实体对象
+  payload:
+  - ref: dividendsOrderId
+    required: true
+  result:
+  - name: dividendsOrder
+    type: 
+      schema: dividendsOrder
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: listDividendsOrders
+  type: query
+  description: 返回分红订单实体对象列表
+  payload:
+  - ref: offset
+    required: true
+  - ref: limit
+    required: true
+  result:
+  - ref: count
+    required: true 
+  - name: dividendsOrders
+    type: 
+      array: dividendsOrder
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: removeDividendsOrder
+  type: command
+  description: 移除分红订单实体对象
+  payload:
+  - ref: dividendsOrderId
+    required: true
+  result:
+  - name: dividendsOrder
+    type: 
+      schema: dividendsOrder
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: searchDividendsOrder
+  type: query
+  description: 查询分红订单方法
+  payload:
+  - ref: dividendsOrderNumber
+    required: false
+  - ref: customerName
+    required: false
+  - ref: pageSize
+    required: false
+  - ref: pageNumber
+    required: false
+  result:
+  - name: dividendsOrders
+    type: 
+      array: dividendsOrder
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: updateDividendsOrder
+  type: command
+  description: 更新分红订单实体对象
+  payload:
+  - ref: customerName
+    required: true
+  - ref: dividendsOrderAmount
+    required: true
+  - ref: dividendsOrderNumber
+    required: true
+  - ref: dividendsOriginalOrderNum
+    required: true
+  - ref: orderTime
+    required: true
+  - ref: remarks
+    required: true
+  - name: salesmanUid
+    description: Attribute描述
+    type: 
+      primitive: string
+  - name: operatorUid
+    description: Attribute描述
+    type: 
+      primitive: string
+  result:
+  - name: dividendsOrder
+    type: 
+      schema: dividendsOrder
+    required: true

+version: v1
+kind: Service
+metadata:
+  name: dividendsOrder
+  description: 分红订单实体对象