作者 dengyuting

fix

@@ -22,8 +22,8 @@ teststeps: @@ -22,8 +22,8 @@ teststeps:
22 api: api/m_api/dividends/m_dividends_detail_api.yml 22 api: api/m_api/dividends/m_dividends_detail_api.yml
23 validate: 23 validate:
24 - eq: 24 - eq:
25 - - content.data.order.id  
26 - - ${convert_to_string($actual_id)} 25 + - content.data.order.orderId
  26 + - $actual_id
27 #####合伙人应收分红总额 27 #####合伙人应收分红总额
28 - eq: 28 - eq:
29 - content.data.order.partnerDividends 29 - content.data.order.partnerDividends
@@ -39,34 +39,34 @@ teststeps: @@ -39,34 +39,34 @@ teststeps:
39 #####合伙人分红支出总额 39 #####合伙人分红支出总额
40 - eq: 40 - eq:
41 - content.data.order.dividendSpending 41 - content.data.order.dividendSpending
42 - - 0 42 + - ${convert_to_string(0)}
43 #####订单类型 43 #####订单类型
44 - eq: 44 - eq:
45 - content.data.order.orderType 45 - content.data.order.orderType
46 - 1 46 - 1
47 #####产品1总金额 47 #####产品1总金额
48 - eq: 48 - eq:
49 - - content.data.product.0.detail.commodityPrice 49 + - content.data.product.detail.0.commodityPrice
50 - ${convert_to_string(1500)} 50 - ${convert_to_string(1500)}
51 #####产品1应收分红 51 #####产品1应收分红
52 - eq: 52 - eq:
53 - - content.data.product.0.detail.partnerDividends 53 + - content.data.product.detail.0.partnerDividends
54 - ${cal_Ratio($partnerRatio, $univalence, $orderNum1)} 54 - ${cal_Ratio($partnerRatio, $univalence, $orderNum1)}
55 #####产品1分红状态 55 #####产品1分红状态
56 - eq: 56 - eq:
57 - - content.data.product.0.paymentStatus 57 + - content.data.product.detail.0.paymentStatus
58 - 1 58 - 1
59 #####产品2总金额 59 #####产品2总金额
60 - eq: 60 - eq:
61 - - content.data.product.1.detail.commodityPrice 61 + - content.data.product.detail.1.commodityPrice
62 - ${convert_to_string(3000)} 62 - ${convert_to_string(3000)}
63 #####产品2应收分红 63 #####产品2应收分红
64 - eq: 64 - eq:
65 - - content.data.product.1.detail.partnerDividends 65 + - content.data.product.detail.1.partnerDividends
66 - ${cal_Ratio($partnerRatio, $univalence, $orderNum2)} 66 - ${cal_Ratio($partnerRatio, $univalence, $orderNum2)}
67 #####产品2分红状态 67 #####产品2分红状态
68 - eq: 68 - eq:
69 - - content.data.product.1.stateOfPayment 69 + - content.data.product.detail.1.paymentStatus
70 - 1 70 - 1
71 #####订单总数量 71 #####订单总数量
72 - eq: 72 - eq:
@@ -53,7 +53,7 @@ teststeps: @@ -53,7 +53,7 @@ teststeps:
53 api: api/m_api/dividends/m_dividends_detail_api.yml 53 api: api/m_api/dividends/m_dividends_detail_api.yml
54 validate: 54 validate:
55 - eq: 55 - eq:
56 - - content.data.order.id 56 + - content.data.order.orderId
57 - ${convert_to_string($actual_id)} 57 - ${convert_to_string($actual_id)}
58 #####合伙人未收分红总额 58 #####合伙人未收分红总额
59 - eq: 59 - eq:
@@ -157,7 +157,7 @@ teststeps: @@ -157,7 +157,7 @@ teststeps:
157 - 1500 157 - 1500
158 - eq: 158 - eq:
159 - content.data.product.0.quantityControl 159 - content.data.product.0.quantityControl
160 - - $goodNumber 160 + - ${convert_to_string($goodNumber)}
161 - eq: 161 - eq:
162 - content.data.product.0.priceControl 162 - content.data.product.0.priceControl
163 - ${convert_to_string(750)} 163 - ${convert_to_string(750)}
@@ -48,7 +48,7 @@ teststeps: @@ -48,7 +48,7 @@ teststeps:
48 api: api/m_api/dividends/m_dividends_detail_api.yml 48 api: api/m_api/dividends/m_dividends_detail_api.yml
49 validate: 49 validate:
50 - eq: 50 - eq:
51 - - content.data.order.id 51 + - content.data.order.orderId
52 - ${convert_to_string($actual_id)} 52 - ${convert_to_string($actual_id)}
53 #####合伙人应收分红总额 53 #####合伙人应收分红总额
54 - eq: 54 - eq:
@@ -57,7 +57,7 @@ teststeps: @@ -57,7 +57,7 @@ teststeps:
57 - ${convert_to_string(300)} 57 - ${convert_to_string(300)}
58 #####分红支出 58 #####分红支出
59 - eq: 59 - eq:
60 - - content.data.gridResult.lists.0.uncollectedDividends 60 + - content.data.gridResult.lists.0.dividendSpending
61 - ${convert_to_string(75)} 61 - ${convert_to_string(75)}
62 62
63 63
@@ -12,23 +12,23 @@ testcases: @@ -12,23 +12,23 @@ testcases:
12 #- name: DIV002-分红列表-数据源不来自于意向订单 12 #- name: DIV002-分红列表-数据源不来自于意向订单
13 # testcase: testcases/dividends/DIV002_dividendslist_testcases.yml 13 # testcase: testcases/dividends/DIV002_dividendslist_testcases.yml
14 14
15 -- name: DIV003-分红管理-初始状态-各个值计算正确(旧接口)  
16 - testcase: testcases/dividends/DIV003_dividends_cal_testcases.yml 15 +#- name: DIV003-分红管理-初始状态-各个值计算正确(旧接口)
  16 +# testcase: testcases/dividends/DIV003_dividends_cal_testcases.yml
17 17
18 - name: DIV003_1-分红管理-初始状态-各个值计算正确 18 - name: DIV003_1-分红管理-初始状态-各个值计算正确
19 testcase: testcases/dividends/DIV003_1_dividends_cal_testcases.yml 19 testcase: testcases/dividends/DIV003_1_dividends_cal_testcases.yml
20 20
21 -- name: DIV004-分红管理-调整数量由100改为50-各个值计算正确(旧接口)  
22 - testcase: testcases/dividends/DIV004_dividends_editnum_testcases.yml 21 +#- name: DIV004-分红管理-调整数量由100改为50-各个值计算正确(旧接口)
  22 +# testcase: testcases/dividends/DIV004_dividends_editnum_testcases.yml
23 23
24 - name: DIV004_1-分红管理-调整数量由100改为50-各个值计算正确 24 - name: DIV004_1-分红管理-调整数量由100改为50-各个值计算正确
25 testcase: testcases/dividends/DIV004_1_dividends_editnum_testcases.yml 25 testcase: testcases/dividends/DIV004_1_dividends_editnum_testcases.yml
26 26
27 -- name: DIV005-分红管理-调整数量由100改为50-更改支付状态-各个值计算正确(旧接口)  
28 - testcase: testcases/dividends/DIV005_dividends_edit_num_pay_testcases.yml 27 +#- name: DIV005-分红管理-调整数量由100改为50-更改支付状态-各个值计算正确(旧接口)
  28 +# testcase: testcases/dividends/DIV005_dividends_edit_num_pay_testcases.yml
29 29
30 -- name: DIV006-分红管理-已支付订单数量减少(旧接口)  
31 - testcase: testcases/dividends/DIV006_dividends_edit_num_testcases.yml 30 +#- name: DIV006-分红管理-已支付订单数量减少(旧接口)
  31 +# testcase: testcases/dividends/DIV006_dividends_edit_num_testcases.yml
32 32
33 - name: DIV007-分红管理-产品1支付分红成功,数据正确 33 - name: DIV007-分红管理-产品1支付分红成功,数据正确
34 testcase: testcases/dividends/DIV007_dividends_payDividends_testcases.yml 34 testcase: testcases/dividends/DIV007_dividends_payDividends_testcases.yml