Merge branch 'dev' of http://gitlab.fjmaimaimai.com/mmm-go-pp/partner01 into dev

 version: v1
 version: v1
 kind: Attribute
 kind: Attribute
 metadata:
 metadata:
-  name: remark
+  name: remarks
   description: 商品备注信息
   description: 商品备注信息
   type: 
   type: 
     primitive: string
     primitive: string

@@ -2,6 +2,6 @@ version: v1
 kind: Attribute
 kind: Attribute
 metadata:
 metadata:
   name: partnerCategoryInfos
   name: partnerCategoryInfos
-  description: 区域信息
+  description: 区域信息值对象
   type: 
   type: 
     array: partnerCategory
     array: partnerCategory

@@ -16,7 +16,7 @@ metadata:
     required: true
     required: true
   - ref: goodsTotalPrice
   - ref: goodsTotalPrice
     required: true
     required: true
-  - ref: remark
+  - ref: remarks
     required: true
     required: true
   - ref: orderNo
   - ref: orderNo
     required: true
     required: true

@@ -36,5 +36,5 @@ metadata:
     required: true
     required: true
   - ref: regionInfo
   - ref: regionInfo
     required: true
     required: true
-  - ref: remark
+  - ref: remarks
     required: true
     required: true

+version: v1
+kind: Schema
+metadata:
+  name: orderLog
+  description: 订单操作日志
+  attributes:
+  - ref: description
+    required: true
+  - ref: goodsId
+    required: true
+  - ref: operatingTime
+    required: true
+  - ref: operation
+    required: true
+  - ref: operator
+    required: true
+  - ref: orderLogId
+    required: true
+  - ref: source
+    required: true
+  - ref: orderNo
+    required: true

@@ -4,14 +4,14 @@ metadata:
   name: partner
   name: partner
   description: 合伙人实体
   description: 合伙人实体
   attributes:
   attributes:
+  - ref: partnerId
+    required: true
   - ref: cooperateTime
   - ref: cooperateTime
     required: true
     required: true
   - ref: partnerCategory
   - ref: partnerCategory
     required: true
     required: true
   - ref: partnerCategoryInfos
   - ref: partnerCategoryInfos
     required: true
     required: true
-  - ref: partnerId
-    required: true
   - ref: partnerInfo
   - ref: partnerInfo
     required: true
     required: true
   - ref: salesman
   - ref: salesman

+version: v1
+kind: Method
+metadata:
+  name: cancel
+  type: command
+  description: 取消订单服务
+  payload:
+  - ref: orderNo
+    description: 订单编号
+    required: true
+  - ref: companyId
+    description: 公司id
+    required: true
+  - ref: operator
+    description: 操作人
+    required: true
+  result:
+  - name: order
+    type: 
+      schema: order

+version: v1
+kind: Method
+metadata:
+  name: darwDividends
+  type: command
+  description: 订单分红服务
+  payload:
+  - ref: partnerId
+    description: 参与分红的合伙人
+    required: true
+  - ref: orderNo
+    description: 进行分红的订单编号
+    required: true
+  result:
+  - name: order
+    type:
+      schema: order

+version: v1
+kind: Method
+metadata:
+  name: receiving
+  type: command
+  description: 订单收货服务
+  payload:
+  - ref: orderNo
+    description: 订单号
+    required: true
+  - ref: operator
+    description: 操作人
+    required: true
+  - ref: companyId
+    description: 公司id
+    required: true
+  result:
+  - name: order
+    type: 
+      schema: order

+version: v1
+kind: Method
+metadata:
+  name: return
+  type: command
+  description: 订单退货服务
+  payload:
+  - ref: orderNo
+    description: 订单号
+    required: true
+  - ref: operator
+    description: 操作人
+    required: true
+  - ref: companyId
+    description: 公司id
+    required: true
+  result:
+  - name: order
+    type: 
+      schema: order

 version: v1
 version: v1
 kind: Method
 kind: Method
 metadata:
 metadata:
-  name: delivery
+  name: shipping
   type: command
   type: command
-  description: 订单发货领域服务
+  description: 订单发货服务
   payload:
   payload:
   - ref: deliveryCode
   - ref: deliveryCode
-    required: true
-  - ref: companyId
-    required: true
-  - ref: orderId
+    description: 发货单号
     required: true
     required: true
   - ref: orderNo
   - ref: orderNo
+    description: 订单编号
     required: true
     required: true
   - ref: orderNum
   - ref: orderNum
-    required: true
-  - ref: orderStatus
-    required: true
-  - ref: orderType
+    description: 订单数量
     required: true
     required: true
   result:
   result:
-  - ref: orderId
-    required: true
-  - ref: orderNo
-    required: true
-  - ref: orderNum
-    required: true
-  - ref: orderStatus
-    required: true
-  - ref: orderTotalPrice
-    required: true
-  - ref: orderType
-    required: true
   - name: order
   - name: order
     type: 
     type: 
       schema: order
       schema: order

+version: v1
+kind: Method
+metadata:
+  name: createPartner
+  type: command
+  description: 创建合伙人增删改查
+  result:
+  - name: partner
+    type: 
+      schema: partner

+version: v1
+kind: Method
+metadata:
+  name: getPartner
+  type: query
+  description: 返回合伙人增删改查
+  payload:
+  - ref: partnerId
+    required: true
+  result:
+  - name: partner
+    type: 
+      schema: partner

+version: v1
+kind: Method
+metadata:
+  name: listPartner
+  type: query
+  description: 返回合伙人增删改查列表
+  payload:
+  - ref: offset
+    required: true
+  - ref: limit
+    required: true
+  result:
+  - ref: count
+    required: true
+  - name: partner
+    type: 
+      schema: partner

+version: v1
+kind: Method
+metadata:
+  name: removePartner
+  type: command
+  description: 移除合伙人增删改查
+  payload:
+  - ref: partnerId
+    required: true
+  result:
+  - name: partner
+    type: 
+      schema: partner

+version: v1
+kind: Method
+metadata:
+  name: updatePartner
+  type: command
+  description: 更新合伙人增删改查
+  payload:
+  - ref: partnerId
+    required: true
+  result:
+  - name: partner
+    type: 
+      schema: partner