Merge branch 'master' into 'main'

Master|代码更新归档

See merge request !6

air_case/cmdc_demand_mall/需求单列表获取接口验证.air/需求单列表获取接口验证.py

@@ -33,8 +33,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)
-# print(result)
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict1")
 # print(check_dict)

air_case/cmdc_demand_mall/需求单取消功能验证.air/需求单取消功能验证.py

@@ -39,12 +39,15 @@ request_body = commonFuc().get_business_data(module, "payload23")
 
 # 发送请求
 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"]:
     # 查询需求单状态
     sql = "SELECT t.orderStatus FROM `cmdc-order`.tc_demand t WHERE t.demandId = 40213"
     result = {"orderStatus": mysql_handle.selectSql(host, port, user, pwd, "cmdc-order", sql)[0][0]}
+    result["api_time"] = api_time
     # print(result)
     # 获取预期结果
     check_dict = commonFuc().get_business_data(module, "checkDict23")

air_case/cmdc_demand_mall/需求单商品返利明细获取验证.air/需求单商品返利明细获取验证.py

@@ -47,12 +47,23 @@ request_body = commonFuc().get_business_data(module, "payload26", demand_code)
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 # print(result)
-# 获取返利明细中demandCode
-result = {"demandCode": result["data"][0]["demandCode"]}
-# 获取预期结果
-check_dict = commonFuc().get_business_data(module, "checkDict26", demand_code)
-# print(check_dict)
-# 断言实际结果中是否包含预期结果的内容
-commonFuc().check_result(check_dict, result)
+# 历史数据会出现需求单详情报错的情况
+if result["success"]:
+    # 获取返利明细中demandCode
+    result = {"demandCode": result["data"][0]["demandCode"]}
+    result["api_time"] = api_time
+    # 获取预期结果
+    check_dict = commonFuc().get_business_data(module, "checkDict26", demand_code)
+    # print(check_dict)
+    # 断言实际结果中是否包含预期结果的内容
+    commonFuc().check_result(check_dict, result)
+else:
+    # 获取预期结果/打印出有问题的需求单信息
+    check_dict = commonFuc().get_business_data(module, "checkDict26", demand_code)
+    # print(check_dict)
+    # 断言实际结果中是否包含预期结果的内容
+    commonFuc().check_result(check_dict, result)

air_case/cmdc_demand_mall/需求单销售合同下载功能验证.air/需求单销售合同下载功能验证.py

@@ -36,9 +36,9 @@ result = json.loads(result.content)
 random_demand = random.randint(0, len(result["data"]["list"]) - 1)
 # 获取需求单信息
 demand_id = result["data"]["list"][random_demand]["demandId"]
-# demand_id = "40187"
+# demand_id = "37974"
 demand_code = result["data"]["list"][random_demand]["demandCode"]
-
+# 16934694037805759
 
 # 第三步进行需求单销售合同下载
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url22")
@@ -52,8 +52,9 @@ request_body = commonFuc().get_business_data(module, "payload22", demand_id)
 
 # 发送请求
 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__)))))
@@ -67,10 +68,11 @@ with open(file_path, 'wb') as f:
 excel = HandleExcel(file_path, "Sheet1")
 result = {"demandCode": excel.read_data()[0].get("医疗器械产品销售合同 ")[-17:]}
 print(excel.read_data()[0].get("医疗器械产品销售合同 "))
-print(result)
+result["api_time"] = api_time
+# print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict22", demand_code)
-print(check_dict)
+# print(check_dict)
 # 断言实际结果中是否包含预期结果的内容
 commonFuc().check_result(check_dict, result)
 

air_case/cmdc_demand_mall/验证订单占用功能.air/验证订单占用功能.py

@@ -34,7 +34,7 @@ random_demand = random.randint(0, len(result["data"]["list"]) - 1)
 # 获取需求单信息
 demand_id = result["data"]["list"][random_demand]["demandId"]
 # demand_id = "40187"
-
+demand_code = result["data"]["list"][random_demand]["demandCode"]
 
 # 第三步判断需求单是否被占用
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url19")
@@ -48,12 +48,22 @@ request_body = commonFuc().get_business_data(module, "payload19", demand_id)
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-print(result)
+# print(result)
+result["api_time"] = api_time
 
-# 获取预期结果
-check_dict = commonFuc().get_business_data(module, "checkDict19")
-# print(check_dict)
-# 断言实际结果中是否包含预期结果的内容
-commonFuc().check_result(check_dict, result)
+# 历史数据会出现需求单详情报错的情况
+if result["success"]:
+    # 获取预期结果
+    check_dict = commonFuc().get_business_data(module, "checkDict19")
+    # print(check_dict)
+    # 断言实际结果中是否包含预期结果的内容
+    commonFuc().check_result(check_dict, result)
+else:
+    # 获取预期结果/打印出有问题的需求单信息
+    check_dict = commonFuc().get_business_data(module, "checkDict26", demand_code)
+    # 断言实际结果中是否包含预期结果的内容
+    commonFuc().check_result(check_dict, result)
 

air_case/cmdc_demand_mall/验证订单是否已支付.air/验证订单是否已支付.py

@@ -47,8 +47,11 @@ request_body = commonFuc().get_business_data(module, "payload36", demand_parent_
 
 # 发送请求
 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
 if proof_sign:
     # 获取预期结果
     check_dict = commonFuc().get_business_data(module, "checkDict36")

air_case/cmdc_demand_mall/验证订单是否被占用.air/验证订单是否被占用.py

@@ -34,7 +34,7 @@ random_demand = random.randint(0, len(result["data"]["list"]) - 1)
 # 获取需求单信息
 demand_id = result["data"]["list"][random_demand]["demandId"]
 # demand_id = "40187"
-
+demand_code = result["data"]["list"][random_demand]["demandCode"]
 
 # 第三步解除订单占用
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url37")
@@ -48,10 +48,20 @@ request_body = commonFuc().get_business_data(module, "payload37", demand_id)
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-# print(result)
-# 获取预期结果
-check_dict = commonFuc().get_business_data(module, "checkDict37")
-# print(check_dict)
-# 断言实际结果中是否包含预期结果的内容
-commonFuc().check_result(check_dict, result)
+# 历史数据会出现需求单详情报错的情况
+if result["success"]:
+    # print(result)
+    result["api_time"] = api_time
+    # 获取预期结果
+    check_dict = commonFuc().get_business_data(module, "checkDict37")
+    # print(check_dict)
+    # 断言实际结果中是否包含预期结果的内容
+    commonFuc().check_result(check_dict, result)
+else:
+    # 获取预期结果/打印出有问题的需求单信息
+    check_dict = commonFuc().get_business_data(module, "checkDict26", demand_code)
+    # 断言实际结果中是否包含预期结果的内容
+    commonFuc().check_result(check_dict, result)
\ No newline at end of file

air_case/cmdc_frequent_purchase/常购清单列表商品移除.air/常购清单列表商品移除.py

@@ -73,8 +73,10 @@ if result_product_id == product_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, "checkDict3")
     print(check_dict)

air_case/cmdc_frequent_purchase/新增JDE已停用的商品至常购清单列表.air/新增JDE已停用的商品至常购清单列表.py

@@ -10,6 +10,7 @@ from common.common_func import commonFuc
 from air_case.cmdc_login.多采商城登录.多采商城登录 import CmdcMaiiLogin
 from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
 import requests
+import random
 import json
 
 
@@ -29,10 +30,13 @@ request_body = commonFuc().get_business_data(module, "payload80")
 result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
 
+# 生成随机数
+product_random = random.randint(0, len(result["data"]["list"]) - 1)
 # 获取商品对应的productId和referencePrice
-product_id = result["data"]["list"][0]["productId"]
-price = result["data"]["list"][0]["referencePrice"]
-
+product_id = result["data"]["list"][product_random]["productId"]
+price = result["data"]["list"][product_random]["referencePrice"]
+productCode = result["data"]["list"][product_random]["productCode"]
+# print(productCode)
 # 第二步登录多采商城添加JDE已停用的商品至常购清单列表
 # 获取登录所需账号密码
 username = commonFuc().get_business_data(module, "username")
@@ -52,10 +56,20 @@ request_body = commonFuc().get_business_data(module, "payload8", product_id, pri
 
 # 发送请求
 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, "checkDict8")
-print(check_dict)
-# 断言实际结果中是否包含预期结果的内容
-commonFuc().check_result(check_dict, result)
+if result["code"] == "1078":
+    # 获取预期结果
+    check_dict = commonFuc().get_business_data(module, "checkDict8_1")
+    # print(check_dict)
+    # 断言实际结果中是否包含预期结果的内容
+    commonFuc().check_result(check_dict, result)
+else:
+    # 获取预期结果
+    check_dict = commonFuc().get_business_data(module, "checkDict8")
+    # print(check_dict)
+    # 断言实际结果中是否包含预期结果的内容
+    commonFuc().check_result(check_dict, result)

air_case/cmdc_frequent_purchase/新增不存在的商品至常购清单列表.air/新增不存在的商品至常购清单列表.py

@@ -36,8 +36,10 @@ request_body = commonFuc().get_business_data(module, "payload400", product_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, "checkDict400")
 # print(check_dict)

air_case/cmdc_frequent_purchase/新增商品至常购清单列表.air/新增商品至常购清单列表.py

@@ -40,7 +40,10 @@ request_body = commonFuc().get_business_data(module, "payload3001")
 
 # 发送请求
 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_frequent_purchase/新增已失效商品至常购清单列表.air/新增已失效商品至常购清单列表.py

@@ -60,7 +60,10 @@ request_body = commonFuc().get_business_data(module, "payload4", product_id, pri
 
 # 发送请求
 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, "checkDict4")

air_case/cmdc_frequent_purchase/新增控销商品至常购清单列表.air/新增控销商品至常购清单列表.py

@@ -60,8 +60,10 @@ request_body = commonFuc().get_business_data(module, "payload5", product_id, pri
 
 # 发送请求
 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, "checkDict5")
 print(check_dict)

air_case/cmdc_frequent_purchase/新增赠品_控销_商品至常购清单列表.air/新增赠品_控销_商品至常购清单列表.py

@@ -10,6 +10,7 @@ from common.common_func import commonFuc
 from air_case.cmdc_login.多采商城登录.多采商城登录 import CmdcMaiiLogin
 from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
 import requests
+import random
 import json
 
 
@@ -25,13 +26,15 @@ headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_toke
 # 查询商品列表获取赠品_控销_商品信息
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url60")
 request_body = commonFuc().get_business_data(module, "payload60")
-
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
+
+# 生成随机数
+product_random = random.randint(0, len(result["data"]["list"]) - 1)
 # 获取商品信息并进行参数化处理
-product_id = result["data"]["list"][0]["productId"]
-price = result["data"]["list"][0]["referencePrice"]
+product_id = result["data"]["list"][product_random]["productId"]
+price = result["data"]["list"][product_random]["referencePrice"]
 
 # 第二步登录多采商城添加赠品_控销_商品至常购清单列表
 # 获取登录所需账号密码
@@ -52,10 +55,19 @@ request_body = commonFuc().get_business_data(module, "payload6", product_id, pri
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-# print(result)
-# 获取预期结果
-check_dict = commonFuc().get_business_data(module, "checkDict6")
-print(check_dict)
-# 断言实际结果中是否包含预期结果的内容
-commonFuc().check_result(check_dict, result)
+result["api_time"] = api_time
+if result["code"] == "1078":
+    # 获取预期结果
+    check_dict = commonFuc().get_business_data(module, "checkDict8_1")
+    # print(check_dict)
+    # 断言实际结果中是否包含预期结果的内容
+    commonFuc().check_result(check_dict, result)
+else:
+    # 获取预期结果
+    check_dict = commonFuc().get_business_data(module, "checkDict6")
+    # print(check_dict)
+    # 断言实际结果中是否包含预期结果的内容
+    commonFuc().check_result(check_dict, result)

air_case/cmdc_frequent_purchase/新增赠品至常购清单列表.air/新增赠品至常购清单列表.py

@@ -29,6 +29,7 @@ request_body = commonFuc().get_business_data(module, "payload70")
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
+
 # 获取商品信息并进行参数化处理
 product_id = result["data"]["list"][0]["productId"]
 price = result["data"]["list"][0]["referencePrice"]
@@ -59,8 +60,10 @@ request_body = commonFuc().get_business_data(module, "payload7", product_id, pri
 
 # 发送请求
 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, "checkDict7")
 print(check_dict)

air_case/cmdc_frequent_purchase/添加跨站点商品至常购清单列表.air/添加跨站点商品至常购清单列表.py

@@ -73,10 +73,10 @@ request_body = commonFuc().get_business_data(module, "payload4", product_id_102,
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
-# # 获取预期结果
-check_dict = commonFuc().get_business_data(module, "checkDict9")
-# # 断言实际结果中是否包含预期结果的内容
-commonFuc().check_result(check_dict, result)
+# # # 获取预期结果
+# check_dict = commonFuc().get_business_data(module, "checkDict9")
+# # # 断言实际结果中是否包含预期结果的内容
+# commonFuc().check_result(check_dict, result)
 
 # 步骤五切换至子站点国药集团河南省医疗器械有限公司并添加商品至常购清单列表
 # 切换至子站点
@@ -91,10 +91,12 @@ request_body = commonFuc().get_business_data(module, "payload4", product_id_103,
 
 # 发送请求
 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")
-print(check_dict)
+# print(check_dict)
 # 断言实际结果中是否包含预期结果的内容
 commonFuc().check_result(check_dict, result)

air_case/cmdc_frequent_purchase/获取用户常购清单列表.air/获取用户常购清单列表.py

@@ -33,8 +33,10 @@ 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)
-# print(result)
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict2")
 print(check_dict)

air_case/cmdc_fresenius_group/产品线查询.air/产品线查询.py

@@ -33,7 +33,10 @@ request_body = commonFuc().get_business_data(module, "payload3")
 
 # 发送请求
 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, "checkDict3")

air_case/cmdc_fresenius_group/创建需求单_普通套包.air/创建需求单_普通套包.py

@@ -16,30 +16,33 @@ module = "cmdc_fresenius_group"
 
 # 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username")
-password = commonFuc().get_business_data(module, "password")
+username = commonFuc().get_business_data(module, "username2")
+password = commonFuc().get_business_data(module, "password2")
 # 获取登录后Cmdc_access_token
 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, "url31")
 request_body = commonFuc().get_business_data(module, "payload31")
 
 """
 
- 场景:套包清单获取
- 用例名称：套包清单获取
+ 场景:创建需求单_普通套包
+ 用例名称：创建需求单_普通套包
  输出：{"demandCode": "%s"}
 
 """
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-demand_parent_id = result["data"]["国药集团上海医疗器械有限公司"]["demandParentId"]
-result = {"demandCode": result["data"]["国药集团上海医疗器械有限公司"]["demandItems"][0]["demandCode"]}
 
+demand_parent_id = result["data"]["国药集团联合医疗器械有限公司"]["demandParentId"]
+result = {"demandCode": result["data"]["国药集团联合医疗器械有限公司"]["demandItems"][0]["demandCode"]}
+result["api_time"] = api_time
 # 数据库操作
 mysql_handle = mySql()
 # 获取conf.ini文件中配置的数据库信息

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

@@ -51,8 +51,11 @@ request_body = commonFuc().get_business_data(module, "payload7", group_code, gro
 
 # 发送请求
 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]["products"][0]["productCode"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict7", product_code)
 # 断言实际结果中是否包含预期结果的内容