bianxinhua / partner_api · 提交

转到一个项目

作者 dengyuting
提交 c8339e57b9686c0a977173de7cf6d2a243481489 1 个父辈 442c19b2

fix 20201215

内嵌 并排对比
正在显示 12 个修改的文件 包含 205 行增加 和 14 行删除
1 name: 删除实际订单 1 name: 删除实际订单
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - id: 1021 4 + id: 1586
5 request: 5 request:
6 headers: 6 headers:
7 Content-Type: application/json;charset=utf-8 7 Content-Type: application/json;charset=utf-8
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 - id: $id 11 + id: ${convert_to_string($id)}
12 method: POST 12 method: POST
13 url: /v1/order/actual/del 13 url: /v1/order/actual/del
14 validate: 14 validate:
  1 +name: 实际订单导出
  2 +base_url: ${ENV(base_manager_url)}
  3 +variables:
  4 + createTime: ['2020-01-01', '2020-12-31']
  5 + partnerCategory:
  6 + searchText: ""
  7 + updateTime: ['2020-01-01', '2020-12-31']
  8 +request:
  9 + headers:
  10 + Content-Type: application/json;charset=utf-8
  11 + User-Agent: okhttp/3.12.3
  12 + Authorization: Bearer ${get_m_accesstoken()}
  13 + json:
  14 + createTime: $createTime
  15 + partnerCategory: $partnerCategory
  16 + searchText: $searchText
  17 + updateTime: $updateTime
  18 + method: POST
  19 + url: /v1/order/actual/list/excel
  20 +#validate:
  21 +# - eq:
  22 +# - content.msg
  23 +# - ok
  1 +name: 分红管理—批量支付分红
  2 +base_url: ${ENV(base_manager_url)}
  3 +variables:
  4 + orderIds:
  5 + - '1'
  6 + - '2'
  7 + - '3'
  8 + - '4'
  9 +teardown_hooks:
  10 + - ${sleep(1)}
  11 +request:
  12 + headers:
  13 + Content-Type: application/json;charset=utf-8
  14 + User-Agent: okhttp/3.12.3
  15 + Authorization: Bearer ${get_m_accesstoken()}
  16 + json:
  17 + orderIds: $orderIds
  18 + method: POST
  19 + url: /v1/dividends/payDividends/batch
  20 +# extract:
  21 +# - num: content.data.gridResult.totalRow
  22 +validate:
  23 + - eq:
  24 + - content.msg
  25 + - ok
@@ -23,6 +23,8 @@ teststeps: @@ -23,6 +23,8 @@ teststeps:
23 23
24 - name: 新增实发订单 24 - name: 新增实发订单
25 api: api/m_api/actual/m_add_order_actual_api.yml 25 api: api/m_api/actual/m_add_order_actual_api.yml
  26 + extract:
  27 + - orderid: content.data.id
26 validate: 28 validate:
27 - eq: 29 - eq:
28 - content.msg 30 - content.msg
@@ -33,12 +35,12 @@ teststeps: @@ -33,12 +35,12 @@ teststeps:
33 extract: 35 extract:
34 - actual_id: content.data.gridResult.lists.0.id 36 - actual_id: content.data.gridResult.lists.0.id
35 validate: 37 validate:
36 -# - eq:  
37 -# - content.data.gridResult.lists.0.shipmentsId  
38 -# - $shipmentsId  
39 - - eq:  
40 - - content.msg  
41 - - ok 38 + - eq:
  39 + - content.data.gridResult.lists.0.id
  40 + - ${convert_to_string($orderid)}
  41 + - eq:
  42 + - content.msg
  43 + - ok
42 44
43 - name: 查看实际订单详情 45 - name: 查看实际订单详情
44 variables: 46 variables:
@@ -48,6 +48,10 @@ teststeps: @@ -48,6 +48,10 @@ teststeps:
48 - eq: 48 - eq:
49 - content.data.product.detail.0.commodityPrice 49 - content.data.product.detail.0.commodityPrice
50 - 1500 50 - 1500
  51 + #####产品1总数量
  52 + - eq:
  53 + - content.data.product.detail.0.orderNum
  54 + - $orderNum1
51 #####产品1应收分红 55 #####产品1应收分红
52 - eq: 56 - eq:
53 - content.data.product.detail.0.partnerDividends 57 - content.data.product.detail.0.partnerDividends
@@ -60,6 +64,10 @@ teststeps: @@ -60,6 +64,10 @@ teststeps:
60 - eq: 64 - eq:
61 - content.data.product.detail.1.commodityPrice 65 - content.data.product.detail.1.commodityPrice
62 - 3000 66 - 3000
  67 + #####产品2总数量
  68 + - eq:
  69 + - content.data.product.detail.1.orderNum
  70 + - $orderNum2
63 #####产品2应收分红 71 #####产品2应收分红
64 - eq: 72 - eq:
65 - content.data.product.detail.1.partnerDividends 73 - content.data.product.detail.1.partnerDividends
@@ -29,7 +29,7 @@ teststeps: @@ -29,7 +29,7 @@ teststeps:
29 - name: 查看分红列表 29 - name: 查看分红列表
30 api: api/m_api/dividends/m_dividends_list_api.yml 30 api: api/m_api/dividends/m_dividends_list_api.yml
31 validate: 31 validate:
32 - #####已支付状态=1 32 + #####等待支付状态=1
33 - eq: 33 - eq:
34 - content.data.gridResult.lists.0.stateOfPayment 34 - content.data.gridResult.lists.0.stateOfPayment
35 - 1 35 - 1
@@ -45,6 +45,10 @@ teststeps: @@ -45,6 +45,10 @@ teststeps:
45 - eq: 45 - eq:
46 - content.data.gridResult.lists.0.uncollectedDividends 46 - content.data.gridResult.lists.0.uncollectedDividends
47 - ${convert_to_string(375)} 47 - ${convert_to_string(375)}
  48 + #####分红支出
  49 + - eq:
  50 + - content.data.gridResult.lists.0.dividendSpending
  51 + - ${convert_to_string(0)}
48 52
49 53
50 - name: 查看该订单的分红详情 54 - name: 查看该订单的分红详情
@@ -24,7 +24,7 @@ teststeps: @@ -24,7 +24,7 @@ teststeps:
24 - name: 查看分红列表 24 - name: 查看分红列表
25 api: api/m_api/dividends/m_dividends_list_api.yml 25 api: api/m_api/dividends/m_dividends_list_api.yml
26 validate: 26 validate:
27 - #####已支付状态=1 27 + #####已支付状态=2
28 - eq: 28 - eq:
29 - content.data.gridResult.lists.0.stateOfPayment 29 - content.data.gridResult.lists.0.stateOfPayment
30 - 2 30 - 2
@@ -40,6 +40,10 @@ teststeps: @@ -40,6 +40,10 @@ teststeps:
40 - eq: 40 - eq:
41 - content.data.gridResult.lists.0.uncollectedDividends 41 - content.data.gridResult.lists.0.uncollectedDividends
42 - ${convert_to_string(300)} 42 - ${convert_to_string(300)}
  43 + #####分红支出
  44 + - eq:
  45 + - content.data.gridResult.lists.0.dividendSpending
  46 + - ${convert_to_string(0)}
43 47
44 48
45 - name: 查看该订单的分红详情 49 - name: 查看该订单的分红详情
  1 +config:
  2 + name: DIV009-分红管理-自建订单调整分红比例，系统提示‘操作失败’
  3 + base_url: ${ENV(base_manager_url)}
  4 +
  5 +teststeps:
  6 +- name: 新增实际订单
  7 + testcase: testcases/common/COM001_actual_add_testcases.yml
  8 + output:
  9 + - actual_id
  10 + - product_id_1
  11 + - product_id_2
  12 +
  13 +- name: 编辑分红-自建订单，调整分红比例
  14 + variables:
  15 + goodNumber: 100
  16 + orderId: ${convert_to_string($actual_id)}
  17 + state: 2
  18 + partnerBonusPercent: 20
  19 + reason: '修改原因${get_stringcode(5)}'
  20 + productId: ${convert_to_string($product_id_1)}
  21 + api: api/m_api/dividends/m_dividends_modify_api.yml
  22 + validate:
  23 + - eq:
  24 + - content.msg
  25 + - '操作失败'
@@ -19,6 +19,8 @@ teststeps: @@ -19,6 +19,8 @@ teststeps:
19 19
20 - name: 新增实发订单 20 - name: 新增实发订单
21 api: api/m_api/actual/m_add_order_actual_api.yml 21 api: api/m_api/actual/m_add_order_actual_api.yml
  22 + extract:
  23 + - orderid: content.data.id
22 validate: 24 validate:
23 - eq: 25 - eq:
24 - content.msg 26 - content.msg
@@ -29,16 +31,23 @@ teststeps: @@ -29,16 +31,23 @@ teststeps:
29 extract: 31 extract:
30 - actual_id: content.data.gridResult.lists.0.id 32 - actual_id: content.data.gridResult.lists.0.id
31 validate: 33 validate:
32 -# - eq:  
33 -# - content.data.gridResult.lists.0.shipmentsId  
34 -# - $shipmentsId 34 + - eq:
  35 + - content.data.gridResult.lists.0.id
  36 + - ${convert_to_string($orderid)}
35 - eq: 37 - eq:
36 - content.msg 38 - content.msg
37 - ok 39 - ok
  40 + - eq:
  41 + - content.data.gridResult.lists.0.orderNum
  42 + - ${add($orderNum1,$orderNum2)}
  43 + - eq:
  44 + - content.data.gridResult.lists.0.orderPrice
  45 + - 4500
  46 +
38 47
39 - name: 查看实际订单详情 48 - name: 查看实际订单详情
40 variables: 49 variables:
41 - id: ${convert_to_string($actual_id)} 50 + id: ${convert_to_string($orderid)}
42 api: api/m_api/actual/m_order_actual_detail_api.yml 51 api: api/m_api/actual/m_order_actual_detail_api.yml
43 validate: 52 validate:
44 - eq: 53 - eq:
  1 +config:
  2 + name: ACT002-删除订单成功
  3 + base_url: ${ENV(base_manager_url)}
  4 + variables:
  5 + partnerID: 1047
  6 + commissionProportion: 5
  7 + orderNum1: 100
  8 + univalence: 15
  9 + partnerRatio: 10
  10 + orderNum2: 200
  11 +# univalence2: 15
  12 +# partnerRatio2: 20
  13 +
  14 +teststeps:
  15 +- name: $phone 登录系统
  16 + variables:
  17 + phone: ${ENV(adminphone)}
  18 + testcase: testcases/common/m_login_testcases.yml
  19 +
  20 +- name: 新增实发订单
  21 + api: api/m_api/actual/m_add_order_actual_api.yml
  22 + extract:
  23 + - orderid: content.data.id
  24 + validate:
  25 + - eq:
  26 + - content.msg
  27 + - ok
  28 +
  29 +- name: 查看实际订单列表
  30 + api: api/m_api/actual/m_order_actual_list_api.yml
  31 + extract:
  32 + - actual_id: content.data.gridResult.lists.0.id
  33 + validate:
  34 + - eq:
  35 + - content.data.gridResult.lists.0.id
  36 + - ${convert_to_string($orderid)}
  37 + - eq:
  38 + - content.msg
  39 + - ok
  40 +
  41 +- name: 删除实发订单
  42 + variables:
  43 + id: $orderid
  44 + api: api/m_api/actual/m_order_actual_del_api.yml
  45 + validate:
  46 + - eq:
  47 + - content.msg
  48 + - ok
  49 +
  50 +- name: 查看实际订单列表
  51 + api: api/m_api/actual/m_order_actual_list_api.yml
  52 + extract:
  53 + - actual_id: content.data.gridResult.lists.0.id
  54 + validate:
  55 + - not_equals:
  56 + - content.data.gridResult.lists.0.id
  57 + - ${convert_to_string($orderid)}
  58 + - eq:
  59 + - content.msg
  60 + - ok
  1 +config:
  2 + name: ACT003-实际订单导出
  3 + base_url: ${ENV(base_manager_url)}
  4 + variables:
  5 + partnerID: 1047
  6 + commissionProportion: 5
  7 + orderNum1: 100
  8 + univalence: 15
  9 + partnerRatio: 10
  10 + orderNum2: 200
  11 +# univalence2: 15
  12 +# partnerRatio2: 20
  13 +
  14 +teststeps:
  15 +- name: $phone 登录系统
  16 + variables:
  17 + phone: ${ENV(adminphone)}
  18 + testcase: testcases/common/m_login_testcases.yml
  19 +
  20 +- name: 实发订单导出
  21 + api: api/m_api/actual/m_order_actual_excel_api.yml
  22 +
@@ -35,11 +35,20 @@ testcases: @@ -35,11 +35,20 @@ testcases:
35 35
36 - name: DIV008-分红管理-产品1支付分红成功后，调整数量由100改为50，数据正确 36 - name: DIV008-分红管理-产品1支付分红成功后，调整数量由100改为50，数据正确
37 testcase: testcases/dividends/DIV008_dividends_payDividends_editnum_testcases.yml 37 testcase: testcases/dividends/DIV008_dividends_payDividends_editnum_testcases.yml
  38 +
  39 +- name: DIV009-分红管理-自建订单调整分红比例，系统提示‘操作失败’
  40 + testcase: testcases/dividends/DIV009_dividends_editnum_testcases.yml
38 ############################分红管理模块结束################################## 41 ############################分红管理模块结束##################################
39 42
40 - name: ACT001-实际订单-各个值计算正确 43 - name: ACT001-实际订单-各个值计算正确
41 testcase: testcases/order/actual/ACT001_actual_detail_testcases.yml 44 testcase: testcases/order/actual/ACT001_actual_detail_testcases.yml
42 45
  46 +- name: ACT002-删除订单成功
  47 + testcase: testcases/order/actual/ACT002_actual_del_testcases.yml
  48 +
  49 +- name: ACT003-实际订单导出
  50 + testcase: testcases/order/actual/ACT003_actual_excel_testcases.yml
  51 +
43 #- name: PUR001-意向订单-各个值计算正确（已废弃） 52 #- name: PUR001-意向订单-各个值计算正确（已废弃）
44 # testcase: testcases/order/purpose/PUR001_pur_detail_testcases.yml 53 # testcase: testcases/order/purpose/PUR001_pur_detail_testcases.yml
45 # 54 #