作者 陈志颖

docs:订单dsl调整

正在显示 28 个修改的文件 包含 94 行增加66 行删除
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: goodsDetail
  5 + description: 商品详情
  6 + type:
  7 + schema: goodsDetail
@@ -2,6 +2,6 @@ version: v1 @@ -2,6 +2,6 @@ version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 name: goodsDividend 4 name: goodsDividend
5 - description: 货品分红统计 5 + description: 商品分红支付信息
6 type: 6 type:
7 - schema: goodsDividend 7 + schema: dividend
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: goodsDividendStatus
  5 + description: 商品分红支付状态
  6 + type:
  7 + primitive: int
@@ -2,6 +2,6 @@ version: v1 @@ -2,6 +2,6 @@ version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 name: goodsId 4 name: goodsId
5 - description: 订单项id 5 + description: 商品id
6 type: 6 type:
7 primitive: int64 7 primitive: int64
@@ -2,6 +2,6 @@ version: v1 @@ -2,6 +2,6 @@ version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 name: goodsName 4 name: goodsName
5 - description: 品名称 5 + description: 品名称
6 type: 6 type:
7 primitive: string 7 primitive: string
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: expectNumber 4 + name: goodsNum
5 description: 预定的货品数量 5 description: 预定的货品数量
6 type: 6 type:
7 primitive: int 7 primitive: int
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: dividendRatio  
5 - description: 合伙人分红比例 4 + name: goodsTotalPrice
  5 + description: 商品单价
6 type: 6 type:
7 primitive: float64 7 primitive: float64
@@ -2,6 +2,6 @@ version: v1 @@ -2,6 +2,6 @@ version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 name: remark 4 name: remark
5 - description: 品备注信息 5 + description: 品备注信息
6 type: 6 type:
7 primitive: string 7 primitive: string
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: price  
5 - description: 货品单价 4 + name: adjustedTotalPrice
  5 + description: 调整后的总价
6 type: 6 type:
7 primitive: float64 7 primitive: float64
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: num  
5 - description: 数量 4 + name: goodsDetailId
  5 + description: 商品详情id
6 type: 6 type:
7 primitive: int64 7 primitive: int64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: reason
  5 + description: 商品调整原因
  6 + type:
  7 + primitive: string
@@ -2,6 +2,6 @@ version: v1 @@ -2,6 +2,6 @@ version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 name: orderDividend 4 name: orderDividend
5 - description: 订单分红统计 5 + description: 订单分红信息
6 type: 6 type:
7 schema: dividend 7 schema: dividend
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: dividendStatus  
5 - description: 合伙人分红支付转状态 4 + name: orderDividendStatus
  5 + description: 订单分红支付状态
6 type: 6 type:
7 primitive: int 7 primitive: int
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: actualDividend  
5 - description: 实际分红 4 + name: orderNum
  5 + description: 订单商品总数
6 type: 6 type:
7 - primitive: float32 7 + primitive: int64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: orderStatus
  5 + description: 订单状态(1.发货;2.收货;3.退货;4.取消;5.完成)
  6 + type:
  7 + primitive: int
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: expectDividend  
5 - description: 预计分红 4 + name: totalPrice
  5 + description: 订单总价
6 type: 6 type:
7 - primitive: float32 7 + primitive: float64
@@ -2,6 +2,6 @@ version: v1 @@ -2,6 +2,6 @@ version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 name: orderType 4 name: orderType
5 - description: 订单类型 5 + description: 订单类型(1.实际订单;2.意向订单)
6 type: 6 type:
7 primitive: int 7 primitive: int
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: expensesDividend  
5 - description: 支出分红 4 + name: adjustedNum
  5 + description: 调整后的订单商品总数
6 type: 6 type:
7 - primitive: float32 7 + primitive: int
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: receivedDividend  
5 - description: 已收分红 4 + name: adjustedTotalPrice
  5 + description: 调整后的订单商品总价
6 type: 6 type:
7 - primitive: float32 7 + primitive: float64
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: uncollectedDividend  
5 - description: 未收分红 4 + name: orderDetailId
  5 + description: 订单详情id
6 type: 6 type:
7 - primitive: float32 7 + primitive: float64
@@ -6,27 +6,19 @@ metadata: @@ -6,27 +6,19 @@ metadata:
6 attributes: 6 attributes:
7 - ref: goodsId 7 - ref: goodsId
8 required: true 8 required: true
9 - - ref: actualNumber  
10 - required: true  
11 - - ref: dividendStatus  
12 - required: true  
13 - - ref: expectNumber 9 + - ref: goodsNum
14 required: true 10 required: true
15 - ref: goodsDividend 11 - ref: goodsDividend
16 required: true 12 required: true
17 - - ref: dividendRatio 13 + - ref: goodsDividendStatus
18 required: true 14 required: true
19 - ref: goodsName 15 - ref: goodsName
20 required: true 16 required: true
21 - - ref: price 17 + - ref: goodsTotalPrice
22 required: true 18 required: true
23 - ref: remark 19 - ref: remark
24 required: true 20 required: true
25 - - ref: orderId 21 + - ref: orderNo
26 required: true 22 required: true
27 - - ref: companyId 23 + - name: goodsDetail
28 required: true 24 required: true
29 - - name: reason  
30 - description: 原因  
31 - type:  
32 - primitive: string  
1 version: v1 1 version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 - name: goodsDividend  
5 - description: 货品分红 4 + name: goodsDetail
  5 + description: 商品详情
6 attributes: 6 attributes:
7 - - ref: actualDividend 7 + - ref: goodsDetailId
8 required: true 8 required: true
9 - - ref: expectDividend 9 + - ref: adjustedNum
10 required: true 10 required: true
11 - - ref: uncollectedDividend 11 + - ref: adjustedTotalPrice
12 required: true 12 required: true
13 - - ref: receivedDividend  
14 - required: true  
15 - - ref: expensesDividend 13 + - ref: reason
16 required: true 14 required: true
@@ -4,6 +4,8 @@ metadata: @@ -4,6 +4,8 @@ metadata:
4 name: order 4 name: order
5 description: 订单实体 5 description: 订单实体
6 attributes: 6 attributes:
  7 + - ref: orderId
  8 + required: true
7 - ref: buyer 9 - ref: buyer
8 required: true 10 required: true
9 - ref: companyId 11 - ref: companyId
@@ -12,19 +14,23 @@ metadata: @@ -12,19 +14,23 @@ metadata:
12 required: true 14 required: true
13 - ref: isDisable 15 - ref: isDisable
14 required: true 16 required: true
15 - - ref: orderCode 17 + - ref: orderNo
16 required: true 18 required: true
17 - ref: orderDetail 19 - ref: orderDetail
18 required: true 20 required: true
19 - ref: orderDividend 21 - ref: orderDividend
20 required: true 22 required: true
21 - - ref: orderGoods 23 + - ref: orderDividendStatus
22 required: true 24 required: true
23 - - ref: orderId 25 + - ref: orderGoods
24 required: true 26 required: true
25 - ref: orderSource 27 - ref: orderSource
26 required: true 28 required: true
27 - ref: orderType 29 - ref: orderType
28 required: true 30 required: true
  31 + - ref: orderStatus
  32 + required: true
  33 + - ref: orderTotalPrice
  34 + required: true
29 - ref: remark 35 - ref: remark
30 required: true 36 required: true
@@ -4,23 +4,27 @@ metadata: @@ -4,23 +4,27 @@ metadata:
4 name: orderDetail 4 name: orderDetail
5 description: 订单详情 5 description: 订单详情
6 attributes: 6 attributes:
7 - - name: orderCount 7 + - name: orderDetailId
  8 + description: 订单详情id
  9 + type:
  10 + primitive: int64
  11 + - name: orderNo
  12 + descriptiopn: 订单编号
  13 + type:
  14 + primitive: string
  15 + - name: orderNum
8 description: 订单数量 16 description: 订单数量
9 type: 17 type:
10 primitive: int 18 primitive: int
11 - - name: orderAmount 19 + - name: totalPrice
12 description: 订单总金额 20 description: 订单总金额
13 type: 21 type:
14 primitive: float64 22 primitive: float64
15 - - name: orderAdjustCount 23 + - name: adjustedNum
16 description: 调整后订单数量 24 description: 调整后订单数量
17 type: 25 type:
18 primitive: int 26 primitive: int
19 - - name: orderAdjustmount 27 + - name: adjustedTotalPrice
20 description: 调整后订单总金额 28 description: 调整后订单总金额
21 type: 29 type:
22 primitive: float64 30 primitive: float64
23 - - name: price  
24 - description: 单价  
25 - type:  
26 - primitive: float64  
@@ -5,7 +5,7 @@ metadata: @@ -5,7 +5,7 @@ metadata:
5 type: command 5 type: command
6 description: 创建订单增删改查 6 description: 创建订单增删改查
7 payload: 7 payload:
8 - - ref: orderCode 8 + - ref: orderNo
9 required: true 9 required: true
10 result: 10 result:
11 - name: order 11 - name: order
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 ├─deploy 项目部署文件 23 ├─deploy 项目部署文件
24 ├─document 项目dsl文档、openapi文档 24 ├─document 项目dsl文档、openapi文档
25 ├─pkg 25 ├─pkg
26 -│ ├─application 应用服务层 26 +│ ├─application 应用服务层(调度编排仓储、dao、领域服务等,完成User Case)
27 │ │ ├─order 订单应用服务 27 │ │ ├─order 订单应用服务
28 │ │ ├─dividend 分红应用服务 28 │ │ ├─dividend 分红应用服务
29 │ │ ├─company 公司管理服务 29 │ │ ├─company 公司管理服务
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 │ │ └─service 领域服务定义 36 │ │ └─service 领域服务定义
37 │ ├─infrastructure 基础设施层 37 │ ├─infrastructure 基础设施层
38 │ │ ├─dao 特殊的数据库操作 38 │ │ ├─dao 特殊的数据库操作
39 -│ │ ├─domainService 实现领域服务 39 +│ │ ├─domainService 实现领域服务(操作多个领域对象,实现领域内的业务逻辑)
40 │ │ ├─pg 数据库模型定义 40 │ │ ├─pg 数据库模型定义
41 │ │ ├─repository 数据仓储具体实现(对应domain定义数据库的数据存储接口) 41 │ │ ├─repository 数据仓储具体实现(对应domain定义数据库的数据存储接口)
42 │ │ └─serviceGateway 其他系统服务调用 42 │ │ └─serviceGateway 其他系统服务调用