bianxinhua / partner_api · 提交

转到一个项目

作者 dengyuting
提交 80321ce31b4b06d6fa5d8d1236cd8165144483ba 1 个父辈 cb9f475d

调整

内嵌 并排对比
正在显示 12 个修改的文件 包含 137 行增加 和 87 行删除
@@ -4,11 +4,11 @@ variables: @@ -4,11 +4,11 @@ variables:
4 partnerID: 1047 4 partnerID: 1047
5 commissionProportion: 5 5 commissionProportion: 5
6 orderNum1: 100 6 orderNum1: 100
7 - univalence1: 15  
8 - partnerRatio1: 10 7 + univalence: 10
  8 + partnerRatio: 10
9 orderNum2: 200 9 orderNum2: 200
10 - univalence2: 15  
11 - partnerRatio2: 20 10 +# univalence2: 15
  11 +# partnerRatio2: 20
12 teardown_hooks: 12 teardown_hooks:
13 - ${sleep(2)} 13 - ${sleep(2)}
14 request: 14 request:
@@ -26,12 +26,12 @@ request: @@ -26,12 +26,12 @@ request:
26 product: 26 product:
27 - productName: 产品名称${get_stringcode(5)} 27 - productName: 产品名称${get_stringcode(5)}
28 orderNum: $orderNum1 28 orderNum: $orderNum1
29 - univalence: $univalence1  
30 - partnerRatio: $partnerRatio1 29 + univalence: $univalence
  30 + partnerRatio: $partnerRatio
31 - productName: 产品名称${get_stringcode(5)} 31 - productName: 产品名称${get_stringcode(5)}
32 orderNum: $orderNum2 32 orderNum: $orderNum2
33 - univalence: $univalence2  
34 - partnerRatio: $partnerRatio2 33 + univalence: $univalence
  34 + partnerRatio: $partnerRatio
35 method: POST 35 method: POST
36 url: /v1/order/actual/update 36 url: /v1/order/actual/update
37 validate: 37 validate:
@@ -5,11 +5,10 @@ variables: @@ -5,11 +5,10 @@ variables:
5 partnerID: 1047 5 partnerID: 1047
6 commissionProportion: 5 6 commissionProportion: 5
7 orderNum1: 100 7 orderNum1: 100
8 - univalence1: 15  
9 - partnerRatio1: 10 8 + univalence: 15
  9 + partnerRatio: 10
10 orderNum2: 200 10 orderNum2: 200
11 - univalence2: 15  
12 - partnerRatio2: 20 11 +# partnerRatio2: 20
13 teardown_hooks: 12 teardown_hooks:
14 - ${sleep(2)} 13 - ${sleep(2)}
15 request: 14 request:
@@ -26,12 +25,12 @@ request: @@ -26,12 +25,12 @@ request:
26 product: 25 product:
27 - productName: 产品名称${get_stringcode(5)} 26 - productName: 产品名称${get_stringcode(5)}
28 orderNum: $orderNum1 27 orderNum: $orderNum1
29 - univalence: $univalence1  
30 - partnerRatio: $partnerRatio1 28 + univalence: $univalence
  29 + partnerRatio: $partnerRatio
31 - productName: 产品名称${get_stringcode(5)} 30 - productName: 产品名称${get_stringcode(5)}
32 orderNum: $orderNum2 31 orderNum: $orderNum2
33 - univalence: $univalence2  
34 - partnerRatio: $partnerRatio2 32 + univalence: $univalence
  33 + partnerRatio: $partnerRatio
35 # - productName: 产品名称${get_second()} 34 # - productName: 产品名称${get_second()}
36 # orderNum: 3 35 # orderNum: 3
37 # univalence: 3.22 36 # univalence: 3.22
@@ -11,45 +11,57 @@ from random import randint @@ -11,45 +11,57 @@ from random import randint
11 # from helpfunc.pg_app_db_func import * 11 # from helpfunc.pg_app_db_func import *
12 from datetime import date, timedelta 12 from datetime import date, timedelta
13 import datetime 13 import datetime
  14 +from helpfunc.cal_func import *
  15 +
14 16
15 def sleep(n_secs): 17 def sleep(n_secs):
16 time.sleep(n_secs) 18 time.sleep(n_secs)
17 19
  20 +
18 def convert_to_string(value): 21 def convert_to_string(value):
19 return str(value) 22 return str(value)
20 23
  24 +
21 def get_nowtime(): 25 def get_nowtime():
22 return time.strftime("%Y%m%d%H%M%S",time.localtime(time.time())) 26 return time.strftime("%Y%m%d%H%M%S",time.localtime(time.time()))
23 27
  28 +
24 def get_today(): 29 def get_today():
25 now_today = datetime.datetime.now() 30 now_today = datetime.datetime.now()
26 str_time = now_today.strftime("%Y-%m-%d") 31 str_time = now_today.strftime("%Y-%m-%d")
27 return str_time 32 return str_time
28 33
  34 +
29 def get_tomorrow(): 35 def get_tomorrow():
30 tomorrow = (date.today() + timedelta(days=1)).strftime("%Y-%m-%d") 36 tomorrow = (date.today() + timedelta(days=1)).strftime("%Y-%m-%d")
31 return tomorrow 37 return tomorrow
32 38
  39 +
33 def get_second(): 40 def get_second():
34 curr_time = datetime.datetime.now() 41 curr_time = datetime.datetime.now()
35 return curr_time.second 42 return curr_time.second
36 43
  44 +
37 def create_channel(num): 45 def create_channel(num):
38 channel = [] 46 channel = []
39 for i in range(num+1): 47 for i in range(num+1):
40 channel.append(i) 48 channel.append(i)
41 return channel 49 return channel
42 50
  51 +
43 def get_minute(): 52 def get_minute():
44 i = datetime.datetime.now() 53 i = datetime.datetime.now()
45 return i.minute 54 return i.minute
46 55
  56 +
47 def create_phone_number(num): 57 def create_phone_number(num):
48 phone_number = [] 58 phone_number = []
49 for i in range(num): 59 for i in range(num):
50 number = random.randint(0,9) 60 number = random.randint(0,9)
51 phone_number.append('1%d%d%07d'%(get_minute(),number+1,number)) 61 phone_number.append('1%d%d%07d'%(get_minute(),number+1,number))
52 return phone_number 62 return phone_number
  63 +
  64 +
53 def getMonth(): 65 def getMonth():
54 year = str(datetime.date.today().year) 66 year = str(datetime.date.today().year)
55 d = datetime.date.today() 67 d = datetime.date.today()
@@ -76,14 +88,20 @@ def getMonth(): @@ -76,14 +88,20 @@ def getMonth():
76 list = [startTime, endTime] 88 list = [startTime, endTime]
77 return list 89 return list
78 list_time = getMonth() 90 list_time = getMonth()
  91 +
  92 +
79 def get_starTimestamp(): 93 def get_starTimestamp():
80 return int(time.mktime(time.strptime(list_time[0], '%Y-%m-%d %H:%M:%S'))*1000) 94 return int(time.mktime(time.strptime(list_time[0], '%Y-%m-%d %H:%M:%S'))*1000)
  95 +
  96 +
81 def get_endTimestamp(): 97 def get_endTimestamp():
82 return int(time.mktime(time.strptime(list_time[1], '%Y-%m-%d %H:%M:%S'))*1000) 98 return int(time.mktime(time.strptime(list_time[1], '%Y-%m-%d %H:%M:%S'))*1000)
83 99
  100 +
84 def get_January_timestamp(): 101 def get_January_timestamp():
85 return int(time.mktime(time.strptime('2020-04-01 00:00:00', '%Y-%m-%d %H:%M:%S'))*1000) 102 return int(time.mktime(time.strptime('2020-04-01 00:00:00', '%Y-%m-%d %H:%M:%S'))*1000)
86 103
  104 +
87 def get_Decembe_timestamp(): 105 def get_Decembe_timestamp():
88 return int(time.mktime(time.strptime('2021-3-31 23:59:59', '%Y-%m-%d %H:%M:%S'))*1000) 106 return int(time.mktime(time.strptime('2021-3-31 23:59:59', '%Y-%m-%d %H:%M:%S'))*1000)
89 107
@@ -110,16 +128,6 @@ def get_randint(value1, value2): @@ -110,16 +128,6 @@ def get_randint(value1, value2):
110 return randint(value1, value2) 128 return randint(value1, value2)
111 129
112 130
113 -def add(x, y):  
114 - """  
115 - 对两个数相加  
116 - :param x:  
117 - :param y:  
118 - :return:  
119 - """  
120 - return int(int(x)+y)  
121 -  
122 -  
123 def convert_to_string(value): 131 def convert_to_string(value):
124 return str(value) 132 return str(value)
125 133
  1 +# @Time :2020/10/22 9:43
  2 +# @Author :dengyuting
  3 +# @File :cal_func.py
  4 +
  5 +
  6 +# 计算产品总价
  7 +def cal_orderPrice(univalence, *args):
  8 + sum = 0
  9 + for num in args:
  10 + sum = sum + univalence * num
  11 + return sum
  12 +
  13 +
  14 +def cal_Ratio(ratio, univalence, *args):
  15 + price = cal_orderPrice(univalence, *args)
  16 + sum = ratio/100 * price
  17 + return sum
  18 +
  19 +
  20 +def add(x, y):
  21 + """
  22 + 对两个数相加
  23 + :param x:
  24 + :param y:
  25 + :return:
  26 + """
  27 + return int(int(x)+y)
@@ -18,6 +18,23 @@ def teardown_hook_get_accesstoken(response): @@ -18,6 +18,23 @@ def teardown_hook_get_accesstoken(response):
18 print('写入失败', e) 18 print('写入失败', e)
19 return access_token 19 return access_token
20 20
  21 +
  22 +def teardown_hook_get_m_accesstoken(response):
  23 + print(response.status_code)
  24 + if response.status_code == 200:
  25 + jsondata = json.loads(response.text)
  26 + access_token = jsondata['data']['access']['accessToken']
  27 + try:
  28 + # 保存token到文件
  29 + with open('config/m_accessToken.csv','w+') as f:
  30 + f.write(access_token)
  31 + print('写入成功，access_token：{}'.format(access_token))
  32 + f.close()
  33 + except Exception as e:
  34 + print('写入失败', e)
  35 + return access_token
  36 +
  37 +
21 def teardown_hook_get_refreshtoken(response): 38 def teardown_hook_get_refreshtoken(response):
22 if response.status_code == 200: 39 if response.status_code == 200:
23 jsondata = json.loads(response.text) 40 jsondata = json.loads(response.text)
@@ -32,6 +49,7 @@ def teardown_hook_get_refreshtoken(response): @@ -32,6 +49,7 @@ def teardown_hook_get_refreshtoken(response):
32 print('写入失败', e) 49 print('写入失败', e)
33 return refresh_token 50 return refresh_token
34 51
  52 +
35 def teardown_hook_get_m_refreshtoken(response): 53 def teardown_hook_get_m_refreshtoken(response):
36 if response.status_code == 200: 54 if response.status_code == 200:
37 jsondata = json.loads(response.text) 55 jsondata = json.loads(response.text)
@@ -46,6 +64,7 @@ def teardown_hook_get_m_refreshtoken(response): @@ -46,6 +64,7 @@ def teardown_hook_get_m_refreshtoken(response):
46 print('写入失败', e) 64 print('写入失败', e)
47 return m_refresh_token 65 return m_refresh_token
48 66
  67 +
49 def teardown_hook_get_authcode(response): 68 def teardown_hook_get_authcode(response):
50 if response.status_code == 200: 69 if response.status_code == 200:
51 jsondata = json.loads(response.text) 70 jsondata = json.loads(response.text)
@@ -60,20 +79,6 @@ def teardown_hook_get_authcode(response): @@ -60,20 +79,6 @@ def teardown_hook_get_authcode(response):
60 print('写入失败', e) 79 print('写入失败', e)
61 return authCode 80 return authCode
62 81
63 -def teardown_hook_get_m_accesstoken(response):  
64 - print(response.status_code)  
65 - if response.status_code == 200:  
66 - jsondata = json.loads(response.text)  
67 - access_token = jsondata['data']['access']['accessToken']  
68 - try:  
69 - # 保存token到文件  
70 - with open('config/m_accessToken.csv','w+') as f:  
71 - f.write(access_token)  
72 - print('写入成功，access_token：{}'.format(access_token))  
73 - f.close()  
74 - except Exception as e:  
75 - print('写入失败', e)  
76 - return access_token  
77 82
78 def get_accesstoken(): 83 def get_accesstoken():
79 try: 84 try:
@@ -86,6 +91,7 @@ def get_accesstoken(): @@ -86,6 +91,7 @@ def get_accesstoken():
86 accseetoken_value = str(accseetoken_value) 91 accseetoken_value = str(accseetoken_value)
87 return accseetoken_value 92 return accseetoken_value
88 93
  94 +
89 def get_m_accesstoken(): 95 def get_m_accesstoken():
90 try: 96 try:
91 with open('config/m_accessToken.csv','r') as f: 97 with open('config/m_accessToken.csv','r') as f:
@@ -98,6 +104,7 @@ def get_m_accesstoken(): @@ -98,6 +104,7 @@ def get_m_accesstoken():
98 authorization = 'bearer ' + accseetoken_value 104 authorization = 'bearer ' + accseetoken_value
99 return authorization 105 return authorization
100 106
  107 +
101 def get_m_refreshtoken(): 108 def get_m_refreshtoken():
102 try: 109 try:
103 with open('config/m_refresh_token.csv','r') as f: 110 with open('config/m_refresh_token.csv','r') as f:
@@ -110,6 +117,7 @@ def get_m_refreshtoken(): @@ -110,6 +117,7 @@ def get_m_refreshtoken():
110 authorization = 'bear ' + m_refreshtoken_value 117 authorization = 'bear ' + m_refreshtoken_value
111 return authorization 118 return authorization
112 119
  120 +
113 def get_refreshtoken(): 121 def get_refreshtoken():
114 try: 122 try:
115 with open('config/refreshToken.csv','r') as f: 123 with open('config/refreshToken.csv','r') as f:
@@ -121,6 +129,7 @@ def get_refreshtoken(): @@ -121,6 +129,7 @@ def get_refreshtoken():
121 refreshtoken_value = str(refreshtoken_value) 129 refreshtoken_value = str(refreshtoken_value)
122 return refreshtoken_value 130 return refreshtoken_value
123 131
  132 +
124 def get_authcode(): 133 def get_authcode():
125 try: 134 try:
126 with open('config/authCode.csv','r') as f: 135 with open('config/authCode.csv','r') as f:
@@ -5,11 +5,10 @@ config: @@ -5,11 +5,10 @@ config:
5 partnerID: 1047 5 partnerID: 1047
6 commissionProportion: 5 6 commissionProportion: 5
7 orderNum1: 100 7 orderNum1: 100
8 - univalence1: 15  
9 - partnerRatio1: 10 8 + univalence: 15
  9 + partnerRatio: 10
10 orderNum2: 200 10 orderNum2: 200
11 - univalence2: 15  
12 - partnerRatio2: 20 11 +# partnerRatio2: 20
13 output: 12 output:
14 - actual_id 13 - actual_id
15 - product_id_1 14 - product_id_1
@@ -54,10 +53,10 @@ teststeps: @@ -54,10 +53,10 @@ teststeps:
54 - ${add($orderNum1,$orderNum2)} 53 - ${add($orderNum1,$orderNum2)}
55 - eq: 54 - eq:
56 - content.data.orderAmountAdjustmentCount 55 - content.data.orderAmountAdjustmentCount
57 - - 4500 56 + - ${cal_orderPrice($univalence, $orderNum1, $orderNum2)}
58 - eq: 57 - eq:
59 - content.data.product.0.orderPrice 58 - content.data.product.0.orderPrice
60 - - 1500 59 + - ${cal_orderPrice($univalence, $orderNum1)}
61 - eq: 60 - eq:
62 - content.data.product.1.orderPrice 61 - content.data.product.1.orderPrice
63 - - 3000  
  62 + - ${cal_orderPrice($univalence, $orderNum2)}
1 config: 1 config:
2 name: DIV003-事业分红详情-初始状态-各个值计算正确 2 name: DIV003-事业分红详情-初始状态-各个值计算正确
3 base_url: ${ENV(base_manager_url)} 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 +# partnerRatio2: 20
4 12
5 teststeps: 13 teststeps:
6 - name: 新增实际订单 14 - name: 新增实际订单
@@ -19,35 +27,35 @@ teststeps: @@ -19,35 +27,35 @@ teststeps:
19 #####总数量 27 #####总数量
20 - eq: 28 - eq:
21 - content.data.dividendCount.orderNum 29 - content.data.dividendCount.orderNum
22 - - 300 30 + - ${add($orderNum1,$orderNum2)}
23 #####总金额 31 #####总金额
24 - eq: 32 - eq:
25 - content.data.dividendCount.orderAmountAdjustment 33 - content.data.dividendCount.orderAmountAdjustment
26 - - 4500 34 + - ${cal_orderPrice($univalence, $orderNum1, $orderNum2)}
27 ####业务员抽成 35 ####业务员抽成
28 - eq: 36 - eq:
29 - content.data.dividendCount.expectedCommission 37 - content.data.dividendCount.expectedCommission
30 - - 225 38 + - ${cal_Ratio($commissionProportion, $univalence, $orderNum1, $orderNum2)}
31 #####合伙人应收分红总额 39 #####合伙人应收分红总额
32 - eq: 40 - eq:
33 - content.data.dividendCount.partnerDividends 41 - content.data.dividendCount.partnerDividends
34 - - 750 42 + - ${cal_Ratio($partnerRatio, $univalence, $orderNum1, $orderNum2)}
35 #####合伙人未收分红总额 43 #####合伙人未收分红总额
36 - eq: 44 - eq:
37 - content.data.dividendCount.notReceivedDividend 45 - content.data.dividendCount.notReceivedDividend
38 - - 750 46 + - ${cal_Ratio($partnerRatio, $univalence, $orderNum1, $orderNum2)}
39 #####产品1总金额 47 #####产品1总金额
40 - eq: 48 - eq:
41 - content.data.product.0.detail.orderPrice 49 - content.data.product.0.detail.orderPrice
42 - - 1500 50 + - ${cal_orderPrice($univalence, $orderNum1)}
43 #####产品1应收分红 51 #####产品1应收分红
44 - eq: 52 - eq:
45 - content.data.product.0.detail.partnerDividendsReceivable 53 - content.data.product.0.detail.partnerDividendsReceivable
46 - - 150 54 + - ${cal_Ratio($partnerRatio, $univalence, $orderNum1)}
47 #####产品1未收分红 55 #####产品1未收分红
48 - eq: 56 - eq:
49 - content.data.product.0.notReceivedDividend 57 - content.data.product.0.notReceivedDividend
50 - - 150 58 + - ${cal_Ratio($partnerRatio, $univalence, $orderNum1)}
51 #####产品1分红状态 59 #####产品1分红状态
52 - eq: 60 - eq:
53 - content.data.product.0.stateOfPayment 61 - content.data.product.0.stateOfPayment
@@ -55,15 +63,15 @@ teststeps: @@ -55,15 +63,15 @@ teststeps:
55 #####产品2总金额 63 #####产品2总金额
56 - eq: 64 - eq:
57 - content.data.product.1.detail.orderPrice 65 - content.data.product.1.detail.orderPrice
58 - - 3000 66 + - ${cal_orderPrice($univalence, $orderNum2)}
59 #####产品2应收分红 67 #####产品2应收分红
60 - eq: 68 - eq:
61 - content.data.product.1.detail.partnerDividendsReceivable 69 - content.data.product.1.detail.partnerDividendsReceivable
62 - - 600 70 + - ${cal_Ratio($partnerRatio, $univalence, $orderNum2)}
63 #####产品2未收分红 71 #####产品2未收分红
64 - eq: 72 - eq:
65 - content.data.product.1.notReceivedDividend 73 - content.data.product.1.notReceivedDividend
66 - - 600 74 + - ${cal_Ratio($partnerRatio, $univalence, $orderNum2)}
67 #####产品2分红状态 75 #####产品2分红状态
68 - eq: 76 - eq:
69 - content.data.product.1.stateOfPayment 77 - content.data.product.1.stateOfPayment
@@ -35,7 +35,7 @@ teststeps: @@ -35,7 +35,7 @@ teststeps:
35 ######应收分红 35 ######应收分红
36 - eq: 36 - eq:
37 - content.data.gridResult.lists.0.dividendsReceivable 37 - content.data.gridResult.lists.0.dividendsReceivable
38 - - ${convert_to_string(675)} 38 + - ${convert_to_string(375)}
39 #####已收分红 39 #####已收分红
40 - eq: 40 - eq:
41 - content.data.gridResult.lists.0.receiveDividends 41 - content.data.gridResult.lists.0.receiveDividends
@@ -43,7 +43,7 @@ teststeps: @@ -43,7 +43,7 @@ teststeps:
43 #####未收分红 43 #####未收分红
44 - eq: 44 - eq:
45 - content.data.gridResult.lists.0.uncollectedDividends 45 - content.data.gridResult.lists.0.uncollectedDividends
46 - - ${convert_to_string(675)} 46 + - ${convert_to_string(375)}
47 47
48 48
49 - name: 查看该订单的事业分红详情 49 - name: 查看该订单的事业分红详情
@@ -77,15 +77,15 @@ teststeps: @@ -77,15 +77,15 @@ teststeps:
77 #####合伙人应收分红总额 77 #####合伙人应收分红总额
78 - eq: 78 - eq:
79 - content.data.dividendCount.partnerDividends 79 - content.data.dividendCount.partnerDividends
80 - - 750 80 + - 450
81 #####合伙人应收分红总额调整 81 #####合伙人应收分红总额调整
82 - eq: 82 - eq:
83 - content.data.dividendCount.partnerDividendsControl 83 - content.data.dividendCount.partnerDividendsControl
84 - - ${convert_to_string(675)} 84 + - ${convert_to_string(375)}
85 #####合伙人未收分红总额 85 #####合伙人未收分红总额
86 - eq: 86 - eq:
87 - content.data.dividendCount.notReceivedDividend 87 - content.data.dividendCount.notReceivedDividend
88 - - 675 88 + - 375
89 #####合伙人已收分红总额 89 #####合伙人已收分红总额
90 - eq: 90 - eq:
91 - content.data.dividendCount.receivedDividends 91 - content.data.dividendCount.receivedDividends
@@ -129,11 +129,11 @@ teststeps: @@ -129,11 +129,11 @@ teststeps:
129 #####产品2应收分红 129 #####产品2应收分红
130 - eq: 130 - eq:
131 - content.data.product.1.detail.partnerDividendsReceivable 131 - content.data.product.1.detail.partnerDividendsReceivable
132 - - 600 132 + - 300
133 #####产品2未收分红 133 #####产品2未收分红
134 - eq: 134 - eq:
135 - content.data.product.1.notReceivedDividend 135 - content.data.product.1.notReceivedDividend
136 - - 600 136 + - 300
137 #####产品2分红状态 137 #####产品2分红状态
138 - eq: 138 - eq:
139 - content.data.product.1.stateOfPayment 139 - content.data.product.1.stateOfPayment
@@ -33,13 +33,13 @@ teststeps: @@ -33,13 +33,13 @@ teststeps:
33 - 2 33 - 2
34 - eq: 34 - eq:
35 - content.data.gridResult.lists.0.dividendsReceivable 35 - content.data.gridResult.lists.0.dividendsReceivable
36 - - ${convert_to_string(675)} 36 + - ${convert_to_string(375)}
37 - eq: 37 - eq:
38 - content.data.gridResult.lists.0.receiveDividends 38 - content.data.gridResult.lists.0.receiveDividends
39 - ${convert_to_string(75)} 39 - ${convert_to_string(75)}
40 - eq: 40 - eq:
41 - content.data.gridResult.lists.0.uncollectedDividends 41 - content.data.gridResult.lists.0.uncollectedDividends
42 - - ${convert_to_string(600)} 42 + - ${convert_to_string(300)}
43 43
44 44
45 - name: 查看该订单的事业分红详情 45 - name: 查看该订单的事业分红详情
@@ -73,15 +73,15 @@ teststeps: @@ -73,15 +73,15 @@ teststeps:
73 #####合伙人应收分红总额 73 #####合伙人应收分红总额
74 - eq: 74 - eq:
75 - content.data.dividendCount.partnerDividends 75 - content.data.dividendCount.partnerDividends
76 - - 750 76 + - 450
77 #####合伙人应收分红总额调整 77 #####合伙人应收分红总额调整
78 - eq: 78 - eq:
79 - content.data.dividendCount.partnerDividendsControl 79 - content.data.dividendCount.partnerDividendsControl
80 - - ${convert_to_string(675)} 80 + - ${convert_to_string(375)}
81 #####合伙人未收分红总额 81 #####合伙人未收分红总额
82 - eq: 82 - eq:
83 - content.data.dividendCount.notReceivedDividend 83 - content.data.dividendCount.notReceivedDividend
84 - - 600 84 + - 300
85 #####合伙人已收分红总额 85 #####合伙人已收分红总额
86 - eq: 86 - eq:
87 - content.data.dividendCount.receivedDividends 87 - content.data.dividendCount.receivedDividends
@@ -125,11 +125,11 @@ teststeps: @@ -125,11 +125,11 @@ teststeps:
125 #####产品2应收分红 125 #####产品2应收分红
126 - eq: 126 - eq:
127 - content.data.product.1.detail.partnerDividendsReceivable 127 - content.data.product.1.detail.partnerDividendsReceivable
128 - - 600 128 + - 300
129 #####产品2未收分红 129 #####产品2未收分红
130 - eq: 130 - eq:
131 - content.data.product.1.notReceivedDividend 131 - content.data.product.1.notReceivedDividend
132 - - 600 132 + - 300
133 #####产品2分红状态 133 #####产品2分红状态
134 - eq: 134 - eq:
135 - content.data.product.1.stateOfPayment 135 - content.data.product.1.stateOfPayment
@@ -46,7 +46,7 @@ teststeps: @@ -46,7 +46,7 @@ teststeps:
46 ####应收分红 46 ####应收分红
47 - eq: 47 - eq:
48 - content.data.gridResult.lists.0.dividendsReceivable 48 - content.data.gridResult.lists.0.dividendsReceivable
49 - - ${convert_to_string(690)} 49 + - ${convert_to_string(390)}
50 ####已收分红 50 ####已收分红
51 - eq: 51 - eq:
52 - content.data.gridResult.lists.0.receiveDividends 52 - content.data.gridResult.lists.0.receiveDividends
@@ -54,7 +54,7 @@ teststeps: @@ -54,7 +54,7 @@ teststeps:
54 ####未收分红 54 ####未收分红
55 - eq: 55 - eq:
56 - content.data.gridResult.lists.0.uncollectedDividends 56 - content.data.gridResult.lists.0.uncollectedDividends
57 - - ${convert_to_string(600)} 57 + - ${convert_to_string(300)}
58 ####分红支出 58 ####分红支出
59 - eq: 59 - eq:
60 - content.data.gridResult.lists.0.dividendSpending 60 - content.data.gridResult.lists.0.dividendSpending
@@ -92,15 +92,15 @@ teststeps: @@ -92,15 +92,15 @@ teststeps:
92 #####合伙人应收分红总额 92 #####合伙人应收分红总额
93 - eq: 93 - eq:
94 - content.data.dividendCount.partnerDividends 94 - content.data.dividendCount.partnerDividends
95 - - 750 95 + - 450
96 #####合伙人应收分红总额调整 96 #####合伙人应收分红总额调整
97 - eq: 97 - eq:
98 - content.data.dividendCount.partnerDividendsControl 98 - content.data.dividendCount.partnerDividendsControl
99 - - ${convert_to_string(690)} 99 + - ${convert_to_string(390)}
100 #####合伙人未收分红总额 100 #####合伙人未收分红总额
101 - eq: 101 - eq:
102 - content.data.dividendCount.notReceivedDividend 102 - content.data.dividendCount.notReceivedDividend
103 - - 600 103 + - 300
104 #####合伙人已收分红总额 104 #####合伙人已收分红总额
105 - eq: 105 - eq:
106 - content.data.dividendCount.receivedDividends 106 - content.data.dividendCount.receivedDividends
@@ -156,11 +156,11 @@ teststeps: @@ -156,11 +156,11 @@ teststeps:
156 #####产品2应收分红 156 #####产品2应收分红
157 - eq: 157 - eq:
158 - content.data.product.1.detail.partnerDividendsReceivable 158 - content.data.product.1.detail.partnerDividendsReceivable
159 - - 600 159 + - 300
160 #####产品2未收分红 160 #####产品2未收分红
161 - eq: 161 - eq:
162 - content.data.product.1.notReceivedDividend 162 - content.data.product.1.notReceivedDividend
163 - - 600 163 + - 300
164 #####产品2分红状态 164 #####产品2分红状态
165 - eq: 165 - eq:
166 - content.data.product.1.stateOfPayment 166 - content.data.product.1.stateOfPayment
@@ -5,11 +5,11 @@ config: @@ -5,11 +5,11 @@ config:
5 partnerID: 1047 5 partnerID: 1047
6 commissionProportion: 5 6 commissionProportion: 5
7 orderNum1: 100 7 orderNum1: 100
8 - univalence1: 15  
9 - partnerRatio1: 10 8 + univalence: 15
  9 + partnerRatio: 10
10 orderNum2: 200 10 orderNum2: 200
11 - univalence2: 15  
12 - partnerRatio2: 20 11 +# univalence2: 15
  12 +# partnerRatio2: 20
13 13
14 teststeps: 14 teststeps:
15 - name: $phone 登录系统 15 - name: $phone 登录系统
@@ -6,11 +6,11 @@ config: @@ -6,11 +6,11 @@ config:
6 partnerID: 1047 6 partnerID: 1047
7 commissionProportion: 5 7 commissionProportion: 5
8 orderNum1: 100 8 orderNum1: 100
9 - univalence1: 15  
10 - partnerRatio1: 10 9 + univalence: 15
  10 + partnerRatio: 10
11 orderNum2: 200 11 orderNum2: 200
12 - univalence2: 15  
13 - partnerRatio2: 20 12 +# univalence2: 15
  13 +# partnerRatio2: 20
14 14
15 teststeps: 15 teststeps:
16 - name: $phone 登录系统 16 - name: $phone 登录系统