bianxinhua / partner_api · 提交

转到一个项目

作者 dengyuting
提交 6fcf8e01966f7e8903ec08aea37d17e4d9a6f17d 1 个父辈 0716afbf

fix

内嵌 并排对比
正在显示 8 个修改的文件 包含 11 行增加 和 11 行删除
@@ -17,8 +17,8 @@ request: @@ -17,8 +17,8 @@ request:
17 User-Agent: okhttp/3.12.3 17 User-Agent: okhttp/3.12.3
18 Authorization: Bearer ${get_m_accesstoken()} 18 Authorization: Bearer ${get_m_accesstoken()}
19 json: 19 json:
20 - orderId: '实发订单号${get_nowtime()}'  
21 - shipmentsId: '实发订单发货单号${get_nowtime()}' 20 + orderId: '实发订单号${get_stringcode(5)}'
  21 + shipmentsId: '实发订单发货单号${get_stringcode(5)}'
22 partnerID: $partnerID 22 partnerID: $partnerID
23 buyer: '客户名称${get_stringcode(5)}' 23 buyer: '客户名称${get_stringcode(5)}'
24 orderDist: '订单区域${get_stringcode(5)}' 24 orderDist: '订单区域${get_stringcode(5)}'
@@ -11,8 +11,8 @@ request: @@ -11,8 +11,8 @@ request:
11 Authorization: Bearer ${get_m_accesstoken()} 11 Authorization: Bearer ${get_m_accesstoken()}
12 json: 12 json:
13 id: $id 13 id: $id
14 - orderId: '订单号修改${get_nowtime()}'  
15 - shipmentsId: '发货单号修改${get_nowtime()}' 14 + orderId: '订单号修改${get_stringcode(5)}'
  15 + shipmentsId: '发货单号修改${get_stringcode(5)}'
16 partnerID: 1047 16 partnerID: 1047
17 buyer: '客户名称修改${get_stringcode(5)}' 17 buyer: '客户名称修改${get_stringcode(5)}'
18 orderDist: '订单区域修改${get_stringcode(5)}' 18 orderDist: '订单区域修改${get_stringcode(5)}'
1 name: 意向订单新增 1 name: 意向订单新增
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - orderId: '意向订单号${get_nowtime()}' 4 + orderId: '意向订单号${get_stringcode(5)}'
5 partnerID: 1047 5 partnerID: 1047
6 commissionProportion: 5 6 commissionProportion: 5
7 orderNum1: 100 7 orderNum1: 100
@@ -8,7 +8,7 @@ request: @@ -8,7 +8,7 @@ request:
8 User-Agent: okhttp/3.12.3 8 User-Agent: okhttp/3.12.3
9 Authorization: Bearer ${get_m_accesstoken()} 9 Authorization: Bearer ${get_m_accesstoken()}
10 json: 10 json:
11 - orderId: '意向订单号编辑${get_nowtime()}' 11 + orderId: '意向订单号编辑${get_stringcode(5)}'
12 buyer: '客户名称编辑${get_stringcode(5)}' 12 buyer: '客户名称编辑${get_stringcode(5)}'
13 orderDist: '订单区域编辑${get_stringcode(5)}' 13 orderDist: '订单区域编辑${get_stringcode(5)}'
14 partnerID: 1047 14 partnerID: 1047
@@ -10,7 +10,7 @@ request: @@ -10,7 +10,7 @@ request:
10 User-Agent: okhttp/3.12.3 10 User-Agent: okhttp/3.12.3
11 Authorization: Bearer ${get_m_accesstoken()} 11 Authorization: Bearer ${get_m_accesstoken()}
12 json: 12 json:
13 - shipmentsId: '意向订单发货${get_nowtime()}' 13 + shipmentsId: '意向订单发货${get_stringcode(5)}}'
14 id: ${convert_to_string($order_id)} 14 id: ${convert_to_string($order_id)}
15 productDetail: 15 productDetail:
16 - productName: '意向订单发货产品名称${get_stringcode(5)}' 16 - productName: '意向订单发货产品名称${get_stringcode(5)}'
@@ -2,7 +2,7 @@ config: @@ -2,7 +2,7 @@ config:
2 name: COM002-新增意向订单 2 name: COM002-新增意向订单
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 - orderId: '意向订单号${get_nowtime()}' 5 + orderId: '意向订单号${get_stringcode(5)}'
6 partnerID: 1047 6 partnerID: 1047
7 commissionProportion: 5 7 commissionProportion: 5
8 orderNum1: 100 8 orderNum1: 100
@@ -2,7 +2,7 @@ config: @@ -2,7 +2,7 @@ config:
2 name: ACT001-实际订单-各个值计算正确 2 name: ACT001-实际订单-各个值计算正确
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 - orderId: '意向订单号${get_nowtime()}' 5 + orderId: '意向订单号${get_stringcode(5)}'
6 partnerID: 1047 6 partnerID: 1047
7 commissionProportion: 5 7 commissionProportion: 5
8 orderNum1: 100 8 orderNum1: 100
@@ -2,7 +2,7 @@ config: @@ -2,7 +2,7 @@ config:
2 name: PUR002-意向订单-发货 2 name: PUR002-意向订单-发货
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 - orderId: '意向订单号${get_nowtime()}' 5 + orderId: '意向订单号${get_stringcode(5)}'
6 partnerID: 1047 6 partnerID: 1047
7 commissionProportion: 5 7 commissionProportion: 5
8 orderNum1: 100 8 orderNum1: 100
@@ -77,7 +77,7 @@ teststeps: @@ -77,7 +77,7 @@ teststeps:
77 - content.data.gridResult.lists.0.orderId 77 - content.data.gridResult.lists.0.orderId
78 - $orderId 78 - $orderId
79 79
80 -- name: 查看实际订单列表 80 +- name: 查看实际订单列表，存在刚刚新增的意向订单
81 api: api/m_api/actual/m_order_actual_partner_list_api.yml 81 api: api/m_api/actual/m_order_actual_partner_list_api.yml
82 extract: 82 extract:
83 - actual_id: content.data.gridResult.lists.0.id 83 - actual_id: content.data.gridResult.lists.0.id