Merge branch 'master' into 'main'

Master|代码更新归档

See merge request !6

air_case/cmdc_demand_mall/获取原始需求详情验证.air/获取原始需求详情验证.py

@@ -34,7 +34,7 @@ random_demand = random.randint(0, len(result["data"]["list"]) - 1)
 # 获取需求单信息
 demand_code = result["data"]["list"][random_demand]["demandCode"]
 
-# 第三步在需求单列表进行需求单查询操作
+# 第三步查看需求单详情操作
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url10")
 request_body = commonFuc().get_business_data(module, "payload10", demand_code)
 # print(request_body)
@@ -46,10 +46,13 @@ request_body = commonFuc().get_business_data(module, "payload10", demand_code)
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
 # print(result)
 # 获取原始需求单中demandCode
 result = {"demandCode": result["data"]["demandSkuList"]["list"][0]["demandCode"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict10", demand_code)
 # print(check_dict)

air_case/cmdc_demand_mall/获取审核人员列表验证.air/获取审核人员列表验证.py

@@ -34,7 +34,7 @@ random_demand = random.randint(0, len(result["data"]["list"]) - 1)
 # 获取需求单信息
 demand_code = result["data"]["list"][random_demand]["demandCode"]
 
-# 第三步在需求单列表进行需求单查询操作
+# 第三步获取审核人员列表
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url9")
 request_body = commonFuc().get_business_data(module, "payload9", demand_code)
 # print(request_body)
@@ -46,8 +46,10 @@ request_body = commonFuc().get_business_data(module, "payload9", demand_code)
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = 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)

air_case/cmdc_demand_mall/获取支付信息验证_支付页面.air/获取支付信息验证_支付页面.py

@@ -47,10 +47,13 @@ request_body = commonFuc().get_business_data(module, "payload28", code)
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
 print(result)
 # 获取需求单对应的客户折扣
 result = {"customerCharge": result["data"]["customerCharge"]}
+result["api_time"] = api_time
 # print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict28", customer_charge)

air_case/cmdc_demand_mall/获取站点信息验证_需求单.air/获取站点信息验证_需求单.py

@@ -19,14 +19,18 @@ request_body = commonFuc().get_business_data(module, "payload11")
 """
  场景: 获取站点信息验证_需求单
  用例名称：获取站点信息验证_需求单
- 输出：{"companyId":6}
+ 输出：{"companyId":7}
 """
 
 # 发送请求
 result = requests.get(url, params=request_body)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
+# print(result)
 # 获取站点信息中公司id
 result = {"companyId": result["data"]["companyId"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict11")
 # print(check_dict)

air_case/cmdc_demand_mall/获取草稿订单详情.air/获取草稿订单详情.py

@@ -46,10 +46,13 @@ request_body = commonFuc().get_business_data(module, "payload38", version)
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
 # print(result)
 # 获取草稿订单详情中id
 result = {"id": result["data"]["id"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict38", version)
 # print(check_dict)

air_case/cmdc_demand_mall/获取订单变动明细列表验证.air/获取订单变动明细列表验证.py

@@ -48,11 +48,14 @@ request_body = commonFuc().get_business_data(module, "payload16", demand_code)
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
-print(result)
+result["api_time"] = api_time
 if result["data"]:
     # 获取订单明细列表中demandCode
     result = {"demandCode": result["data"][0]["demandCode"]}
+    result["api_time"] = api_time
     # 获取预期结果
     check_dict = commonFuc().get_business_data(module, "checkDict16", demand_code)
     # print(check_dict)

air_case/cmdc_demand_mall/获取订单变动明细金额验证.air/获取订单变动明细金额验证.py

@@ -16,8 +16,8 @@ module = "cmdc_demand_mall"
 
 # 第一步登录多采商城获取token
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username")
-password = commonFuc().get_business_data(module, "password")
+username = commonFuc().get_business_data(module, "username3")
+password = commonFuc().get_business_data(module, "password3")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcMaiiLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers1", cmdc_access_token)
@@ -33,7 +33,7 @@ result = json.loads(result.content)
 random_demand = random.randint(0, len(result["data"]["list"]) - 1)
 # 获取需求单信息
 demand_code = result["data"]["list"][random_demand]["demandCode"]
-demand_code = "17020165859551447"
+demand_code = "17023454128426831"
 
 
 # 第三步获取需求单对应的订单变动明细列表
@@ -48,10 +48,13 @@ request_body = commonFuc().get_business_data(module, "payload18", demand_code)
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
-print(result)
+# print(result)
 # 获取订单明细列表中isChange
 result = {"isChange": result["data"]["isChange"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict18")
 # print(check_dict)

air_case/cmdc_demand_mall/获取订单变动明细验证.air/获取订单变动明细验证.py

@@ -59,10 +59,13 @@ request_body = commonFuc().get_business_data(module, "payload17", demand_change_
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
 # print(result)
 # 获取明细demandChangeId
 result = {"demandChangeId": result["data"]["list"][0]["demandChangeId"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict17", demand_change_id)
 # print(check_dict)

air_case/cmdc_demand_mall/获取订单支付金额验证.air/获取订单支付金额验证.py

@@ -47,10 +47,13 @@ request_body = commonFuc().get_business_data(module, "payload28", code)
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
 # print(result)
 # 获取需求单对应的客户折扣
 result = {"customerCharge": result["data"]["customerCharge"]}
+result["api_time"] = api_time
 # print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict28", customer_charge)

air_case/cmdc_demand_mall/获取订单数据验证_订单修改.air/获取订单数据验证_订单修改.py

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

air_case/cmdc_demand_mall/获取订单类型接口验证.air/获取订单类型接口验证.py

@@ -23,8 +23,10 @@ request_body = commonFuc().get_business_data(module, "payload6")
 
 # 发送请求
 result = requests.get(url, params=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, "checkDict6")
 # print(check_dict)

air_case/cmdc_demand_mall/获取销售订单合同配置验证.air/获取销售订单合同配置验证.py

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

air_case/cmdc_demand_mall/获取需求列表明细_支付页面.air/获取需求列表明细_支付页面.py

@@ -46,10 +46,13 @@ request_body = commonFuc().get_business_data(module, "payload27", demand_parent_
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-# print(result)
+
 # 获取需求单详情中demandParentCode
 result = {"demandParentCode": result["data"]["list"][0]["demandParentCode"]}
+result["api_time"] = api_time
 # print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict27", demand_parent_code)

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

@@ -49,10 +49,13 @@ request_body = commonFuc().get_business_data(module, "payload13", demand_code, d
 
 # 发送请求
 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["data"]["list"]:
     result = {"demandSubCode": result["data"]["list"][0]["demandSubCode"]}
+    result["api_time"] = api_time
     # 获取预期结果
     check_dict = commonFuc().get_business_data(module, "checkDict13", demand_parent_code)
     # print(check_dict)

air_case/cmdc_demand_mall/获取需求单子单详情验证.air/获取需求单子单详情验证.py

@@ -48,18 +48,28 @@ request_body = commonFuc().get_business_data(module, "payload14", demand_id)
 
 # 发送请求
 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
 print(result)
 if result["data"]:
     result = {"demandId": result["data"][0]["demandId"]}
+    result["api_time"] = api_time
     # 获取预期结果
     check_dict = commonFuc().get_business_data(module, "checkDict14", demand_id)
     # print(check_dict)
     # 断言实际结果中是否包含预期结果的内容
     commonFuc().check_result(check_dict, result)
-else:
+elif result["success"]:
     # 获取预期结果
     check_dict = commonFuc().get_business_data(module, "checkDict14_1")
     # print(check_dict)
     # 断言实际结果中是否包含预期结果的内容
     commonFuc().check_result(check_dict, result)
+else:
+    # 获取预期结果
+    check_dict = commonFuc().get_business_data(module, "checkDict14_2")
+    # print(check_dict)
+    # 断言实际结果中是否包含预期结果的内容
+    commonFuc().check_result(check_dict, result)

air_case/cmdc_demand_mall/获取需求单操作记录信息验证.air/获取需求单操作记录信息验证.py

@@ -16,8 +16,8 @@ module = "cmdc_demand_mall"
 
 # 第一步登录多采商城获取token
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username")
-password = commonFuc().get_business_data(module, "password")
+username = commonFuc().get_business_data(module, "username3")
+password = commonFuc().get_business_data(module, "password3")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcMaiiLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers1", cmdc_access_token)
@@ -33,9 +33,9 @@ result = json.loads(result.content)
 random_demand = random.randint(0, len(result["data"]["list"]) - 1)
 # 获取需求单信息
 # demand_code = result["data"]["list"][random_demand]["demandCode"]
-demand_code = "17018438457347575"
+demand_code = "17023454128426831"
 # demand_parent_code = result["data"]["list"][random_demand]["demandParentCode"]
-demand_parent_code = "s2312061400015"
+demand_parent_code = "s2312120900008"
 
 # 第三步获取需求单对应的操作记录
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url12")
@@ -49,8 +49,10 @@ request_body = commonFuc().get_business_data(module, "payload12", demand_code, d
 
 # 发送请求
 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, "checkDict12")
 # print(check_dict)

air_case/cmdc_demand_mall/获取需求单详情验证.air/获取需求单详情验证.py

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

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

@@ -24,10 +24,11 @@ headers = commonFuc().get_business_data(module, "json_headers1", cmdc_access_tok
 
 # 第二步获取需求单列表
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url1")
-request_body = commonFuc().get_business_data(module, "payload1")
+request_body = commonFuc().get_business_data(module, "payload_1")
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
+# print(result)
 
 # 生成随机数
 random_demand = random.randint(0, len(result["data"]["list"]) - 1)
@@ -35,7 +36,6 @@ random_demand = random.randint(0, len(result["data"]["list"]) - 1)
 demand_id = result["data"]["list"][random_demand]["demandId"]
 # demand_id = "40187"
 
-
 # 第三步解除订单占用
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url24")
 request_body = commonFuc().get_business_data(module, "payload24", demand_id)
@@ -48,8 +48,10 @@ request_body = commonFuc().get_business_data(module, "payload24", 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)
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict24")
 # print(check_dict)

air_case/cmdc_demand_mall/订单修改功能验证.air/订单修改功能验证.py

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

air_case/cmdc_demand_mall/订单导出功能验证_需求单列表.air/订单导出功能验证_需求单列表.py

@@ -49,7 +49,9 @@ request_body = commonFuc().get_business_data(module, "payload21", order_num)
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
-# result = json.loads(result.content)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
+
 # print(result)
 
 # 获取文件
@@ -63,6 +65,7 @@ with open(file_path, 'wb') as f:
 # 获取文件中订单编号
 excel = HandleExcel(file_path, "Sheet1")
 result = {"demandCode": excel.read_data()[0].get("订单编号")}
+result["api_time"] = api_time
 # print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict21", order_num)