bianxinhua / partner_api · 提交

转到一个项目

作者 bianxinhua
提交 191bee029d332c08008bbfd6642214dab72b4cd7 1 个父辈 096873a9

saleDate字段参数化及case合并调整

内嵌 并排对比
正在显示 55 个修改的文件 包含 185 行增加 和 1018 行删除
@@ -13,9 +13,7 @@ base_business_admin=http://suplus-business-admin-gateway-test.fjmaimaimai.com @@ -13,9 +13,7 @@ base_business_admin=http://suplus-business-admin-gateway-test.fjmaimaimai.com
13 companyId=214 13 companyId=214
14 adminphone=19911111111 14 adminphone=19911111111
15 partnerphone=15510101010 15 partnerphone=15510101010
16 -companyId_app=366  
17 -adminphone_app=19990000000  
18 -partnerId_app = 1040  
19 -visitorphone = 19990000011  
20 -managerphone = 19990000012 16 +partnerId = 1047
  17 +visitorphone = 15510101011
  18 +managerphone = 19911110001
21 id = 358 19 id = 358
@@ -7,7 +7,7 @@ variables: @@ -7,7 +7,7 @@ variables:
7 sign: ${make_sign($currtime, $uuid, $var_access_token)} 7 sign: ${make_sign($currtime, $uuid, $var_access_token)}
8 startTime: 0 8 startTime: 0
9 endTime: ${get_nowTimestamp_1()} 9 endTime: ${get_nowTimestamp_1()}
10 - partnerId: ${ENV(partnerId_app)} 10 + partnerId: ${ENV(partnerId)}
11 ###明细类型 11 ###明细类型
12 detailAction: ${convert_to_int($detailAction)} 12 detailAction: ${convert_to_int($detailAction)}
13 msg: 成功 13 msg: 成功
@@ -4,7 +4,7 @@ variables: @@ -4,7 +4,7 @@ variables:
4 currtime: ${make_time()} 4 currtime: ${make_time()}
5 uuid: ${make_uuid()} 5 uuid: ${make_uuid()}
6 access_token: '' 6 access_token: ''
7 - cid: ${ENV(companyId_app)} 7 + cid: ${ENV(companyId)}
8 sign: ${make_sign($currtime, $uuid, $access_token)} 8 sign: ${make_sign($currtime, $uuid, $access_token)}
9 clientId: pdf233Znkjo 9 clientId: pdf233Znkjo
10 request: 10 request:
@@ -5,7 +5,7 @@ variables: @@ -5,7 +5,7 @@ variables:
5 uuid: ${make_uuid()} 5 uuid: ${make_uuid()}
6 var_access_token: $accessToken 6 var_access_token: $accessToken
7 sign: ${make_sign($currtime, $uuid, $var_access_token)} 7 sign: ${make_sign($currtime, $uuid, $var_access_token)}
8 - partnerId: ${ENV(partnerId_app)} 8 + partnerId: ${ENV(partnerId)}
9 msg: 成功 9 msg: 成功
10 request: 10 request:
11 headers: 11 headers:
1 -name: 实际订单新增  
2 -base_url: ${ENV(base_manager_url)}  
3 -variables:  
4 - partnerID: ${ENV(partnerId_app)}  
5 - commissionProportion: 0  
6 - orderNum1: 100  
7 - univalence: 10  
8 - partnerRatio: 1.2  
9 - orderNum2: 200  
10 -  
11 -teardown_hooks:  
12 - - ${sleep(2)}  
13 -request:  
14 - headers:  
15 - Content-Type: application/json;charset=utf-8  
16 - User-Agent: okhttp/3.12.3  
17 - Authorization: Bearer ${get_m_accesstoken()}  
18 - json:  
19 - orderId: $partnerCategory-实发订单号${get_stringcode(5)}  
20 - shipmentsId: $partnerCategory-实发订单发货单号${get_stringcode(5)}  
21 - partnerID: ${convert_to_int($partnerID)}  
22 - partnerCategoryId: $partnerCategoryId  
23 - buyer: '客户名称${get_stringcode(5)}'  
24 - orderDist: '订单区域${get_stringcode(5)}'  
25 - commissionProportion: $commissionProportion  
26 - saleDate: $saleDate  
27 - product:  
28 - - productName: 产品名称${get_stringcode(5)}  
29 - orderNum: $orderNum1  
30 - univalence: $univalence  
31 - partnerRatio: $partnerRatio  
32 - - productName: 产品名称${get_stringcode(5)}  
33 - orderNum: $orderNum2  
34 - univalence: $univalence  
35 - partnerRatio: $partnerRatio  
36 - method: POST  
37 - url: /v1/order/actual/update  
38 -validate:  
39 - - eq:  
40 - - content.msg  
41 - - ok  
1 name: 实际订单新增 1 name: 实际订单新增
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - partnerID: 1047 4 + partnerID: ${ENV(partnerId)}
5 commissionProportion: 5 5 commissionProportion: 5
6 orderNum1: 100 6 orderNum1: 100
7 univalence: 10 7 univalence: 10
@@ -23,12 +23,12 @@ request: @@ -23,12 +23,12 @@ request:
23 json: 23 json:
24 orderId: $orderId 24 orderId: $orderId
25 shipmentsId: $shipmentsId 25 shipmentsId: $shipmentsId
26 - partnerID: $partnerID 26 + partnerID: ${convert_to_int($partnerID)}
27 partnerCategoryId: $partnerCategoryId 27 partnerCategoryId: $partnerCategoryId
28 buyer: '客户名称${get_stringcode(5)}' 28 buyer: '客户名称${get_stringcode(5)}'
29 orderDist: '订单区域${get_stringcode(5)}' 29 orderDist: '订单区域${get_stringcode(5)}'
30 commissionProportion: $commissionProportion 30 commissionProportion: $commissionProportion
31 - saleDate: '2020-10-10 00:00:00' 31 + saleDate: $saleDate
32 product: 32 product:
33 - productName: $productName 33 - productName: $productName
34 orderNum: $orderNum1 34 orderNum: $orderNum1
@@ -22,7 +22,7 @@ request: @@ -22,7 +22,7 @@ request:
22 area: '合伙人所属区域${get_stringcode(5)}' 22 area: '合伙人所属区域${get_stringcode(5)}'
23 account: 155${get_randint(10000000,99999999)} 23 account: 155${get_randint(10000000,99999999)}
24 state: 1 24 state: 1
25 - cooperationTime: ${get_today()} 25 + cooperationTime: ${get_now()}
26 salesmanName: '业务员姓名${get_stringcode(5)}' 26 salesmanName: '业务员姓名${get_stringcode(5)}'
27 phone: 155${get_randint(10000000,99999999)} 27 phone: 155${get_randint(10000000,99999999)}
28 remark: '系统自动添加' 28 remark: '系统自动添加'
@@ -17,7 +17,7 @@ request: @@ -17,7 +17,7 @@ request:
17 area: '合伙人所属区域修改${get_stringcode(5)}' 17 area: '合伙人所属区域修改${get_stringcode(5)}'
18 account: 155${get_randint(10000000,99999999)} 18 account: 155${get_randint(10000000,99999999)}
19 state: 0 19 state: 0
20 - cooperationTime: ${get_today()} 20 + cooperationTime: ${get_now()}
21 salesmanName: '业务员姓名修改${get_stringcode(5)}' 21 salesmanName: '业务员姓名修改${get_stringcode(5)}'
22 phone: 155${get_randint(10000000,99999999)} 22 phone: 155${get_randint(10000000,99999999)}
23 id: $id 23 id: $id
1 -eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2MTM5MzkzMjgsImlhdCI6MTYxMzg5NjEyOCwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTYxMzg5NjEyOCwidWlkIjozMjQ3MzY2MDExOTEzMjE2LCJjb21wYW55SWQiOjM2Nn0.08OJFyJ2zo-iwyV5YbE_9BN17C0iklZ8Dv849c1Nhfs  
  1 +eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2MTQwODk0NjMsImlhdCI6MTYxNDA0NjI2MywiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTYxNDA0NjI2MywidWlkIjozMjQyMzEyOTU1MTM1NzQ0LCJjb21wYW55SWQiOjIxNH0.g72J0Cyp-EYq9iWlNWW7WWWmkyr63ojR90T2G_F04Ts
1 -4629,  
  1 +4972,4973,4974,4975,4976,
@@ -3,9 +3,8 @@ import string @@ -3,9 +3,8 @@ import string
3 import os 3 import os
4 import time,datetime 4 import time,datetime
5 from urllib import parse 5 from urllib import parse
6 - 6 +from helpfunc.pg_app_db_func import *
7 from helpfunc.login_func import * 7 from helpfunc.login_func import *
8 -from helpfunc.pg_db_func import *  
9 from helpfunc.other_func import * 8 from helpfunc.other_func import *
10 # from helpfunc.db_func import * 9 # from helpfunc.db_func import *
11 from helpfunc.statistics_func import * 10 from helpfunc.statistics_func import *
@@ -28,28 +27,33 @@ def convert_to_int(value): @@ -28,28 +27,33 @@ def convert_to_int(value):
28 return int(value) 27 return int(value)
29 28
30 29
31 -def get_nowtime():  
32 - return time.strftime("%Y%m%d%H%M%S",time.localtime(time.time()))  
33 -  
34 -def get_today(): 30 +def get_now():
35 now_today = datetime.datetime.now() 31 now_today = datetime.datetime.now()
36 str_time = now_today.strftime("%Y-%m-%d") 32 str_time = now_today.strftime("%Y-%m-%d")
37 return str_time 33 return str_time
38 34
  35 +def get_today():
  36 + now_today = datetime.datetime.now()
  37 + str_time = now_today.strftime('%Y-%m-%d %H:%M:%S')
  38 + return str_time
39 def get_tomorrow(): 39 def get_tomorrow():
40 - tomorrow = (date.today() + timedelta(days=1)).strftime("%Y-%m-%d") 40 + tomorrow = (date.today() + timedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S')
41 return tomorrow 41 return tomorrow
42 -#获取今天时间并转str  
43 -def today_time_str():  
44 - curr_time = datetime.datetime.now()  
45 - time_str = datetime.datetime.strftime(curr_time,'%Y-%m-%d %H:%M:%S')  
46 - return time_str 42 +
  43 +# # #获取今天时间并转str
  44 +# def today_time_str():
  45 +# curr_time = datetime.datetime.now()
  46 +# zeroToday = curr_time - datetime.timedelta(hours=curr_time.hour, minutes=curr_time.minute, seconds=curr_time.second,
  47 +# microseconds=curr_time.microsecond)
  48 +# time_str = datetime.datetime.strftime(zeroToday,'%Y-%m-%d %H:%M:%S')
  49 +# return time_str
  50 +# print(today_time_str())
47 #获取明天时间并转str 51 #获取明天时间并转str
48 -def tomorrow_time_str():  
49 - curr_time = datetime.datetime.now()  
50 - tomorrow_time = curr_time + datetime.timedelta(days=1)  
51 - time_str = datetime.datetime.strftime(tomorrow_time,'%Y-%m-%d %H:%M:%S')  
52 - return time_str 52 +# def tomorrow_time_str():
  53 +# curr_time = datetime.datetime.now()
  54 +# tomorrow_time = curr_time + datetime.timedelta(days=1)
  55 +# time_str = datetime.datetime.strftime(tomorrow_time,'%Y-%m-%d %H:%M:%S')
  56 +# return time_str
53 #获取昨天时间并转str 57 #获取昨天时间并转str
54 def yes_time_str(): 58 def yes_time_str():
55 curr_time = datetime.datetime.now() 59 curr_time = datetime.datetime.now()
@@ -110,6 +114,7 @@ list_time = getMonth() @@ -110,6 +114,7 @@ list_time = getMonth()
110 ###获取当月1号时间戳 114 ###获取当月1号时间戳
111 def get_starTimestamp(): 115 def get_starTimestamp():
112 return int(time.mktime(time.strptime(list_time[0], '%Y-%m-%d %H:%M:%S'))*1000) 116 return int(time.mktime(time.strptime(list_time[0], '%Y-%m-%d %H:%M:%S'))*1000)
  117 +
113 ###获取当月最后一天时间戳 118 ###获取当月最后一天时间戳
114 def get_endTimestamp(): 119 def get_endTimestamp():
115 return int(time.mktime(time.strptime(list_time[1], '%Y-%m-%d %H:%M:%S'))*1000) 120 return int(time.mktime(time.strptime(list_time[1], '%Y-%m-%d %H:%M:%S'))*1000)
@@ -168,16 +173,6 @@ def get_partnerCategory(n): @@ -168,16 +173,6 @@ def get_partnerCategory(n):
168 def get_randint(value1, value2): 173 def get_randint(value1, value2):
169 return randint(value1, value2) 174 return randint(value1, value2)
170 175
171 -  
172 -def convert_to_string(value):  
173 - return str(value)  
174 -  
175 -  
176 -def convert_to_int(value):  
177 - return int(value)  
178 -  
179 -  
180 -  
181 #获取季度对应的月份 176 #获取季度对应的月份
182 def getql(): 177 def getql():
183 today=datetime.date.today() 178 today=datetime.date.today()
@@ -7,44 +7,37 @@ import psycopg2 @@ -7,44 +7,37 @@ import psycopg2
7 from datetime import date, timedelta 7 from datetime import date, timedelta
8 import datetime,time 8 import datetime,time
9 9
10 -def get_today():  
11 - now_today = datetime.datetime.now()  
12 - str_time = now_today.strftime("%Y-%m-%d")  
13 - return str_time 10 +# def getMonth():
  11 +# year = str(datetime.date.today().year)
  12 +# d = datetime.date.today()
  13 +# month = '%02d' % d.month
  14 +# if month in ['01', '03', '05', '07', '08', '10', '12']:
  15 +# s = str("-01 00:00:00")
  16 +# e = str("-31 23:59:59")
  17 +# startTime = year + "-" + str(month) + s
  18 +# endTime = year + "-" + str(month) + e
  19 +# list = [startTime, endTime]
  20 +# return list
  21 +# elif month == '02':
  22 +# s = str("-01 00:00:00")
  23 +# e = str("-28 23:59:59")
  24 +# startTime = year + "-" + str(month) + s
  25 +# endTime = year + "-" + str(month) + e
  26 +# list = [startTime, endTime]
  27 +# return list
  28 +# else:
  29 +# s = str("-01 00:00:00")
  30 +# e = str("-30 23:59:59")
  31 +# startTime = year + "-" + str(month) + s
  32 +# endTime = year + "-" + str(month) + e
  33 +# list = [startTime, endTime]
  34 +# return list
  35 +# list_time = getMonth()
  36 +# def get_starTimestamp():
  37 +# return list_time[0]
  38 +# def get_endTimestamp():
  39 +# return list_time[1]
14 40
15 -def get_tomorrow():  
16 - tomorrow = (date.today() + timedelta(days=1)).strftime("%Y-%m-%d")  
17 - return tomorrow  
18 -def getMonth():  
19 - year = str(datetime.date.today().year)  
20 - d = datetime.date.today()  
21 - month = '%02d' % d.month  
22 - if month in ['01', '03', '05', '07', '08', '10', '12']:  
23 - s = str("-01 00:00:00")  
24 - e = str("-31 23:59:59")  
25 - startTime = year + "-" + str(month) + s  
26 - endTime = year + "-" + str(month) + e  
27 - list = [startTime, endTime]  
28 - return list  
29 - elif month == '02':  
30 - s = str("-01 00:00:00")  
31 - e = str("-28 23:59:59")  
32 - startTime = year + "-" + str(month) + s  
33 - endTime = year + "-" + str(month) + e  
34 - list = [startTime, endTime]  
35 - return list  
36 - else:  
37 - s = str("-01 00:00:00")  
38 - e = str("-30 23:59:59")  
39 - startTime = year + "-" + str(month) + s  
40 - endTime = year + "-" + str(month) + e  
41 - list = [startTime, endTime]  
42 - return list  
43 -list_time = getMonth()  
44 -def get_starTimestamp():  
45 - return list_time[0]  
46 -def get_endTimestamp():  
47 - return list_time[1]  
48 # 获得连接 41 # 获得连接
49 def GetConnect(): 42 def GetConnect():
50 conn = False 43 conn = False
@@ -57,3 +50,28 @@ def GetConnect(): @@ -57,3 +50,28 @@ def GetConnect():
57 except Exception as err: 50 except Exception as err:
58 print("连接数据库失败，%s" % err) 51 print("连接数据库失败，%s" % err)
59 return conn 52 return conn
  53 +
  54 +# 清除数据
  55 +def setup_hook_clean_db(companyid):
  56 + """
  57 + 初始化时清理数据库中对应公司的历史数据
  58 + :return:
  59 + """
  60 + db = GetConnect()
  61 + cursor = db.cursor()
  62 + companyid = str(companyid)
  63 +
  64 + try:
  65 + cursor.execute('delete from order_base where company_id=' + companyid)
  66 + db.commit()
  67 + cursor.execute('delete from order_good where company_id=' + companyid)
  68 + db.commit()
  69 + # cursor.execute('delete from partner_info where company_id=' + companyid + 'and id <> 1047')
  70 + # db.commit()
  71 + print("delete OK")
  72 + except Exception as err:
  73 + # 发生错误时回滚
  74 + print("this is:", err)
  75 + db.rollback()
  76 + db.close()
  77 +
1 -#! /usr/bin/env python  
2 -# -*- coding: utf-8 -*-  
3 -# Date: 2020/7/12 16:27  
4 -# @Author:bxh  
5 -# @file: pg_db_func.py  
6 -import psycopg2  
7 -  
8 -  
9 -# 获得连接  
10 -def GetConnect():  
11 - conn = False  
12 - try:  
13 - conn = psycopg2.connect(database="partner_test",  
14 - user="bianxinhua",  
15 - password="bianxinhua_123",  
16 - host="114.55.200.59",  
17 - port="31543")  
18 - except Exception as err:  
19 - print("连接数据库失败，%s" % err)  
20 - return conn  
21 -  
22 -  
23 -# 清除数据  
24 -def setup_hook_clean_db(companyid):  
25 - """  
26 - 初始化时清理数据库中对应公司的历史数据  
27 - :return:  
28 - """  
29 - db = GetConnect()  
30 - cursor = db.cursor()  
31 - companyid = str(companyid)  
32 -  
33 - try:  
34 - cursor.execute('delete from order_base where company_id=' + companyid)  
35 - db.commit()  
36 - cursor.execute('delete from order_good where company_id=' + companyid)  
37 - db.commit()  
38 - print("delete OK")  
39 - except Exception as err:  
40 - # 发生错误时回滚  
41 - print("this is:", err)  
42 - db.rollback()  
43 - db.close()  
44 -  
@@ -28,6 +28,7 @@ def get_statistics(*args_v): @@ -28,6 +28,7 @@ def get_statistics(*args_v):
28 def statistics_func(keys,*args_v): 28 def statistics_func(keys,*args_v):
29 # print("====================args_v===============================") 29 # print("====================args_v===============================")
30 # print(args_v) 30 # print(args_v)
  31 + # print(keys)
31 value = [] 32 value = []
32 num = 0 33 num = 0
33 for i in range(len(args_v)): 34 for i in range(len(args_v)):
@@ -44,6 +45,8 @@ def statistics_func(keys,*args_v): @@ -44,6 +45,8 @@ def statistics_func(keys,*args_v):
44 # print('num=',num) 45 # print('num=',num)
45 return num 46 return num
46 47
  48 +
  49 +
47 #统计订单金额 50 #统计订单金额
48 def statistics_actual_func(keys,*args_v): 51 def statistics_actual_func(keys,*args_v):
49 # print("====================args_v===============================") 52 # print("====================args_v===============================")
1 { 1 {
2 "testcase":[ 2 "testcase":[
3 - "testcases/dividends/DIV001_dividendslist_testcases.yml" 3 + "testcases/partners/PARTNERS006_partner_remove.yml"
4 ] 4 ]
5 } 5 }
此 diff 太大无法显示。
@@ -3,7 +3,7 @@ config: @@ -3,7 +3,7 @@ config:
3 base_url: ${ENV(base_url)} 3 base_url: ${ENV(base_url)}
4 variables: 4 variables:
5 phone: ${ENV(managerphone)} 5 phone: ${ENV(managerphone)}
6 - id: ${ENV(companyId_app)} 6 + id: ${ENV(companyId)}
7 msg: '成功' 7 msg: '成功'
8 # 8 #
9 teststeps: 9 teststeps:
@@ -2,8 +2,8 @@ config: @@ -2,8 +2,8 @@ config:
2 name: APP多公司高管登录 2 name: APP多公司高管登录
3 base_url: ${ENV(base_url)} 3 base_url: ${ENV(base_url)}
4 variables: 4 variables:
5 - phone: ${ENV(adminphone_app)}  
6 - id: ${ENV(companyId_app)} 5 + phone: ${ENV(adminphone)}
  6 + id: ${ENV(companyId)}
7 msg: '成功' 7 msg: '成功'
8 # 8 #
9 teststeps: 9 teststeps:
@@ -13,7 +13,7 @@ teststeps: @@ -13,7 +13,7 @@ teststeps:
13 validate: 13 validate:
14 - length_equals: 14 - length_equals:
15 - content.data.center.partner.companys 15 - content.data.center.partner.companys
16 - - 3 16 + - 0
17 - length_equals: 17 - length_equals:
18 - content.data.center.manager 18 - content.data.center.manager
19 - 3 19 - 3
@@ -2,7 +2,7 @@ config: @@ -2,7 +2,7 @@ config:
2 name: APP登录用例 2 name: APP登录用例
3 base_url: ${ENV(base_url)} 3 base_url: ${ENV(base_url)}
4 variables: 4 variables:
5 - phone: ${ENV(adminphone_app)} 5 + phone: ${ENV(partnerphone)}
6 msg: '成功' 6 msg: '成功'
7 output: 7 output:
8 - accessToken 8 - accessToken
1 config: 1 config:
2 name: COMP001-企业统计值正确 2 name: COMP001-企业统计值正确
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 - 4 + variables:
  5 + phone: ${ENV(adminphone)}
5 6
6 teststeps: 7 teststeps:
7 8
8 -- name: $phone 登录天联共创app端系统 9 +- name: 登录天联共创app端系统
9 ####身份类型 1：合伙人 2：高管 10 ####身份类型 1：合伙人 2：高管
10 variables: 11 variables:
11 idType: ${convert_to_int(2)} 12 idType: ${convert_to_int(2)}
@@ -15,7 +16,6 @@ teststeps: @@ -15,7 +16,6 @@ teststeps:
15 16
16 - name: 查看企业统计 17 - name: 查看企业统计
17 api: api/app_api/company/statistics_api.yml 18 api: api/app_api/company/statistics_api.yml
18 -  
19 extract: 19 extract:
20 quarters: content.data.statistics 20 quarters: content.data.statistics
21 totalCount: content.data.statistics.totalCount 21 totalCount: content.data.statistics.totalCount
@@ -26,11 +26,11 @@ teststeps: @@ -26,11 +26,11 @@ teststeps:
26 ####合伙人支出 26 ####合伙人支出
27 - eq: 27 - eq:
28 - ${get_statistics(careerDividend,businessDividend,developDividend,appDividend,$quarters)} 28 - ${get_statistics(careerDividend,businessDividend,developDividend,appDividend,$quarters)}
29 - - 2136 29 + - 1950
30 ####订单金额 30 ####订单金额
31 - eq: 31 - eq:
32 - ${get_statistics(careerOrdersMoney,businessOrdersMoney,developOrdersMoney,appOrdersMoney,$quarters)} 32 - ${get_statistics(careerOrdersMoney,businessOrdersMoney,developOrdersMoney,appOrdersMoney,$quarters)}
33 - - 25500 33 + - 21000
34 34
35 - name: 查看企业合伙人列表 35 - name: 查看企业合伙人列表
36 variables: 36 variables:
1 config: 1 config:
2 name: COMP001-按照类型过滤，查看合伙人列表，数据正确 2 name: COMP001-按照类型过滤，查看合伙人列表，数据正确
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 - 4 + variables:
  5 + phone: ${ENV(adminphone)}
5 6
6 teststeps: 7 teststeps:
7 8
8 -- name: $phone 登录天联共创app端系统 9 +- name: 登录天联共创app端系统
9 ####身份类型 1：合伙人 2：高管 10 ####身份类型 1：合伙人 2：高管
10 variables: 11 variables:
11 idType: ${convert_to_int(2)} 12 idType: ${convert_to_int(2)}
1 config: 1 config:
2 name: DIVI001-事业-初始状态-统计值正确 2 name: DIVI001-事业-初始状态-统计值正确
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 -# variables: 4 +
5 # partnerCategoryId: 1 5 # partnerCategoryId: 1
6 # orderType: 1 6 # orderType: 1
7 7
8 8
9 teststeps: 9 teststeps:
10 - name: 登录天联共创管理后台系统-分红列表-数据源来自于实发订单(业务合伙) 10 - name: 登录天联共创管理后台系统-分红列表-数据源来自于实发订单(业务合伙)
11 - testcase: testcases/dividends/DIV001_app_dividendslist_testcases.yml 11 + variables:
  12 + saleDate: ${get_today()}
  13 + partnerCategoryId: 2
  14 + testcase: testcases/dividends/DIV001_dividendslist_testcases.yml
12 15
13 - name: 登录天联共创管理后台系统-分红管理-初始状态-各个值计算正确 16 - name: 登录天联共创管理后台系统-分红管理-初始状态-各个值计算正确
14 - testcase: testcases/dividends/DIV003_1_app_dividends_cal_testcases.yml  
15 -# 17 + variables:
  18 + partnerCategoryId: 1
  19 + testcase: testcases/dividends/DIV003_1_dividends_cal_testcases.yml
  20 +
16 - name: 查看实际订单列表 21 - name: 查看实际订单列表
17 api: api/m_api/actual/m_order_actual_list_api.yml 22 api: api/m_api/actual/m_order_actual_list_api.yml
18 extract: 23 extract:
@@ -22,7 +27,7 @@ teststeps: @@ -22,7 +27,7 @@ teststeps:
22 output: 27 output:
23 - career_actual_list 28 - career_actual_list
24 - career_partnerCategory 29 - career_partnerCategory
25 -# 30 +
26 - name: 查看事业分红列表 31 - name: 查看事业分红列表
27 variables: 32 variables:
28 partnerCategoryId: 1 33 partnerCategoryId: 1
@@ -80,7 +85,7 @@ teststeps: @@ -80,7 +85,7 @@ teststeps:
80 testcase: testcases/app/common/app_login_testcases.yml 85 testcase: testcases/app/common/app_login_testcases.yml
81 output: 86 output:
82 - accessToken 87 - accessToken
83 -# 88 +
84 - name: 查看分红统计 89 - name: 查看分红统计
85 api: api/app_api/dividend/statistics_api.yml 90 api: api/app_api/dividend/statistics_api.yml
86 extract: 91 extract:
@@ -116,15 +121,15 @@ teststeps: @@ -116,15 +121,15 @@ teststeps:
116 - name: 查看订单统计 121 - name: 查看订单统计
117 api: api/app_api/order/statistics_api.yml 122 api: api/app_api/order/statistics_api.yml
118 validate: 123 validate:
119 -# ###今日新增实发订单 124 + ###今日新增实发订单
120 - eq: 125 - eq:
121 - content.data.career.todayRealQuantity 126 - content.data.career.todayRealQuantity
122 - $career_totalRow 127 - $career_totalRow
123 -# ####今日新增实发订单金额 128 + ####今日新增实发订单金额
124 - eq: 129 - eq:
125 - content.data.career.todayRealMoney 130 - content.data.career.todayRealMoney
126 - ${statistics_actual_func($career_partnerCategory,$career_actual_list)} 131 - ${statistics_actual_func($career_partnerCategory,$career_actual_list)}
127 -# ###累计实发订单 132 + ###累计实发订单
128 - eq: 133 - eq:
129 - content.data.career.cumulativeQuantity 134 - content.data.career.cumulativeQuantity
130 - $career_totalRow 135 - $career_totalRow
@@ -3,18 +3,22 @@ config: @@ -3,18 +3,22 @@ config:
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 4
5 5
  6 +
6 teststeps: 7 teststeps:
7 - name: 登录天联共创管理后台系统-分红管理-调整数量由100改为50-各个值计算正确 8 - name: 登录天联共创管理后台系统-分红管理-调整数量由100改为50-各个值计算正确
8 - testcase: testcases/dividends/DIV004_1_app_dividends_editnum_testcases.yml 9 + variables:
  10 + partnerCategoryId: 1
  11 + testcase: testcases/dividends/DIV004_1_dividends_editnum_testcases.yml
9 12
10 - name: 登录天联共创管理后台系统-分红管理-产品1支付分红成功，数据正确 13 - name: 登录天联共创管理后台系统-分红管理-产品1支付分红成功，数据正确
11 - testcase: testcases/dividends/DIV007_app_dividends_payDividends_testcases.yml 14 + variables:
  15 + partnerCategoryId: 1
  16 + testcase: testcases/dividends/DIV007_dividends_payDividends_testcases.yml
12 17
13 - name: 登录天联共创管理后台系统--分红管理-产品1支付分红成功后，调整数量由100改为50，数据正确 18 - name: 登录天联共创管理后台系统--分红管理-产品1支付分红成功后，调整数量由100改为50，数据正确
14 - testcase: testcases/dividends/DIV008_app_dividends_payDividends_editnum_testcases.yml  
15 -  
16 -- name: 登录天联共创管理后台系统--分红管理-批量支付分红成功，数据正确  
17 - testcase: testcases/dividends/DIV010_app_dividends_payDividends_batch_testcases.yml 19 + variables:
  20 + partnerCategoryId: 1
  21 + testcase: testcases/dividends/DIV008_dividends_payDividends_editnum_testcases.yml
18 22
19 - name: 查看实际订单列表 23 - name: 查看实际订单列表
20 api: api/m_api/actual/m_order_actual_list_api.yml 24 api: api/m_api/actual/m_order_actual_list_api.yml
@@ -51,7 +55,7 @@ teststeps: @@ -51,7 +55,7 @@ teststeps:
51 business_lists: content.data.gridResult.lists 55 business_lists: content.data.gridResult.lists
52 output: 56 output:
53 - business_lists 57 - business_lists
54 -# 58 +
55 - name: 查看研发分红列表 59 - name: 查看研发分红列表
56 variables: 60 variables:
57 partnerCategoryId: 3 61 partnerCategoryId: 3
@@ -63,7 +67,7 @@ teststeps: @@ -63,7 +67,7 @@ teststeps:
63 develop_lists: content.data.gridResult.lists 67 develop_lists: content.data.gridResult.lists
64 output: 68 output:
65 - develop_lists 69 - develop_lists
66 -# 70 +
67 - name: 查看业务-产品应用分红列表 71 - name: 查看业务-产品应用分红列表
68 variables: 72 variables:
69 partnerCategoryId: 4 73 partnerCategoryId: 4
@@ -95,7 +99,7 @@ teststeps: @@ -95,7 +99,7 @@ teststeps:
95 - eq: 99 - eq:
96 - content.data.statistics.receivable 100 - content.data.statistics.receivable
97 - ${statistics_func(dividendsReceivable,$career_lists,$business_lists,$develop_lists,$applicationOrders_lists)} 101 - ${statistics_func(dividendsReceivable,$career_lists,$business_lists,$develop_lists,$applicationOrders_lists)}
98 -### ####累计所有年份已收分红 102 + ####累计所有年份已收分红
99 - eq: 103 - eq:
100 - content.data.statistics.received 104 - content.data.statistics.received
101 - ${statistics_func(receiveDividends,$career_lists,$business_lists,$develop_lists,$applicationOrders_lists)} 105 - ${statistics_func(receiveDividends,$career_lists,$business_lists,$develop_lists,$applicationOrders_lists)}
@@ -6,8 +6,8 @@ config: @@ -6,8 +6,8 @@ config:
6 teststeps: 6 teststeps:
7 - name: 登录天联共创管理后台系统 7 - name: 登录天联共创管理后台系统
8 variables: 8 variables:
9 - phone: ${ENV(adminphone_app)}  
10 - testcase: testcases/common/m_app_login_testcases.yml 9 + phone: ${ENV(adminphone)}
  10 + testcase: testcases/common/m_login_testcases.yml
11 11
12 - name: 查看事业分红列表 12 - name: 查看事业分红列表
13 variables: 13 variables:
@@ -4,7 +4,7 @@ config: @@ -4,7 +4,7 @@ config:
4 4
5 5
6 teststeps: 6 teststeps:
7 -- name: $phone 登录天联共创app端系统 7 +- name: 登录天联共创app端系统
8 ####身份类型 1：合伙人 2：高管 8 ####身份类型 1：合伙人 2：高管
9 variables: 9 variables:
10 idType: ${convert_to_int(1)} 10 idType: ${convert_to_int(1)}
@@ -6,8 +6,8 @@ teststeps: @@ -6,8 +6,8 @@ teststeps:
6 6
7 - name: 登录天联共创管理后台系统 7 - name: 登录天联共创管理后台系统
8 variables: 8 variables:
9 - phone: ${ENV(adminphone_app)}  
10 - testcase: testcases/common/m_app_login_testcases.yml 9 + phone: ${ENV(adminphone)}
  10 + testcase: testcases/common/m_login_testcases.yml
11 11
12 - name: 登录天联共创管理后台系统-查看事业分红列表 12 - name: 登录天联共创管理后台系统-查看事业分红列表
13 variables: 13 variables:
@@ -2,13 +2,13 @@ config: @@ -2,13 +2,13 @@ config:
2 name: COM001-新增明日实际订单 2 name: COM001-新增明日实际订单
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 - partnerID: ${ENV(partnerId_app)} 5 + partnerID: ${ENV(partnerId)}
6 commissionProportion: 0 6 commissionProportion: 0
7 orderNum1: 100 7 orderNum1: 100
8 univalence: 15 8 univalence: 15
9 partnerRatio: 10 9 partnerRatio: 10
10 orderNum2: 200 10 orderNum2: 200
11 - partnerCategory: ${get_partnerCategory(1)} 11 +# partnerCategory: ${get_partnerCategory(1)}
12 partnerCategoryId: 1 12 partnerCategoryId: 1
13 output: 13 output:
14 - actual_saleDate 14 - actual_saleDate
@@ -20,13 +20,13 @@ config: @@ -20,13 +20,13 @@ config:
20 teststeps: 20 teststeps:
21 - name: 登录系统 21 - name: 登录系统
22 variables: 22 variables:
23 - phone: ${ENV(adminphone_app)}  
24 - testcase: testcases/common/m_app_login_testcases.yml 23 + phone: ${ENV(adminphone)}
  24 + testcase: testcases/common/m_login_testcases.yml
25 25
26 - name: 新增明日实发订单 26 - name: 新增明日实发订单
27 variables: 27 variables:
28 - saleDate: ${tomorrow_time_str()}  
29 - api: api/m_api/actual/m_add_app_order_actual_api.yml 28 + saleDate: ${get_tomorrow()}
  29 + api: api/m_api/actual/m_add_order_actual_api.yml
30 extract: 30 extract:
31 - orderid: content.data.id 31 - orderid: content.data.id
32 validate: 32 validate:
@@ -2,7 +2,7 @@ config: @@ -2,7 +2,7 @@ config:
2 name: COM001-新增实际订单 2 name: COM001-新增实际订单
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 - partnerID: 1047 5 + partnerID: ${ENV(partnerId)}
6 commissionProportion: 5 6 commissionProportion: 5
7 orderNum1: 100 7 orderNum1: 100
8 univalence: 15 8 univalence: 15
@@ -22,6 +22,8 @@ teststeps: @@ -22,6 +22,8 @@ teststeps:
22 testcase: testcases/common/m_login_testcases.yml 22 testcase: testcases/common/m_login_testcases.yml
23 23
24 - name: 新增实发订单 24 - name: 新增实发订单
  25 + variables:
  26 + saleDate: ${get_today()}
25 api: api/m_api/actual/m_add_order_actual_api.yml 27 api: api/m_api/actual/m_add_order_actual_api.yml
26 extract: 28 extract:
27 - orderid: content.data.id 29 - orderid: content.data.id
1 -config:  
2 - name: COM001-新增实际订单  
3 - base_url: ${ENV(base_manager_url)}  
4 - variables:  
5 - partnerID: ${ENV(partnerId_app)}  
6 - commissionProportion: 5  
7 - orderNum1: 100  
8 - univalence: 15  
9 - partnerRatio: 10  
10 - orderNum2: 200  
11 -# partnerRatio2: 20  
12 - output:  
13 - - actual_id  
14 - - product_id_1  
15 - - product_id_2  
16 -  
17 -  
18 -teststeps:  
19 -- name: $phone 登录系统  
20 - variables:  
21 - phone: ${ENV(adminphone_app)}  
22 - testcase: testcases/common/m_app_login_testcases.yml  
23 -  
24 -- name: 新增实发订单  
25 - api: api/m_api/actual/m_add_app_order_actual_api.yml  
26 - extract:  
27 - - orderid: content.data.id  
28 - validate:  
29 - - eq:  
30 - - content.msg  
31 - - ok  
32 -  
33 -- name: 查看实际订单列表  
34 - api: api/m_api/actual/m_order_actual_list_api.yml  
35 - extract:  
36 - - actual_id: content.data.gridResult.lists.0.id  
37 - validate:  
38 - - eq:  
39 - - content.data.gridResult.lists.0.id  
40 - - ${convert_to_string($orderid)}  
41 - - eq:  
42 - - content.msg  
43 - - ok  
44 -  
45 -- name: 查看实际订单详情  
46 - variables:  
47 - id: ${convert_to_string($actual_id)}  
48 - api: api/m_api/actual/m_order_actual_detail_api.yml  
49 - extract:  
50 - - product_id_1: content.data.product.0.id  
51 - - product_id_2: content.data.product.1.id  
52 - validate:  
53 - - eq:  
54 - - content.data.orderNumCount  
55 - - ${add($orderNum1,$orderNum2)}  
56 - - eq:  
57 - - content.data.orderAmountAdjustmentCount  
58 - - ${cal_orderPrice($univalence, $orderNum1, $orderNum2)}  
59 - - eq:  
60 - - content.data.product.0.orderPrice  
61 - - ${cal_orderPrice($univalence, $orderNum1)}  
62 - - eq:  
63 - - content.data.product.1.orderPrice  
64 - - ${cal_orderPrice($univalence, $orderNum2)}  
1 -config:  
2 - name: 管理后台登陆  
3 -# base_url: ${ENV(base_manager_url)}  
4 - variables:  
5 - phone: ${ENV(adminphone_app)}  
6 -  
7 -teststeps:  
8 -- name: $phone 登录企业平台  
9 - api: api/m_api/m_login_api/m_pwdLogin_api.yml  
10 - extract:  
11 - pwdLogintoken: content.data.access.token  
12 - validate:  
13 - - eq:  
14 - - content.msg  
15 - - ok  
16 -  
17 -- name: 选择公司登录  
18 - variables:  
19 - companyId: ${ENV(companyId_app)}  
20 - api: api/m_api/m_login_api/m_anonymousLogin_api.yml  
21 - extract:  
22 - anonymousLogintoken: content.data.access.token  
23 - validate:  
24 - - eq:  
25 - - content.msg  
26 - - ok  
27 -#  
28 -- name: 单点登录，获取secret用于登录子系统  
29 - api: api/m_api/m_login_api/m_getSingleLoginMenus_api.yml  
30 - extract:  
31 - url: content.data.list.1.url  
32 - validate:  
33 - - eq:  
34 - - content.msg  
35 - - ok  
36 -  
37 -- name: 使用secret登录合伙人系统  
38 - api: api/m_api/m_login_api/m_login_api.yml  
39 - teardown_hooks:  
40 - - ${teardown_hook_get_m_accesstoken($response)}  
41 - validate:  
42 - - eq:  
43 - - content.msg  
44 - - ok  
1 -config:  
2 - name: start_testcases  
3 - #清理数据  
4 - setup_hooks:  
5 - - ${setup_hook_clean_db(366)}  
6 - - ${setup_hook_clean_orderid()}  
7 - teardown_hooks:  
8 - - ${sleep(2)}  
9 -  
10 -teststeps:  
11 -- name: start_testcases  
12 - api: api/app_api/login/gettimestamp_api.yml  
1 -config:  
2 - name: DIV001-分红列表-数据源来自于实发订单  
3 - base_url: ${ENV(base_manager_url)}  
4 - variables:  
5 - orderType: null  
6 - partnerCategoryId: 2  
7 - searchText: ''  
8 - createTime: []  
9 -  
10 -teststeps:  
11 -- name: 登录系统  
12 - variables:  
13 - phone: ${ENV(adminphone_app)}  
14 - testcase: testcases/common/m_app_login_testcases.yml  
15 -  
16 -- name: 查看业务分红列表  
17 -  
18 - api: api/m_api/dividends/m_dividends_list_api.yml  
19 - extract:  
20 - - num1: content.data.gridResult.totalRow  
21 -  
22 -- name: 新增实发订单(业务订单)  
23 - variables:  
24 - partnerCategory: ${get_partnerCategory(2)}  
25 - partnerCategoryId: 2  
26 - saleDate: ${today_time_str()}  
27 - api: api/m_api/actual/m_add_app_order_actual_api.yml  
28 - validate:  
29 - - eq:  
30 - - content.msg  
31 - - ok  
32 -#  
33 -- name: 查看业务分红列表  
34 - api: api/m_api/dividends/m_dividends_list_api.yml  
35 - validate:  
36 - - eq:  
37 - - content.msg  
38 - - ok  
39 - - eq:  
40 - - content.data.gridResult.totalRow  
41 - - ${add($num1,1)}  
@@ -14,6 +14,8 @@ teststeps: @@ -14,6 +14,8 @@ teststeps:
14 - num1: content.data.gridResult.totalRow 14 - num1: content.data.gridResult.totalRow
15 15
16 - name: 新增实发订单 16 - name: 新增实发订单
  17 + variables:
  18 + saleDate: ${get_today()}
17 api: api/m_api/actual/m_add_order_actual_api.yml 19 api: api/m_api/actual/m_add_order_actual_api.yml
18 validate: 20 validate:
19 - eq: 21 - eq:
1 -config:  
2 - name: DIV003_1-分红管理-初始状态-各个值计算正确  
3 - base_url: ${ENV(base_manager_url)}  
4 - variables:  
5 - partnerID: ${ENV(partnerId_app)}  
6 - commissionProportion: 5  
7 - orderNum1: 100  
8 - univalence: 15  
9 - partnerRatio: 10  
10 - orderNum2: 200  
11 - partnerCategory: ${get_partnerCategory(1)}  
12 - partnerCategoryId: 1  
13 - saleDate: ${today_time_str()}  
14 -# partnerRatio2: 20  
15 -  
16 -teststeps:  
17 -- name: 新增实际订单  
18 -  
19 - testcase: testcases/common/COM001_app_actual_add_testcases.yml  
20 - output:  
21 - - actual_id  
22 -  
23 -- name: 查看该订单的分红详情  
24 - variables:  
25 - id: ${convert_to_string($actual_id)}  
26 - api: api/m_api/dividends/m_dividends_detail_api.yml  
27 - validate:  
28 - - eq:  
29 - - content.data.order.orderId  
30 - - $actual_id  
31 - #####合伙人应收分红总额  
32 - - eq:  
33 - - content.data.order.partnerDividends  
34 - - ${cal_Ratio($partnerRatio, $univalence, $orderNum1, $orderNum2)}  
35 - #####合伙人已收分红总额  
36 - - eq:  
37 - - content.data.order.receivedDividends  
38 - - ${convert_to_string(0)}  
39 - #####合伙人未收分红总额  
40 - - eq:  
41 - - content.data.order.notReceivedDividend  
42 - - ${cal_Ratio($partnerRatio, $univalence, $orderNum1, $orderNum2)}  
43 - #####合伙人分红支出总额  
44 - - eq:  
45 - - content.data.order.dividendSpending  
46 - - ${convert_to_string(0)}  
47 - #####订单类型  
48 - - eq:  
49 - - content.data.order.orderType  
50 - - 1  
51 - #####产品1总金额  
52 - - eq:  
53 - - content.data.product.detail.0.commodityPrice  
54 - - 1500  
55 - #####产品1总数量  
56 - - eq:  
57 - - content.data.product.detail.0.orderNum  
58 - - $orderNum1  
59 - #####产品1应收分红  
60 - - eq:  
61 - - content.data.product.detail.0.partnerDividends  
62 - - ${cal_Ratio($partnerRatio, $univalence, $orderNum1)}  
63 - #####产品1分红状态  
64 - - eq:  
65 - - content.data.product.detail.0.paymentStatus  
66 - - 1  
67 - #####产品2总金额  
68 - - eq:  
69 - - content.data.product.detail.1.commodityPrice  
70 - - 3000  
71 - #####产品2总数量  
72 - - eq:  
73 - - content.data.product.detail.1.orderNum  
74 - - $orderNum2  
75 - #####产品2应收分红  
76 - - eq:  
77 - - content.data.product.detail.1.partnerDividends  
78 - - ${cal_Ratio($partnerRatio, $univalence, $orderNum2)}  
79 - #####产品2分红状态  
80 - - eq:  
81 - - content.data.product.detail.1.paymentStatus  
82 - - 1  
83 - #####订单总数量  
84 - - eq:  
85 - - content.data.product.orderNumCount  
86 - - ${add($orderNum1,$orderNum2)}  
87 - #####总金额  
88 - - eq:  
89 - - content.data.product.orderAmountAdjustmentCount  
90 - - ${cal_orderPrice($univalence, $orderNum1, $orderNum2)}  
91 - ####合伙人应收分红合计  
92 - - eq:  
93 - - content.data.product.partnerDividendsCount  
94 - - ${cal_Ratio($partnerRatio, $univalence, $orderNum1, $orderNum2)}  
@@ -2,7 +2,7 @@ config: @@ -2,7 +2,7 @@ config:
2 name: DIV003_1-分红管理-初始状态-各个值计算正确 2 name: DIV003_1-分红管理-初始状态-各个值计算正确
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 - partnerID: 1047 5 + partnerID: ${ENV(partnerId)}
6 commissionProportion: 5 6 commissionProportion: 5
7 orderNum1: 100 7 orderNum1: 100
8 univalence: 15 8 univalence: 15
1 -config:  
2 - name: DIV004_1-分红管理-调整数量由100改为50-各个值计算正确  
3 - base_url: ${ENV(base_manager_url)}  
4 - variables:  
5 - goodNumber: 50  
6 - partnerCategory: ${get_partnerCategory(1)}  
7 - partnerCategoryId: 1  
8 - saleDate: ${today_time_str()}  
9 - orderType: 1  
10 - createTime: []  
11 -  
12 -  
13 -teststeps:  
14 -- name: 新增实际订单  
15 - testcase: testcases/common/COM001_app_actual_add_testcases.yml  
16 - output:  
17 - - actual_id  
18 - - product_id_1  
19 - - product_id_2  
20 -  
21 -- name: 编辑分红-数量由100调整为50  
22 - variables:  
23 - orderId: ${convert_to_string($actual_id)}  
24 - state: 1  
25 - partnerBonusPercent: 10  
26 - reason: '修改原因${get_stringcode(5)}'  
27 - productId: ${convert_to_string($product_id_1)}  
28 - api: api/m_api/dividends/m_dividends_modify_api.yml  
29 - validate:  
30 - - eq:  
31 - - content.msg  
32 - - ok  
33 -  
34 -- name: 查看分红列表  
35 - api: api/m_api/dividends/m_dividends_list_api.yml  
36 - validate:  
37 - #####等待支付状态=1  
38 - - eq:  
39 - - content.data.gridResult.lists.0.stateOfPayment  
40 - - 1  
41 - ######应收分红  
42 - - eq:  
43 - - content.data.gridResult.lists.0.dividendsReceivable  
44 - - ${convert_to_string(375)}  
45 - #####已收分红  
46 - - eq:  
47 - - content.data.gridResult.lists.0.receiveDividends  
48 - - ${convert_to_string(0)}  
49 - #####未收分红  
50 - - eq:  
51 - - content.data.gridResult.lists.0.uncollectedDividends  
52 - - ${convert_to_string(375)}  
53 - #####分红支出  
54 - - eq:  
55 - - content.data.gridResult.lists.0.dividendSpending  
56 - - ${convert_to_string(0)}  
57 -  
58 -  
59 -- name: 查看该订单的分红详情  
60 - variables:  
61 - id: ${convert_to_string($actual_id)}  
62 - api: api/m_api/dividends/m_dividends_detail_api.yml  
63 - validate:  
64 - - eq:  
65 - - content.data.order.orderId  
66 - - $actual_id  
67 - #####合伙人未收分红总额  
68 - - eq:  
69 - - content.data.order.notReceivedDividend  
70 - - ${convert_to_string(375)}  
71 - #####合伙人已收分红总额  
72 - - eq:  
73 - - content.data.order.receivedDividends  
74 - - ${convert_to_string(0)}  
75 - #####合伙人应收分红总额  
76 - - eq:  
77 - - content.data.order.partnerDividends  
78 - - ${convert_to_string(375)}  
79 - #####合伙人分红支出总额  
80 - - eq:  
81 - - content.data.order.dividendSpending  
82 - - ${convert_to_string(0)}  
83 - #####初始总数量  
84 - - eq:  
85 - - content.data.product.orderNumCount  
86 - - 250  
87 - #####初始总金额  
88 - - eq:  
89 - - content.data.product.orderAmountAdjustmentCount  
90 - - 3750  
91 - #####合伙人应收分红总额调整  
92 - - eq:  
93 - - content.data.product.partnerDividendsCount  
94 - - ${convert_to_string(375)}  
95 - #####产品1是否正确  
96 - - eq:  
97 - - content.data.product.detail.0.productId  
98 - - ${convert_to_int($product_id_1)}  
99 - #####产品1总金额  
100 - - eq:  
101 - - content.data.product.detail.0.commodityPrice  
102 - - 750  
103 - #####产品1应收分红  
104 - - eq:  
105 - - content.data.product.detail.0.partnerDividends  
106 - - ${convert_to_string(75)}  
107 - #####产品1数量调整  
108 - - eq:  
109 - - content.data.product.detail.0.orderNum  
110 - - $goodNumber  
111 - #####产品1分红状态  
112 - - eq:  
113 - - content.data.product.detail.0.paymentStatus  
114 - - 1  
115 - #####产品2总金额  
116 - - eq:  
117 - - content.data.product.detail.1.commodityPrice  
118 - - 3000  
119 - #####产品2应收分红  
120 - - eq:  
121 - - content.data.product.detail.1.partnerDividends  
122 - - ${convert_to_string(300)}  
123 - #####产品2分红状态  
124 - - eq:  
125 - - content.data.product.detail.1.paymentStatus  
126 - - 1  
127 -  
128 -- name: 查看实际订单列表  
129 - api: api/m_api/actual/m_order_actual_list_api.yml  
130 - validate:  
131 - - eq:  
132 - - content.data.gridResult.lists.0.id  
133 - - $actual_id  
134 - - eq:  
135 - - content.data.gridResult.lists.0.orderNum  
136 - - 300  
137 - - eq:  
138 - - content.data.gridResult.lists.0.quantityControl  
139 - - ${convert_to_string(250)}  
140 - - eq:  
141 - - content.data.gridResult.lists.0.orderPrice  
142 - - 4500  
143 - - eq:  
144 - - content.data.gridResult.lists.0.priceControl  
145 - - ${convert_to_string(3750)}  
146 -  
147 -- name: 查看实际订单详情  
148 - variables:  
149 - id: ${convert_to_string($actual_id)}  
150 - api: api/m_api/actual/m_order_actual_detail_api.yml  
151 - validate:  
152 - - eq:  
153 - - content.data.orderNumCount  
154 - - 300  
155 - - eq:  
156 - - content.data.orderAmountAdjustmentCount  
157 - - 4500  
158 - - eq:  
159 - - content.data.orderNumCountControl  
160 - - ${convert_to_string(250)}  
161 - - eq:  
162 - - content.data.orderAmountAdjustmentCountControl  
163 - - ${convert_to_string(3750)}  
164 - - eq:  
165 - - content.data.product.0.orderPrice  
166 - - 1500  
167 - - eq:  
168 - - content.data.product.0.quantityControl  
169 - - ${convert_to_string($goodNumber)}  
170 - - eq:  
171 - - content.data.product.0.priceControl  
172 - - ${convert_to_string(750)}  
173 - - eq:  
174 - - content.data.product.1.orderPrice  
175 - - 3000  
1 -config:  
2 - name: DIV007-分红管理-产品1支付分红成功，数据正确  
3 - base_url: ${ENV(base_manager_url)}  
4 - variables:  
5 - partnerID: ${ENV(partnerId_app)}  
6 - partnerCategory: ${get_partnerCategory(1)}  
7 - partnerCategoryId: 1  
8 - saleDate: ${today_time_str()}  
9 - orderType: 1  
10 - createTime: []  
11 -  
12 -  
13 -teststeps:  
14 -- name: 新增实际订单  
15 - testcase: testcases/common/COM001_app_actual_add_testcases.yml  
16 - output:  
17 - - actual_id  
18 - - product_id_1  
19 - - product_id_2  
20 -  
21 -- name: 支付分红  
22 - variables:  
23 - orderId: ${convert_to_string($actual_id)}  
24 - productId: ${convert_to_string($product_id_1)}  
25 - api: api/m_api/dividends/m_dividends_payDividends_api.yml  
26 - validate:  
27 - - eq:  
28 - - content.msg  
29 - - ok  
30 -  
31 -- name: 查看分红列表  
32 - api: api/m_api/dividends/m_dividends_list_api.yml  
33 - validate:  
34 - #####已支付状态=2  
35 - - eq:  
36 - - content.data.gridResult.lists.0.stateOfPayment  
37 - - 2  
38 - ######应收分红  
39 - - eq:  
40 - - content.data.gridResult.lists.0.dividendsReceivable  
41 - - ${convert_to_string(450)}  
42 - #####已收分红  
43 - - eq:  
44 - - content.data.gridResult.lists.0.receiveDividends  
45 - - ${convert_to_string(150)}  
46 - #####未收分红  
47 - - eq:  
48 - - content.data.gridResult.lists.0.uncollectedDividends  
49 - - ${convert_to_string(300)}  
50 - #####分红支出  
51 - - eq:  
52 - - content.data.gridResult.lists.0.dividendSpending  
53 - - ${convert_to_string(0)}  
54 -  
55 -  
56 -- name: 查看该订单的分红详情  
57 - variables:  
58 - id: ${convert_to_string($actual_id)}  
59 - api: api/m_api/dividends/m_dividends_detail_api.yml  
60 - validate:  
61 - - eq:  
62 - - content.data.order.orderId  
63 - - $actual_id  
64 - #####合伙人应收分红总额  
65 - - eq:  
66 - - content.data.order.partnerDividends  
67 - - ${convert_to_string(450)}  
68 - #####合伙人未收分红总额  
69 - - eq:  
70 - - content.data.order.notReceivedDividend  
71 - - ${convert_to_string(300)}  
72 - #####合伙人已收分红总额  
73 - - eq:  
74 - - content.data.order.receivedDividends  
75 - - ${convert_to_string(150)}  
76 - #####合伙人分红支出总额  
77 - - eq:  
78 - - content.data.order.dividendSpending  
79 - - ${convert_to_string(0)}  
80 - #####产品1是否正确  
81 - - eq:  
82 - - content.data.product.detail.0.productId  
83 - - ${convert_to_int($product_id_1)}  
84 - #####产品1总金额  
85 - - eq:  
86 - - content.data.product.detail.0.commodityPrice  
87 - - 1500  
88 - #####产品1应收分红  
89 - - eq:  
90 - - content.data.product.detail.0.partnerDividends  
91 - - ${convert_to_string(150)}  
92 - #####产品1数量  
93 - - eq:  
94 - - content.data.product.detail.0.orderNum  
95 - - 100  
96 - #####产品1分红状态  
97 - - eq:  
98 - - content.data.product.detail.0.paymentStatus  
99 - - 2  
100 - #####产品2总金额  
101 - - eq:  
102 - - content.data.product.detail.1.commodityPrice  
103 - - 3000  
104 - #####产品2应收分红  
105 - - eq:  
106 - - content.data.product.detail.1.partnerDividends  
107 - - ${convert_to_string(300)}  
108 - #####产品2分红状态  
109 - - eq:  
110 - - content.data.product.detail.1.paymentStatus  
111 - - 1  
112 -  
113 -- name: 查看实际订单列表  
114 - api: api/m_api/actual/m_order_actual_list_api.yml  
115 - validate:  
116 - - eq:  
117 - - content.data.gridResult.lists.0.id  
118 - - $actual_id  
119 - - eq:  
120 - - content.data.gridResult.lists.0.orderNum  
121 - - 300  
122 - - eq:  
123 - - content.data.gridResult.lists.0.orderPrice  
124 - - 4500  
125 -  
126 -- name: 查看实际订单详情  
127 - variables:  
128 - id: ${convert_to_string($actual_id)}  
129 - api: api/m_api/actual/m_order_actual_detail_api.yml  
130 - validate:  
131 - - eq:  
132 - - content.data.orderNumCount  
133 - - 300  
134 - - eq:  
135 - - content.data.orderAmountAdjustmentCount  
136 - - 4500  
137 - - eq:  
138 - - content.data.product.0.orderPrice  
139 - - 1500  
140 - - eq:  
141 - - content.data.product.1.orderPrice  
142 - - 3000  
1 -config:  
2 - name: DIV008-分红管理-产品1支付分红成功后，调整数量由100改为50，数据正确  
3 - base_url: ${ENV(base_manager_url)}  
4 - variables:  
5 - goodNumber: 50  
6 - partnerCategory: ${get_partnerCategory(1)}  
7 - partnerCategoryId: 1  
8 - saleDate: ${today_time_str()}  
9 - orderType: 1  
10 - createTime: []  
11 -  
12 -  
13 -teststeps:  
14 -- name: 新增实际订单  
15 - testcase: testcases/common/COM001_app_actual_add_testcases.yml  
16 - output:  
17 - - actual_id  
18 - - product_id_1  
19 - - product_id_2  
20 -  
21 -- name: 支付分红  
22 - variables:  
23 - orderId: ${convert_to_string($actual_id)}  
24 - productId: ${convert_to_string($product_id_1)}  
25 - api: api/m_api/dividends/m_dividends_payDividends_api.yml  
26 - validate:  
27 - - eq:  
28 - - content.msg  
29 - - ok  
30 -  
31 -- name: 编辑分红-数量由100调整为50  
32 - variables:  
33 - orderId: ${convert_to_string($actual_id)}  
34 - state: 1  
35 - partnerBonusPercent: 10  
36 - reason: '修改原因${get_stringcode(5)}'  
37 - productId: ${convert_to_string($product_id_1)}  
38 - api: api/m_api/dividends/m_dividends_modify_api.yml  
39 - validate:  
40 - - eq:  
41 - - content.msg  
42 - - ok  
43 -  
44 -- name: 查看分红列表  
45 - api: api/m_api/dividends/m_dividends_list_api.yml  
46 - validate:  
47 - #####已支付状态=1  
48 - - eq:  
49 - - content.data.gridResult.lists.0.stateOfPayment  
50 - - 2  
51 - ######应收分红  
52 - - eq:  
53 - - content.data.gridResult.lists.0.dividendsReceivable  
54 - - ${convert_to_string(375)}  
55 - #####已收分红  
56 - - eq:  
57 - - content.data.gridResult.lists.0.receiveDividends  
58 - - ${convert_to_string(150)}  
59 - #####未收分红  
60 - - eq:  
61 - - content.data.gridResult.lists.0.uncollectedDividends  
62 - - ${convert_to_string(300)}  
63 - #####分红支出  
64 - - eq:  
65 - - content.data.gridResult.lists.0.dividendSpending  
66 - - ${convert_to_string(75)}  
67 -  
68 -  
69 -- name: 查看该订单的分红详情  
70 - variables:  
71 - id: ${convert_to_string($actual_id)}  
72 - api: api/m_api/dividends/m_dividends_detail_api.yml  
73 - validate:  
74 - - eq:  
75 - - content.data.order.orderId  
76 - - $actual_id  
77 - #####合伙人应收分红总额  
78 - - eq:  
79 - - content.data.order.partnerDividends  
80 - - ${convert_to_string(375)}  
81 - #####合伙人未收分红总额  
82 - - eq:  
83 - - content.data.order.notReceivedDividend  
84 - - ${convert_to_string(300)}  
85 - #####合伙人已收分红总额  
86 - - eq:  
87 - - content.data.order.receivedDividends  
88 - - ${convert_to_string(150)}  
89 - #####合伙人分红支出总额  
90 - - eq:  
91 - - content.data.order.dividendSpending  
92 - - ${convert_to_string(75)}  
93 - #####产品1是否正确  
94 - - eq:  
95 - - content.data.product.detail.0.productId  
96 - - ${convert_to_int($product_id_1)}  
97 - #####产品1总金额  
98 - - eq:  
99 - - content.data.product.detail.0.commodityPrice  
100 - - 750  
101 - #####产品1应收分红  
102 - - eq:  
103 - - content.data.product.detail.0.partnerDividends  
104 - - ${convert_to_string(75)}  
105 - #####产品1数量  
106 - - eq:  
107 - - content.data.product.detail.0.orderNum  
108 - - 50  
109 - #####产品1分红状态  
110 - - eq:  
111 - - content.data.product.detail.0.paymentStatus  
112 - - 2  
113 - #####产品2总金额  
114 - - eq:  
115 - - content.data.product.detail.1.commodityPrice  
116 - - 3000  
117 - #####产品2应收分红  
118 - - eq:  
119 - - content.data.product.detail.1.partnerDividends  
120 - - ${convert_to_string(300)}  
121 - #####产品2分红状态  
122 - - eq:  
123 - - content.data.product.detail.1.paymentStatus  
124 - - 1  
125 -  
126 -- name: 查看实际订单列表  
127 - api: api/m_api/actual/m_order_actual_list_api.yml  
128 - validate:  
129 - - eq:  
130 - - content.data.gridResult.lists.0.id  
131 - - $actual_id  
132 - - eq:  
133 - - content.data.gridResult.lists.0.orderNum  
134 - - 300  
135 - - eq:  
136 - - content.data.gridResult.lists.0.orderPrice  
137 - - 4500  
138 -  
139 -- name: 查看实际订单详情  
140 - variables:  
141 - id: ${convert_to_string($actual_id)}  
142 - api: api/m_api/actual/m_order_actual_detail_api.yml  
143 - validate:  
144 - - eq:  
145 - - content.data.orderNumCount  
146 - - 300  
147 - - eq:  
148 - - content.data.orderAmountAdjustmentCount  
149 - - 4500  
150 - - eq:  
151 - - content.data.product.0.orderPrice  
152 - - 1500  
153 - - eq:  
154 - - content.data.product.1.orderPrice  
155 - - 3000  
1 -config:  
2 - name: DIV010-分红管理-批量支付分红成功，数据正确  
3 - base_url: ${ENV(base_manager_url)}  
4 - variables:  
5 - partnerID: ${ENV(partnerId_app)}  
6 - commissionProportion: 5  
7 - orderNum1: 100  
8 - univalence: 15  
9 - partnerRatio: 10  
10 - orderNum2: 200  
11 - partnerCategory: ${get_partnerCategory(1)}  
12 - partnerCategoryId: 1  
13 - orderType: 1  
14 - saleDate: ${today_time_str()}  
15 - createTime: []  
16 -# partnerRatio2: 20  
17 -# output:  
18 -# - actual_id  
19 -# - product_id_1  
20 -# - product_id_2  
21 -  
22 -  
23 -teststeps:  
24 -- name: $phone 登录系统  
25 - variables:  
26 - phone: ${ENV(adminphone_app)}  
27 -  
28 - testcase: testcases/common/m_app_login_testcases.yml  
29 -  
30 -- name: 新增实发订单  
31 - times: 3  
32 - api: api/m_api/actual/m_add_app_order_actual_api.yml  
33 - teardown_hooks:  
34 - - ${teardown_hook_get_orderid($response)}  
35 - validate:  
36 - - eq:  
37 - - content.msg  
38 - - ok  
39 -  
40 -- name: 查看分红列表  
41 - api: api/m_api/dividends/m_dividends_list_api.yml  
42 - validate:  
43 - #####已支付状态=2  
44 - - eq:  
45 - - content.data.gridResult.lists.0.stateOfPayment  
46 - - 1  
47 -  
48 -  
49 -- name: 批量支付分红  
50 - api: api/m_api/dividends/m_dividends_payDividends_batch_api.yml  
51 - validate:  
52 - - eq:  
53 - - content.msg  
54 - - ok  
55 -  
56 -- name: 查看分红列表  
57 - api: api/m_api/dividends/m_dividends_list_api.yml  
58 - validate:  
59 - #####已支付状态=2  
60 - - eq:  
61 - - content.data.gridResult.lists.0.stateOfPayment  
62 - - 2  
63 - - eq:  
64 - - content.data.gridResult.lists.1.stateOfPayment  
65 - - 2  
66 - - eq:  
67 - - content.data.gridResult.lists.2.stateOfPayment  
68 - - 2  
@@ -2,12 +2,13 @@ config: @@ -2,12 +2,13 @@ config:
2 name: DIV010-分红管理-批量支付分红成功，数据正确 2 name: DIV010-分红管理-批量支付分红成功，数据正确
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 - partnerID: 1047 5 + partnerID: ${ENV(partnerId)}
6 commissionProportion: 5 6 commissionProportion: 5
7 orderNum1: 100 7 orderNum1: 100
8 univalence: 15 8 univalence: 15
9 partnerRatio: 10 9 partnerRatio: 10
10 orderNum2: 200 10 orderNum2: 200
  11 + saleDate: ${get_today()}
11 # partnerRatio2: 20 12 # partnerRatio2: 20
12 # output: 13 # output:
13 # - actual_id 14 # - actual_id
@@ -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 - partnerID: 1047 5 + partnerID: ${ENV(partnerId)}
6 commissionProportion: 5 6 commissionProportion: 5
7 orderNum1: 100 7 orderNum1: 100
8 univalence: 15 8 univalence: 15
@@ -18,6 +18,8 @@ teststeps: @@ -18,6 +18,8 @@ teststeps:
18 testcase: testcases/common/m_login_testcases.yml 18 testcase: testcases/common/m_login_testcases.yml
19 19
20 - name: 新增实发订单 20 - name: 新增实发订单
  21 + variables:
  22 + saleDate: ${get_today()}
21 api: api/m_api/actual/m_add_order_actual_api.yml 23 api: api/m_api/actual/m_add_order_actual_api.yml
22 extract: 24 extract:
23 - orderid: content.data.id 25 - orderid: content.data.id
@@ -2,7 +2,7 @@ config: @@ -2,7 +2,7 @@ config:
2 name: ACT002-删除订单成功 2 name: ACT002-删除订单成功
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 - partnerID: 1047 5 + partnerID: ${ENV(partnerId)}
6 commissionProportion: 5 6 commissionProportion: 5
7 orderNum1: 100 7 orderNum1: 100
8 univalence: 15 8 univalence: 15
@@ -18,6 +18,8 @@ teststeps: @@ -18,6 +18,8 @@ teststeps:
18 testcase: testcases/common/m_login_testcases.yml 18 testcase: testcases/common/m_login_testcases.yml
19 19
20 - name: 新增实发订单 20 - name: 新增实发订单
  21 + variables:
  22 + saleDate: ${get_today()}
21 api: api/m_api/actual/m_add_order_actual_api.yml 23 api: api/m_api/actual/m_add_order_actual_api.yml
22 extract: 24 extract:
23 - orderid: content.data.id 25 - orderid: content.data.id
@@ -2,7 +2,7 @@ config: @@ -2,7 +2,7 @@ config:
2 name: ACT004-订单唯一性校验：新增订单号重复的实际订单，可以新增成功 2 name: ACT004-订单唯一性校验：新增订单号重复的实际订单，可以新增成功
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 - partnerID: 1047 5 + partnerID: ${ENV(partnerId)}
6 commissionProportion: 5 6 commissionProportion: 5
7 orderNum1: 100 7 orderNum1: 100
8 univalence: 15 8 univalence: 15
@@ -18,6 +18,8 @@ teststeps: @@ -18,6 +18,8 @@ teststeps:
18 testcase: testcases/common/COM001_actual_add_testcases.yml 18 testcase: testcases/common/COM001_actual_add_testcases.yml
19 19
20 - name: 新增实发订单 20 - name: 新增实发订单
  21 + variables:
  22 + saleDate: ${get_today()}
21 api: api/m_api/actual/m_add_order_actual_api.yml 23 api: api/m_api/actual/m_add_order_actual_api.yml
22 validate: 24 validate:
23 - eq: 25 - eq:
@@ -2,7 +2,7 @@ config: @@ -2,7 +2,7 @@ config:
2 name: ACT005-订单唯一性校验：新增发货单号重复的实际订单，可以新增成功 2 name: ACT005-订单唯一性校验：新增发货单号重复的实际订单，可以新增成功
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 - partnerID: 1047 5 + partnerID: ${ENV(partnerId)}
6 commissionProportion: 5 6 commissionProportion: 5
7 orderNum1: 100 7 orderNum1: 100
8 univalence: 15 8 univalence: 15
@@ -18,6 +18,8 @@ teststeps: @@ -18,6 +18,8 @@ teststeps:
18 testcase: testcases/common/COM001_actual_add_testcases.yml 18 testcase: testcases/common/COM001_actual_add_testcases.yml
19 19
20 - name: 新增实发订单 20 - name: 新增实发订单
  21 + variables:
  22 + saleDate: ${get_today()}
21 api: api/m_api/actual/m_add_order_actual_api.yml 23 api: api/m_api/actual/m_add_order_actual_api.yml
22 validate: 24 validate:
23 - eq: 25 - eq:
@@ -2,7 +2,7 @@ config: @@ -2,7 +2,7 @@ config:
2 name: ACT006-订单唯一性校验：新增订单号+发货单号+合伙人ID+合伙人类型重复的实际订单，但是产品名称不同，可以新增成功 2 name: ACT006-订单唯一性校验：新增订单号+发货单号+合伙人ID+合伙人类型重复的实际订单，但是产品名称不同，可以新增成功
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 - partnerID: 1047 5 + partnerID: ${ENV(partnerId)}
6 commissionProportion: 5 6 commissionProportion: 5
7 orderNum1: 100 7 orderNum1: 100
8 univalence: 15 8 univalence: 15
@@ -19,6 +19,8 @@ teststeps: @@ -19,6 +19,8 @@ teststeps:
19 testcase: testcases/common/COM001_actual_add_testcases.yml 19 testcase: testcases/common/COM001_actual_add_testcases.yml
20 20
21 - name: 新增实发订单 21 - name: 新增实发订单
  22 + variables:
  23 + saleDate: ${get_today()}
22 api: api/m_api/actual/m_add_order_actual_api.yml 24 api: api/m_api/actual/m_add_order_actual_api.yml
23 validate: 25 validate:
24 - eq: 26 - eq:
@@ -2,7 +2,7 @@ config: @@ -2,7 +2,7 @@ config:
2 name: ACT007-订单唯一性校验：新增订单号+发货单号+合伙人ID+合伙人类型+产品名称重复的实际订单，不可以新增成功 2 name: ACT007-订单唯一性校验：新增订单号+发货单号+合伙人ID+合伙人类型+产品名称重复的实际订单，不可以新增成功
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 - partnerID: 1047 5 + partnerID: ${ENV(partnerId)}
6 commissionProportion: 5 6 commissionProportion: 5
7 orderNum1: 100 7 orderNum1: 100
8 univalence: 15 8 univalence: 15
@@ -20,6 +20,8 @@ teststeps: @@ -20,6 +20,8 @@ teststeps:
20 testcase: testcases/common/COM001_actual_add_testcases.yml 20 testcase: testcases/common/COM001_actual_add_testcases.yml
21 21
22 - name: 新增实发订单 22 - name: 新增实发订单
  23 + variables:
  24 + saleDate: ${get_today()}
23 api: api/m_api/actual/m_add_order_actual_api.yml 25 api: api/m_api/actual/m_add_order_actual_api.yml
24 validate: 26 validate:
25 - eq: 27 - eq:
@@ -2,7 +2,7 @@ config: @@ -2,7 +2,7 @@ config:
2 name: ACT008-订单唯一性校验：只有订单号不一致，可以新增成功 2 name: ACT008-订单唯一性校验：只有订单号不一致，可以新增成功
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 - partnerID: 1047 5 + partnerID: ${ENV(partnerId)}
6 commissionProportion: 5 6 commissionProportion: 5
7 orderNum1: 100 7 orderNum1: 100
8 univalence: 15 8 univalence: 15
@@ -20,6 +20,8 @@ teststeps: @@ -20,6 +20,8 @@ teststeps:
20 testcase: testcases/common/COM001_actual_add_testcases.yml 20 testcase: testcases/common/COM001_actual_add_testcases.yml
21 21
22 - name: 新增实发订单 22 - name: 新增实发订单
  23 + variables:
  24 + saleDate: ${get_today()}
23 api: api/m_api/actual/m_add_order_actual_api.yml 25 api: api/m_api/actual/m_add_order_actual_api.yml
24 validate: 26 validate:
25 - eq: 27 - eq:
@@ -2,7 +2,7 @@ config: @@ -2,7 +2,7 @@ config:
2 name: ACT009-订单唯一性校验：只有发货单号不一致，可以新增成功 2 name: ACT009-订单唯一性校验：只有发货单号不一致，可以新增成功
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 - partnerID: 1047 5 + partnerID: ${ENV(partnerId)}
6 commissionProportion: 5 6 commissionProportion: 5
7 orderNum1: 100 7 orderNum1: 100
8 univalence: 15 8 univalence: 15
@@ -20,6 +20,8 @@ teststeps: @@ -20,6 +20,8 @@ teststeps:
20 testcase: testcases/common/COM001_actual_add_testcases.yml 20 testcase: testcases/common/COM001_actual_add_testcases.yml
21 21
22 - name: 新增实发订单 22 - name: 新增实发订单
  23 + variables:
  24 + saleDate: ${get_today()}
23 api: api/m_api/actual/m_add_order_actual_api.yml 25 api: api/m_api/actual/m_add_order_actual_api.yml
24 validate: 26 validate:
25 - eq: 27 - eq:
@@ -2,7 +2,7 @@ config: @@ -2,7 +2,7 @@ config:
2 name: ACT010-订单唯一性校验：合伙人类型不一致，可以新增成功 2 name: ACT010-订单唯一性校验：合伙人类型不一致，可以新增成功
3 base_url: ${ENV(base_manager_url)} 3 base_url: ${ENV(base_manager_url)}
4 variables: 4 variables:
5 - partnerID: 1047 5 + partnerID: ${ENV(partnerId)}
6 commissionProportion: 5 6 commissionProportion: 5
7 orderNum1: 100 7 orderNum1: 100
8 univalence: 15 8 univalence: 15
@@ -22,6 +22,7 @@ teststeps: @@ -22,6 +22,7 @@ teststeps:
22 - name: 新增实发订单 22 - name: 新增实发订单
23 variables: 23 variables:
24 partnerCategoryId: 2 24 partnerCategoryId: 2
  25 + saleDate: ${get_today()}
25 api: api/m_api/actual/m_add_order_actual_api.yml 26 api: api/m_api/actual/m_add_order_actual_api.yml
26 validate: 27 validate:
27 - eq: 28 - eq:
@@ -21,6 +21,7 @@ teststeps: @@ -21,6 +21,7 @@ teststeps:
21 - name: 新增实发订单 21 - name: 新增实发订单
22 variables: 22 variables:
23 partnerID: $partnerid 23 partnerID: $partnerid
  24 + saleDate: ${get_today()}
24 api: api/m_api/actual/m_add_order_actual_api.yml 25 api: api/m_api/actual/m_add_order_actual_api.yml
25 extract: 26 extract:
26 - orderid: content.data.id 27 - orderid: content.data.id
@@ -3,9 +3,9 @@ config: @@ -3,9 +3,9 @@ config:
3 testcases: 3 testcases:
4 4
5 - name: start....初始化数据库和文件 5 - name: start....初始化数据库和文件
6 - testcase: testcases/common/start_app_testcases.yml 6 + testcase: testcases/common/start_testcases.yml
7 7
8 -##############################APP端合伙人开始################################ 8 +#############################APP端合伙人开始################################
9 - name: DIVI001-事业-初始状态-统计值正确 9 - name: DIVI001-事业-初始状态-统计值正确
10 testcase: testcases/app/dividends/DIVI001_career_dividendslist_testcases.yml 10 testcase: testcases/app/dividends/DIVI001_career_dividendslist_testcases.yml
11 11
@@ -23,7 +23,7 @@ testcases: @@ -23,7 +23,7 @@ testcases:
23 23
24 - name: DIVI006-累计实发订单列表不包含明日 24 - name: DIVI006-累计实发订单列表不包含明日
25 testcase: testcases/app/dividends/DIVI006_tomorrow_career_dividendslist_testcases.yml 25 testcase: testcases/app/dividends/DIVI006_tomorrow_career_dividendslist_testcases.yml
26 -###################################APP端合伙人权限################################ 26 +####################################APP端合伙人权限################################
27 - name: COMM1-单个合伙人登录 27 - name: COMM1-单个合伙人登录
28 testcase: testcases/app/common/COMM1_app_partner_login_testcases.yml 28 testcase: testcases/app/common/COMM1_app_partner_login_testcases.yml
29 29
@@ -35,8 +35,8 @@ testcases: @@ -35,8 +35,8 @@ testcases:
35 35
36 - name: COMM4-APP多公司高管登录 36 - name: COMM4-APP多公司高管登录
37 testcase: testcases/app/common/COMM4_app_more_company_manager_login_testcases.yml 37 testcase: testcases/app/common/COMM4_app_more_company_manager_login_testcases.yml
38 -###################################APP端合伙人结束################################  
39 -###################################APP端高管开始################################ 38 +####################################APP端合伙人结束################################
  39 +####################################APP端高管开始################################
40 - name: COMP001-企业统计值正确 40 - name: COMP001-企业统计值正确
41 testcase: testcases/app/company/COMP001_company_statistics_testcases.yml 41 testcase: testcases/app/company/COMP001_company_statistics_testcases.yml
42 42