Merge branch 'master' into 'main'

Master|代码更新归档

See merge request !6

air_case/cmdc_fresenius_group/套包列表查询条件验证_商品详情页跳转.air/套包列表查询条件验证_商品详情页跳转.py

@@ -9,33 +9,36 @@ case_tag:cmdc_api,cmdc套包列表查询条件验证_商品详情页跳转,2264,
 from common.common_func import commonFuc
 from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
 import requests
+import random
 import json
 
 module = "cmdc_fresenius_group"
 
 # 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
+username = commonFuc().get_business_data(module, "username4")
+password = commonFuc().get_business_data(module, "password4")
 # 获取登录后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, "url1")
-request_body = commonFuc().get_business_data(module, "payload22")
+request_body = commonFuc().get_business_data(module, "payload22_1")
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
 
+# 生成随机数
+group_random = random.randint(0, len(result["data"]["list"]) - 1)
 # 获取套包中商品信息和套包信息groupProductCode
-product_info = result["data"]["list"][0]["products"][0]["productName"]
-product_line_code = result["data"]["list"][0]["productLineCode"]
-company_code = result["data"]["list"][0]["products"][0]["companyCode"]
-group_product_code = result["data"]["list"][0]["products"][0]["productCode"]
-group_name = result["data"]["list"][0]["groupName"]
-group_material_code = result["data"]["list"][0]["products"][0]["materialCode"]
-group_code = result["data"]["list"][0]["groupCode"]
+product_info = result["data"]["list"][group_random]["products"][0]["productName"]
+product_line_code = result["data"]["list"][group_random]["productLineCode"]
+company_code = result["data"]["list"][group_random]["products"][0]["companyCode"]
+group_product_code = result["data"]["list"][group_random]["products"][0]["productCode"]
+group_name = result["data"]["list"][group_random]["groupName"]
+group_material_code = result["data"]["list"][group_random]["products"][0]["materialCode"]
+group_code = result["data"]["list"][group_random]["groupCode"]
 
 # 第三步获取商品对应的套包信息
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url28")
@@ -52,11 +55,23 @@ request_body = commonFuc().get_business_data(module, "payload28", product_info,
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 # print(result)
-# 获取商品对应的groupCode
-result = {"groupCode": result["data"][0]["groupCode"]}
-# 获取预期结果
-check_dict = commonFuc().get_business_data(module, "checkDict28", group_code)
-# 断言实际结果中是否包含预期结果的内容
-commonFuc().check_result(check_dict, result)
+if result["data"]:
+    # 获取商品对应的groupCode
+    result = {"groupCode": result["data"][0]["groupCode"]}
+    result["api_time"] = api_time
+    # 获取预期结果
+    check_dict = commonFuc().get_business_data(module, "checkDict28", group_code)
+    # 断言实际结果中是否包含预期结果的内容
+    commonFuc().check_result(check_dict, result)
+else:
+    # 获取商品对应的groupCode
+    result = {"groupCode": result["data"]}
+    result["api_time"] = api_time
+    # 获取预期结果
+    check_dict = commonFuc().get_business_data(module, "checkDict28", None)
+    # 断言实际结果中是否包含预期结果的内容
+    commonFuc().check_result(check_dict, result)

air_case/cmdc_fresenius_group/套包列表的获取.air/套包列表的获取.py

@@ -32,7 +32,10 @@ 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")
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_fresenius_group/套包删除验证.air/套包删除验证.py

@@ -44,8 +44,10 @@ request_body = commonFuc().get_business_data(module, "payload9", group_id)
 
 # 发送请求
 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, "checkDict9")
 # 断言实际结果中是否包含预期结果的内容
@@ -61,6 +63,7 @@ host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
 sql = "SELECT t.status FROM `cmdc-order`.tc_fresenius_group t WHERE groupId = '%s'" % group_id
 status = mysql_handle.selectSql(host, port, user, pwd, "cmdc-order", sql)[0][0]
 result = {"status": status}
+
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict90")
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_fresenius_group/套包加入购物车验证.air/套包加入购物车验证.py

@@ -35,7 +35,11 @@ request_body = commonFuc().get_business_data(module, "payload29")
 
 # 发送请求
 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, "checkDict29")

air_case/cmdc_fresenius_group/套包商品列表查询条件验证.air/套包商品列表查询条件验证.py

@@ -48,8 +48,14 @@ request_body = commonFuc().get_business_data(module, "payload6", product_code, p
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
+
 result = {"productCode": result["data"]["list"][0]["productCode"]}
+
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict6", product_code)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_fresenius_group/套包商品列表获取.air/套包商品列表获取.py

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

air_case/cmdc_fresenius_group/套包批量删除.air/套包批量删除.py

@@ -74,8 +74,11 @@ request_body = {"groupIds": [result["data"]["freseniusGroups"][0]["products"][0]
 
 # 发送请求
 result = requests.post(url, headers=headers, json=request_body)
+
+# 获取接口响应时间
+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, "checkDict21")

air_case/cmdc_fresenius_group/套包批量删除_套包不存在.air/套包批量删除_套包不存在.py

@@ -53,10 +53,14 @@ 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)
+
 file.close()
 result = {"success": result["data"]["errMsg"]["success"]}
-
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict23")
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_fresenius_group/套包批量新增_商品数量少于2.air/套包批量新增_商品数量少于2.py

@@ -19,8 +19,8 @@ module = "cmdc_fresenius_group"
 
 # 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
+username = commonFuc().get_business_data(module, "username4")
+password = commonFuc().get_business_data(module, "password4")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers2", cmdc_access_token)
@@ -77,8 +77,11 @@ 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)
 result = {"success": result["data"]["success"]}
+result["api_time"] = api_time
 file.close()
 
 # 获取预期结果

air_case/cmdc_fresenius_group/套包批量新增_商品重复添加.air/套包批量新增_商品重复添加.py

@@ -19,8 +19,8 @@ module = "cmdc_fresenius_group"
 
 # 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
+username = commonFuc().get_business_data(module, "username4")
+password = commonFuc().get_business_data(module, "password4")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers2", cmdc_access_token)
@@ -78,8 +78,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)
+
 result = {"success": result["data"]["success"]}
+result["api_time"] = api_time
 file.close()
 
 # 获取预期结果

air_case/cmdc_fresenius_group/套包批量新增_套包名称已存在.air/套包批量新增_套包名称已存在.py

@@ -48,8 +48,8 @@ product_num = random.randint(1, 1000)
 
 # 将商品信息写入文件中
 excel = HandleExcel(file_path, "Sheet1")
-excel.write_data(row=2, column=1, value="套包测试")
-excel.write_data(row=3, column=1, value="套包测试")
+excel.write_data(row=2, column=1, value="套包000005")
+excel.write_data(row=3, column=1, value="套包000005")
 excel.write_data(row=2, column=2, value=product_code_a)
 excel.write_data(row=2, column=3, value=product_name_a)
 excel.write_data(row=2, column=4, value=product_num)
@@ -75,8 +75,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)
 result = {"success": result["data"]["success"]}
+result["api_time"] = api_time
 file.close()
 
 # 获取预期结果

air_case/cmdc_fresenius_group/套包批量新增_存在结构相同的套包.air/套包批量新增_存在结构相同的套包.py

@@ -19,8 +19,8 @@ module = "cmdc_fresenius_group"
 
 # 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
+username = commonFuc().get_business_data(module, "username4")
+password = commonFuc().get_business_data(module, "password4")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers2", cmdc_access_token)
@@ -89,9 +89,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)
-result = {"success": result["data"]["success"]}
 
+result = {"success": result["data"]["success"]}
+result["api_time"] = api_time
 
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict20")

air_case/cmdc_fresenius_group/套包批量更新_商品未满足同一产品线.air/套包批量更新_商品未满足同一产品线.py

@@ -56,8 +56,8 @@ excel.write_data(row=2, column=2, value=product_code_a)
 excel.write_data(row=2, column=3, value=product_name_a)
 excel.write_data(row=2, column=4, value=product_num)
 
-excel.write_data(row=3, column=2, value="10057881")
-excel.write_data(row=3, column=3, value="造口护理用品附件")
+excel.write_data(row=3, column=2, value="16413312")
+excel.write_data(row=3, column=3, value="微导管")
 excel.write_data(row=3, column=4, value=product_num)
 
 # 第二步批量新增套包
@@ -77,8 +77,11 @@ 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)
 result = {"success": result["data"]["success"]}
+result["api_time"] = api_time
 file.close()
 
 # 获取预期结果

air_case/cmdc_fresenius_group/套包更新_套包内商品需满足同一产品线.air/套包更新_套包内商品需满足同一产品线.py

@@ -9,6 +9,7 @@ case_tag:cmdc_api,cmdc套包更新_套包内商品需满足同一产品线,2264,
 from common.common_func import commonFuc
 from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
 import requests
+import uuid
 import json
 
 module = "cmdc_fresenius_group"
@@ -28,11 +29,18 @@ request_body = commonFuc().get_business_data(module, "payload1")
 result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
 
-# 获取现有套包名称
+# 获取现有套包信息
 product_json = result["data"]["list"][0]["products"][0]
 
+# 生成随机字符串用于当做套包名称
+group_name = str(uuid.uuid4())[:10]
+
 # 获取套包信息
 group_json = result["data"]["list"][0]
+
+# 更新套包名称
+group_json["groupName"] = group_name
+
 # 获取其他产品线商品信息
 other_product = commonFuc().get_business_data(module, "other_product")
 # 获取到套包中商品信息并进行更新操作
@@ -50,8 +58,10 @@ request_body = group_json
 
 # 发送请求
 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
 if result["success"]:
     # 获取预期结果
     check_dict = commonFuc().get_business_data(module, "checkDict16_1")

air_case/cmdc_fresenius_group/套包更新_新套包名称已存在.air/套包更新_新套包名称已存在.py

@@ -48,7 +48,10 @@ request_body = group_json
 
 # 发送请求
 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, "checkDict14")

air_case/cmdc_fresenius_group/套包更新_验证组成套包需2个或2个以上商品.air/套包更新_验证组成套包需2个或2个以上商品.py

@@ -45,7 +45,10 @@ request_body = group_json
 
 # 发送请求
 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, "checkDict15")

air_case/cmdc_fresenius_group/套包更新验证.air/套包更新验证.py

@@ -40,8 +40,10 @@ request_body = result["data"]["list"][0]
 
 # 发送请求
 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
 if result["success"]:
     # 获取预期结果
     check_dict = commonFuc().get_business_data(module, "checkDict17")

air_case/cmdc_fresenius_group/套包清单获取.air/套包清单获取.py

@@ -21,7 +21,7 @@ password = commonFuc().get_business_data(module, "password")
 cmdc_access_token = CmdcMaiiLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers1", cmdc_access_token)
 
-# 第二步加入购物车
+# 第二步获取套包信息
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url30")
 request_body = commonFuc().get_business_data(module, "payload30")
 
@@ -35,7 +35,10 @@ request_body = commonFuc().get_business_data(module, "payload30")
 
 # 发送请求
 result = requests.get(url, params=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, "checkDict30")

air_case/cmdc_fresenius_group/套包的创建.air/套包的创建.py

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

air_case/cmdc_fresenius_group/导入日志查询.air/导入日志查询.py

@@ -32,7 +32,10 @@ url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url24")
 
 # 发送请求
 result = requests.get(url, 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, "checkDict24")