Merge branch 'master' into 'main'

Master|代码更新归档

See merge request !6

air_case/cmdc_rebate/列表查询条件验证_返利使用明细.air/列表查询条件验证_返利使用明细.py

@@ -70,11 +70,14 @@ request_body = commonFuc().get_business_data(module, "payload2", 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)
+# print(result)
 if result["data"]["list"]:
     # 获取查询结果中使用明细对应的客户编号
     result = {"customerCode": result["data"]["list"][0]["customerCode"]}
+    result["api_time"] = api_time
     # 获取预期结果
     check_dict = commonFuc().get_business_data(module, "checkDict2", customer_code)
     # 断言实际结果中是否包含预期结果的内容
@@ -82,6 +85,7 @@ if result["data"]["list"]:
 else:
     # 获取查询结果中使用明细对应的客户编号
     result = {"list": result["data"]["list"]}
+    result["api_time"] = api_time
     # 获取预期结果
     check_dict = commonFuc().get_business_data(module, "checkDict2_1")
     # 断言实际结果中是否包含预期结果的内容

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

@@ -52,10 +52,13 @@ request_body = commonFuc().get_business_data(module, "payload34", status, rebate
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 # print(result)
 # 获取查询结果中的返利信息
 result = {"rebateTheme": result["data"]["list"][0]["rebateTheme"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict34", rebate_theme)
 # 断言实际结果中是否包含预期结果的内容

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)
@@ -59,10 +59,13 @@ request_body = commonFuc().get_business_data(module, "payload9", create_name, au
 
 # 发送请求
 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 = {"rebatename": result["data"]["list"][0]["rebatename"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict9", rebate_name)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/列表查询条件验证_返利规则.air/列表查询条件验证_返利规则.py

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

air_case/cmdc_rebate/可使用商品返利清单获取验证.air/可使用商品返利清单获取验证.py

@@ -47,8 +47,11 @@ request_body = commonFuc().get_business_data(module, "payload35", rebate_trip_td
 
 # 发送请求
 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)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict35")
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/可发放客户清单获取验证.air/可发放客户清单获取验证.py

@@ -47,8 +47,10 @@ request_body = commonFuc().get_business_data(module, "payload37", rebate_trip_td
 
 # 发送请求
 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, "checkDict37")
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/商品黑名单批量导入_返利规则_商品与产品线不匹配.air/商品黑名单批量导入_返利规则_商品与产品线不匹配.py

@@ -18,8 +18,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_file", cmdc_access_token)
@@ -58,10 +58,13 @@ files = {"file": file}
 """
 # 发送请求
 result = requests.post(url, files=files, headers=headers, data=request_body)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-print(result)
+
 file.close()
 result = {"success": result["data"]["errMsg"]["success"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict20")
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/商品黑名单批量导入验证_返利规则.air/商品黑名单批量导入验证_返利规则.py

@@ -18,8 +18,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_file", cmdc_access_token)
@@ -36,7 +36,7 @@ result = requests.post(url, headers=headers, json=request_body)
 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"]
 
@@ -58,10 +58,12 @@ files = {"file": file}
 """
 # 发送请求
 result = requests.post(url, files=files, headers=headers, data=request_body)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-print(result)
 file.close()
 result = {"success": result["data"]["errMsg"]["success"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict19")
 # 断言实际结果中是否包含预期结果的内容

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)
@@ -49,6 +49,8 @@ request_body = commonFuc().get_business_data(module, "payload10_2", rebate_id, a
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 
 # 数据库操作
@@ -59,7 +61,7 @@ host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
 # 数据库查询返利规则审核状态
 sql = "SELECT t.auditStatus FROM `cmdc-order`.tc_rebate t WHERE rebateId = {}".format(rebate_id)
 result = {"auditstatus": mysql_handle.selectSql(host, port, user, pwd, "cmdc-order", sql)[0][0]}
-
+result["api_time"] = api_time
 # 一级审核通过状态变为审核拒绝
 audit_status = 103
 # 获取预期结果

air_case/cmdc_rebate/审核权限用户获取验证.air/审核权限用户获取验证.py

@@ -32,8 +32,10 @@ request_body = commonFuc().get_business_data(module, "payload7")
 
 # 发送请求
 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, "checkDict7")
 # 断言实际结果中是否包含预期结果的内容

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)
@@ -49,8 +49,12 @@ request_body = commonFuc().get_business_data(module, "payload10_1", rebate_id, a
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 
+
 # 数据库操作
 mysql_handle = mySql()
 # 获取conf.ini文件中配置的数据库信息
@@ -59,7 +63,7 @@ host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
 # 数据库查询返利规则审核状态
 sql = "SELECT t.auditStatus FROM `cmdc-order`.tc_rebate t WHERE rebateId = {}".format(rebate_id)
 result = {"auditstatus": mysql_handle.selectSql(host, port, user, pwd, "cmdc-order", sql)[0][0]}
-
+result["api_time"] = api_time
 # 一级审核通过状态变为二级审核中
 audit_status = 104
 # 获取预期结果

air_case/cmdc_rebate/客户发放返利信息获取验证.air/客户发放返利信息获取验证.py

@@ -32,7 +32,11 @@ request_body = commonFuc().get_business_data(module, "payload5")
 
 # 发送请求
 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
 
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict5")

air_case/cmdc_rebate/客户发放返利新增验证.air/客户发放返利新增验证.py

@@ -75,8 +75,11 @@ request_body = commonFuc().get_business_data(module, "payload30", rebate_id, amo
 """
 # 发送请求
 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, "checkDict30")
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/客户发放返利编辑功能验证.air/客户发放返利编辑功能验证.py

@@ -46,8 +46,11 @@ request_body = commonFuc().get_business_data(module, "payload30", rebate_id, amo
 
 # 发送请求
 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, "checkDict30")
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/客户名单批量导入验证_返利规则.air/客户名单批量导入验证_返利规则.py

@@ -60,10 +60,14 @@ files = {"file": file}
 """
 # 发送请求
 result = requests.post(url, files=files, headers=headers)
+
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-print(result)
+
 file.close()
 result = {"success": result["data"]["errMsg"]["success"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict18")
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/批量导入商品_返利发放管理.air/批量导入商品_返利发放管理.py

@@ -18,8 +18,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_file", cmdc_access_token)
@@ -60,10 +60,13 @@ files = {"file": file}
 """
 # 发送请求
 result = requests.post(url, files=files, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 # print(result)
 file.close()
 result = {"productCode": result["data"][0]["productCode"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict41", product_code)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/批量导入客户验证_返利发放管理.air/批量导入客户验证_返利发放管理.py

@@ -64,12 +64,15 @@ files = {"file": file}
 """
 # 发送请求
 result = requests.post(url, files=files, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-print(result)
+# print(result)
 file.close()
 if result["success"]:
     # 导入成功
     result = {"customerCode": result["data"][0]["customerCode"]}
+    result["api_time"] = api_time
     # 获取预期结果
     check_dict = commonFuc().get_business_data(module, "checkDict40", customer_code)
     # 断言实际结果中是否包含预期结果的内容
@@ -77,6 +80,7 @@ if result["success"]:
 else:
     # 客户编码未与此站点首营
     result = {"message": result["message"]}
+    result["api_time"] = api_time
     # 获取预期结果
     check_dict = commonFuc().get_business_data(module, "checkDict40_1")
     # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/批量导入验证_客户发放返利.air/批量导入验证_客户发放返利.py

@@ -92,8 +92,9 @@ files = {"file": file}
 """
 # 发送请求
 result = requests.post(url, files=files, headers=headers)
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-print(result)
+result["api_time"] = api_time
 file.close()
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict29")

air_case/cmdc_rebate/查询客户对应返利规则验证.air/查询客户对应返利规则验证.py

@@ -57,10 +57,13 @@ request_body = commonFuc().get_business_data(module, "payload28", 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"][0]["customercode"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict28", customer_code)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/返利使用明细.air/返利使用明细.py

@@ -32,7 +32,11 @@ request_body = commonFuc().get_business_data(module, "payload1")
 
 # 发送请求
 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
 
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict1")