Merge branch 'master' into 'main'

Master|代码更新归档

See merge request !6

air_case/cmdc_rebate/a_返利规则新增验证.air/a_返利规则新增验证.py

@@ -16,8 +16,8 @@ module = "cmdc_rebate"
 
 # 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
+username = commonFuc().get_business_data(module, "username2")
+password = commonFuc().get_business_data(module, "password2")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
@@ -43,7 +43,7 @@ result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
 
 # 生成随机数
-product_random = random.randint(1, len(result["data"]["list"]) - 1)
+product_random = random.randint(0, len(result["data"]["list"]) - 1)
 # 获取商品code
 product_code = result["data"]["list"][product_random]["relevanceCode"]
 product_name = result["data"]["list"][product_random]["relevanceName"]
@@ -63,8 +63,12 @@ request_body = commonFuc().get_business_data(module, "payload21", customer_name,
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 # print(result)
+result["api_time"] = api_time
+# print(result)
 if result["success"]:
     # 获取预期结果
     check_dict = commonFuc().get_business_data(module, "checkDict21")

air_case/cmdc_rebate/b_返利规则新增_产品线已被绑定.air/b_返利规则新增_产品线已被绑定.py

@@ -16,8 +16,8 @@ module = "cmdc_rebate"
 
 # 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
+username = commonFuc().get_business_data(module, "username2")
+password = commonFuc().get_business_data(module, "password2")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
@@ -43,7 +43,7 @@ result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
 
 # 生成随机数
-product_random = random.randint(1, len(result["data"]["list"]) - 1)
+product_random = random.randint(0, len(result["data"]["list"]) - 1)
 # 获取商品code
 product_code = result["data"]["list"][product_random]["relevanceCode"]
 product_name = result["data"]["list"][product_random]["relevanceName"]
@@ -63,8 +63,10 @@ request_body = commonFuc().get_business_data(module, "payload21", customer_name,
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-print(result)
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict22")
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/c_返利规则详情获取验证.air/c_返利规则详情获取验证.py

@@ -15,8 +15,8 @@ module = "cmdc_rebate"
 
 # 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
+username = commonFuc().get_business_data(module, "username2")
+password = commonFuc().get_business_data(module, "password2")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
@@ -42,10 +42,14 @@ request_body = commonFuc().get_business_data(module, "payload23", rebate_id)
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
+
 # print(result)
 # 获取结果中返利规则id
 result = {"rebateid": result["data"]["rebateid"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict23", rebate_id)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/d_返利规则编辑功能验证.air/d_返利规则编辑功能验证.py

@@ -15,8 +15,8 @@ module = "cmdc_rebate"
 
 # 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
+username = commonFuc().get_business_data(module, "username2")
+password = commonFuc().get_business_data(module, "password2")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
@@ -58,7 +58,10 @@ request_body = commonFuc().get_business_data(module, "payload24", customer_name,
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
+result["api_time"] = api_time
 # print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict24")

air_case/cmdc_rebate/e_返利规则启用功能验证.air/e_返利规则启用功能验证.py

@@ -16,8 +16,8 @@ module = "cmdc_rebate"
 
 # 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
+username = commonFuc().get_business_data(module, "username2")
+password = commonFuc().get_business_data(module, "password2")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
@@ -28,7 +28,7 @@ request_body = commonFuc().get_business_data(module, "payload23_list")
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
-
+# print(result)
 # 获取指定返利规则信息
 rebate_id = result["data"]["list"][0]["rebateid"]
 
@@ -44,7 +44,10 @@ request_body = commonFuc().get_business_data(module, "payload26", rebate_id)
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
+result["api_time"] = api_time
 # print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict26")

air_case/cmdc_rebate/f_返利规则停用功能验证.air/f_返利规则停用功能验证.py

@@ -16,8 +16,8 @@ module = "cmdc_rebate"
 
 # 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
+username = commonFuc().get_business_data(module, "username2")
+password = commonFuc().get_business_data(module, "password2")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
@@ -44,7 +44,10 @@ request_body = commonFuc().get_business_data(module, "payload27", rebate_id)
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
+result["api_time"] = api_time
 # print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict27")

air_case/cmdc_rebate/g_返利规则删除功能验证.air/g_返利规则删除功能验证.py

@@ -16,8 +16,8 @@ module = "cmdc_rebate"
 
 # 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
+username = commonFuc().get_business_data(module, "username2")
+password = commonFuc().get_business_data(module, "password2")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
@@ -44,7 +44,10 @@ request_body = commonFuc().get_business_data(module, "payload25", rebate_id)
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
+result["api_time"] = api_time
 # print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict25")

air_case/cmdc_rebate/m_发放返利规则_生效启用功能验证.air/m_发放返利规则_生效启用功能验证.py

@@ -48,7 +48,10 @@ request_body = commonFuc().get_business_data(module, "payload39", rebate_trip_id
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
+result["api_time"] = api_time
 # print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict39")

air_case/cmdc_rebate/n_发放返利规则_生效停用功能验证.air/n_发放返利规则_生效停用功能验证.py

@@ -48,7 +48,10 @@ request_body = commonFuc().get_business_data(module, "payload39", rebate_trip_id
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
+result["api_time"] = api_time
 # print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict39")

air_case/cmdc_rebate/三方用户信息获取验证.air/三方用户信息获取验证.py

@@ -32,8 +32,10 @@ request_body = commonFuc().get_business_data(module, "payload31")
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-print(result)
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict31")
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/产品线code获取验证.air/产品线code获取验证.py

@@ -32,8 +32,10 @@ request_body = commonFuc().get_business_data(module, "payload17")
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-# print(result)
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict17")
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/产品线商品获取验证.air/产品线商品获取验证.py

@@ -15,8 +15,8 @@ module = "cmdc_rebate"
 
 # 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
+username = commonFuc().get_business_data(module, "username2")
+password = commonFuc().get_business_data(module, "password2")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
@@ -32,8 +32,10 @@ request_body = commonFuc().get_business_data(module, "payload15")
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-# print(result)
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict15")
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/修改返利接口验证.air/修改返利接口验证.py

@@ -36,10 +36,13 @@ request_body = commonFuc().get_business_data(module, "payload01", rebate_amount)
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-# print(result)
+
 # 获取结果中返利金额进行核验
 result = {"rebateAmount": result["data"]["rebateAmount"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict01", rebate_amount)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/列表查询条件验证_三方用户列表.air/列表查询条件验证_三方用户列表.py

@@ -47,11 +47,13 @@ request_body = commonFuc().get_business_data(module, "payload32", customer_name,
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 # print(result)
 # 获取查询结果中三方用户信息
 result = {"customerCode": result["data"]["list"][0]["customerCode"]}
-
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict32", customer_code)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/列表查询条件验证_产品线商品.air/列表查询条件验证_产品线商品.py

@@ -16,8 +16,8 @@ module = "cmdc_rebate"
 
 # 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
+username = commonFuc().get_business_data(module, "username2")
+password = commonFuc().get_business_data(module, "password2")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
@@ -48,10 +48,13 @@ request_body = commonFuc().get_business_data(module, "payload16", product_name,
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 # print(result)
 # 获取查询结果中商品对应的商品code
 result = {"relevanceCode": result["data"]["list"][0]["relevanceCode"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict16", product_code)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/列表查询条件验证_可使用商品返利清单.air/列表查询条件验证_可使用商品返利清单.py

@@ -63,11 +63,13 @@ request_body = commonFuc().get_business_data(module, "payload36", product_name,
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 # print(result)
 # 获取查询结果中可使用商品返利清单信息
 result = {"productCode": result["data"]["list"][0]["productCode"]}
-
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict36", product_code)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/列表查询条件验证_可发放客户清单.air/列表查询条件验证_可发放客户清单.py

@@ -60,11 +60,13 @@ print(request_body)
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-print(result)
+# print(result)
 # 获取查询结果中可发放客户清单信息
 result = {"customerCode": result["data"]["list"][0]["customerCode"]}
-
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict38", customer_code)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/列表查询条件验证_商品黑名单.air/列表查询条件验证_商品黑名单.py

@@ -40,6 +40,8 @@ url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url11")
 request_body = commonFuc().get_business_data(module, "payload11", rebate_id)
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 # print(result)
 if result["data"]["list"]:
@@ -64,16 +66,20 @@ if result["data"]["list"]:
 
     # 发送请求
     result = requests.post(url, json=request_body, headers=headers)
+    # 获取接口响应时间
+    api_time = float(result.elapsed.total_seconds())
     result = json.loads(result.content)
     # print(result)
     # 获取查询结果中商品对应的商品名称
     result = {"productname": result["data"]["list"][0]["productname"]}
+    result["api_time"] = api_time
     # 获取预期结果
     check_dict = commonFuc().get_business_data(module, "checkDict12", product_name)
     # 断言实际结果中是否包含预期结果的内容
     commonFuc().check_result(check_dict, result)
 else:
     result = {"list": result["data"]["list"]}
+    result["api_time"] = api_time
     # 获取预期结果
     check_dict = commonFuc().get_business_data(module, "checkDict12_1")
     # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/列表查询条件验证_客户发放返利.air/列表查询条件验证_客户发放返利.py

@@ -63,10 +63,13 @@ request_body = commonFuc().get_business_data(module, "payload6", customer_code,
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 # print(result)
 # 获取查询结果中返利明细对应的客户编号
 result = {"customerCode": result["data"]["list"][0]["customerCode"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict6", customer_code)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/列表查询条件验证_客户范围.air/列表查询条件验证_客户范围.py

@@ -61,10 +61,13 @@ print(request_body)
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-print(result)
+# print(result)
 # 获取查询结果对应的客户编号
 result = {"customercode": result["data"]["list"][0]["customercode"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict14", customer_code)
 # 断言实际结果中是否包含预期结果的内容