Merge branch 'master' into 'main'

Master|代码更新归档

See merge request !6

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

@@ -47,10 +47,14 @@ request_body = commonFuc().get_business_data(module, "payload19", line_code, lin
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
+
 # print(result)
 # 获取查询结果中产品线
 result = {"lineCode": result["data"]["list"][0]["relevanceCode"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict19", line_code)
 # print(check_dict)

air_case/cmdc_product/列表查询条件验证_发货时间列表.air/列表查询条件验证_发货时间列表.py

@@ -28,9 +28,10 @@ request_body = commonFuc().get_business_data(module, "payload34")
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
 result = json.loads(result.content)
-
+# print(result)
 # 生成一个随机数
 delivery_time_random = random.randint(0, len(result["data"]["list"]) - 1)
+# delivery_time_random = 0
 # 判断商品圈定方式
 if result["data"]["list"][delivery_time_random]["productRangeType"]:
 
@@ -39,17 +40,19 @@ if result["data"]["list"][delivery_time_random]["productRangeType"]:
     # 通过查看发货时间详情获取商品信息
     url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url36")
     request_body = commonFuc().get_business_data(module, "payload36", delivery_time_id)
-
+    # print(request_body)
     # 发送请求
     result1 = requests.get(url, params=request_body, headers=headers)
     result1 = json.loads(result1.content)
-
+    # print(result1)
     # 获取商品信息
     line_codes = ""
-    name = result1["data"]["list"][delivery_time_random]["name"]
-    status = result1["data"]["list"][delivery_time_random]["status"]
-    product_code = result1["data"]["list"][delivery_time_random]["productList"][0]["productCode"]
-    product_name = result1["data"]["list"][delivery_time_random]["productList"][0]["productName"]
+    name = result1["data"]["name"]
+    status = result1["data"]["status"]
+    product_code = (
+        result1["data"]["productList"][0]["productCode"] if result1["data"]["productList"][0]["productCode"] else "")
+    product_name = (
+        result1["data"]["productList"][0]["productName"] if result1["data"]["productList"][0]["productName"] else "")
 
     # 进行查询条件验证
     url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url35")
@@ -58,10 +61,13 @@ if result["data"]["list"][delivery_time_random]["productRangeType"]:
 
     # 发送请求
     result = requests.get(url, params=request_body, headers=headers)
+    # 获取接口响应时间
+    api_time = float(result.elapsed.total_seconds())
     result = json.loads(result.content)
     # print(result)
     # 获取查询结果中规则名称
     result = {"name": result["data"]["list"][0]["name"]}
+    result["api_time"] = api_time
     # 获取预期结果
     check_dict = commonFuc().get_business_data(module, "checkDict35", name)
     # print(check_dict)
@@ -88,10 +94,13 @@ else:
 
     # 发送请求
     result = requests.get(url, params=request_body, headers=headers)
+    # 获取接口响应时间
+    api_time = float(result.elapsed.total_seconds())
     result = json.loads(result.content)
     # print(result)
     # 获取查询结果中规则名称
     result = {"name": result["data"]["list"][0]["name"]}
+    result["api_time"] = api_time
     # 获取预期结果
     check_dict = commonFuc().get_business_data(module, "checkDict35", name)
     # print(check_dict)

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

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

air_case/cmdc_product/列表查询条件验证_商品列表_库存配置.air/列表查询条件验证_商品列表_库存配置.py

@@ -16,19 +16,19 @@ import json
 module = "cmdc_product"
 
 # 获取登录所需账号密码
-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)
 
-# 获取产品线列表
+# 获取商品列表
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url20")
 request_body = commonFuc().get_business_data(module, "payload20")
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
-
+# print(result)
 # 生成一个随机数字，用于后续随机选择某一条商品属性信息
 rebate_random = random.randint(0, len(result["data"]["list"]) - 1)
 # 获取商品信息
@@ -47,10 +47,13 @@ request_body = commonFuc().get_business_data(module, "payload21", product_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 = {"productCode": result["data"]["list"][0]["productCode"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict21", product_code)
 # print(check_dict)

air_case/cmdc_product/列表查询条件验证_商品属性列表.air/列表查询条件验证_商品属性列表.py

@@ -17,8 +17,8 @@ module = "cmdc_product"
 
 # 第一步登录后台运营平台获取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)
@@ -73,10 +73,13 @@ request_body = commonFuc().get_business_data(module, "payload2", product_code, p
 
 # 发送请求
 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 = {"productCode": result["data"]["list"][0]["productCode"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict2", product_code)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_product/列表查询条件验证_商品附件列表.air/列表查询条件验证_商品附件列表.py

@@ -52,10 +52,13 @@ request_body = commonFuc().get_business_data(module, "payload12", product_line_c
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 
 # 获取查询结果中商品对应的附件名称
 result = {"fileName": result["data"]["list"][0]["fileName"]}
+result["api_time"] = api_time
 # print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict12", file_name)

air_case/cmdc_product/列表查询条件验证_库存配置列表.air/列表查询条件验证_库存配置列表.py

@@ -16,8 +16,8 @@ import json
 module = "cmdc_product"
 
 # 获取登录所需账号密码
-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)
@@ -47,10 +47,12 @@ request_body = commonFuc().get_business_data(module, "payload14", rule_name)
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 # 获取查询结果中库存配置名称
 result = {"ruleName": result["data"]["list"][0]["ruleName"]}
-
+result["api_time"] = api_time
 # print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict14", rule_name)

air_case/cmdc_product/发货时间规则停用功能验证.air/发货时间规则停用功能验证.py

@@ -45,7 +45,12 @@ request_body = commonFuc().get_business_data(module, "payload37", delivery_time_
 
 # 发送请求
 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, "checkDict37")

air_case/cmdc_product/发货时间规则启用用功能验证.air/发货时间规则启用用功能验证.py

@@ -15,8 +15,8 @@ import json
 module = "cmdc_product"
 
 # 获取登录所需账号密码
-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)
@@ -45,7 +45,11 @@ request_body = commonFuc().get_business_data(module, "payload38", delivery_time_
 
 # 发送请求
 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, "checkDict38")

air_case/cmdc_product/商品价格明细导出验证.air/商品价格明细导出验证.py

@@ -51,8 +51,10 @@ request_body = commonFuc().get_business_data(module, "payload53", product_code)
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
-# result = json.loads(result.content)
-# print(result)
+
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
+
 
 # 获取文件
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
@@ -65,6 +67,8 @@ with open(file_path, 'wb') as f:
 # 获取文件中商品编码
 excel = HandleExcel(file_path, "Sheet1")
 result = {"productCode": excel.read_data()[0].get("商品编码")}
+
+result["api_time"] = api_time
 # print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict53", product_code)

air_case/cmdc_product/商品属性修改功能验证.air/商品属性修改功能验证.py

@@ -63,10 +63,14 @@ request_body = commonFuc().get_business_data(module, "payload5", product_id, pro
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 # print(result)
 # 获取查询结果中data信息
 result = {"data": result["data"]}
+
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict5", property_id)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_product/商品属性批量新增验证.air/商品属性批量新增验证.py

@@ -67,7 +67,10 @@ files = {"file": file}
 
 # 发送请求
 result = requests.post(url, files=files, headers=headers, params=request_body)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
+result["api_time"] = api_time
 file.close()
 # print(result)
 # 获取预期结果

air_case/cmdc_product/商品附件列表获取.air/商品附件列表获取.py

@@ -32,8 +32,10 @@ request_body = commonFuc().get_business_data(module, "payload11")
 """
 # 发送请求
 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, "checkDict11")
 # print(check_dict)

air_case/cmdc_product/商品限购明细导出验证.air/商品限购明细导出验证.py

@@ -48,7 +48,9 @@ request_body = commonFuc().get_business_data(module, "payload45", product_code)
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
-# result = json.loads(result.content)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
+
 # print(result)
 # 获取文件
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
@@ -62,6 +64,7 @@ with open(file_path, 'wb') as f:
 excel = HandleExcel(file_path, "Sheet1")
 result = {"productCode": excel.read_data()[0].get("商品编码")}
 
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict45", product_code)
 # print(check_dict)

air_case/cmdc_product/导入日志获取.air/导入日志获取.py

@@ -34,8 +34,11 @@ request_body = commonFuc().get_business_data(module, "payload10")
 
 # 发送请求
 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, "checkDict10")
 # print(check_dict)

air_case/cmdc_product/将产品线信息同步JDE.air/将产品线信息同步JDE.py

@@ -34,8 +34,11 @@ request_body = commonFuc().get_business_data(module, "payload73")
 
 # 发送请求
 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, "checkDict73")
 # print(check_dict)

air_case/cmdc_product/库存规则配置列表获取.air/库存规则配置列表获取.py

@@ -34,8 +34,11 @@ request_body = commonFuc().get_business_data(module, "payload13")
 
 # 发送请求
 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, "checkDict13")
 # print(check_dict)

air_case/cmdc_product/库存配置导出验证.air/库存配置导出验证.py

@@ -50,8 +50,9 @@ request_body = commonFuc().get_business_data(module, "payload26", rule_id)
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
-# result = json.loads(result.content)
-# print(result)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
+
 
 # 获取文件
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
@@ -64,6 +65,8 @@ with open(file_path, 'wb') as f:
 # 获取文件中订单编号
 excel = HandleExcel(file_path, "产品线展示库存")
 result = {"productLineCode": excel.read_data()[0].get("产品线编码")}
+
+result["api_time"] = api_time
 # print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict26", product_line_code)

air_case/cmdc_product/必填字段校验_产品线制单员删除.air/必填字段校验_产品线制单员删除.py

+# -*- encoding=utf8 -*-
+__author__ = "liguangyu"
+
+"""
+case_tag:cmdc_api,cmdc必填字段校验_产品线制单员删除,2293,2293-086,sit,bs
+主数据平台:运营后台管理系统产品线制单员删除接口
+"""
+
+from common.common_func import commonFuc
+from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
+import requests
+import json
+
+
+module = "cmdc_product"
+
+
+# 获取登录所需账号密码
+username = commonFuc().get_business_data(module, "username1")
+password = commonFuc().get_business_data(module, "password1")
+# 获取登录后Cmdc_access_token
+cmdc_access_token = CmdcDoLogin(username, password).get_token()
+headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
+
+# 验证制单员删除接口必填字段非空校验
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url80")
+request_body = commonFuc().get_business_data(module, "payload80")
+
+"""
+
+ 场景: 必填字段校验_产品线制单员删除
+ 用例名称：必填字段校验_产品线制单员删除
+ 输出：{"success":false,"code":"ADD MARKERMEMBER ERROR","message":"操作失败：制单员Id为空!","data":null,"freshToken":null}
+"""
+
+# 发送请求
+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, "checkDict80")
+# print(check_dict)
+# 断言实际结果中是否包含预期结果的内容
+commonFuc().check_result(check_dict, result)
+

air_case/cmdc_product/批量上传商品限购规则日志获取.air/批量上传商品限购规则日志获取.py

@@ -34,8 +34,10 @@ request_body = commonFuc().get_business_data(module, "payload44")
 
 # 发送请求
 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, "checkDict44")
 # print(check_dict)