Merge branch 'master' into 'main'

Master|代码更新归档

See merge request !6

air_case/cmdc_order_handle/控销商品拦截验证_下单_c.air/控销商品拦截验证_下单_c.py

@@ -16,8 +16,8 @@ module = "cmdc_order_handle"
 
 # 第一步登录多采商城获取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)
@@ -28,7 +28,7 @@ mysql_handle = mySql()
 host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
 
 # 进行商品控销操作
-sql = "UPDATE `cmdc-product`.ic_product t SET t.isControlSales = 1 WHERE t.productId = 7991"
+sql = "UPDATE `cmdc-product`.ic_product t SET t.isControlSales = 1 WHERE t.productId = 9184"
 mysql_handle.executeUpdate(host, port, user, pwd, "cmdc-product", sql)
 
 # 第二步进行提交订单
@@ -43,10 +43,12 @@ request_body = commonFuc().get_business_data(module, "payload19")
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-# print(result)
 # 获取message
 result = {"message": result["message"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict19")
 # print(check_dict)

air_case/cmdc_order_handle/控销商品拦截验证_再来一单_d.air/控销商品拦截验证_再来一单_d.py

@@ -16,8 +16,8 @@ module = "cmdc_order_handle"
 
 # 第一步登录多采商城获取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)
@@ -28,7 +28,7 @@ mysql_handle = mySql()
 host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
 
 # 查询指定需求单信息
-order_num = "17018438457347575"
+order_num = "17071033368805325"
 
 # 第二步获取多采商城需求单列表
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url_demand_list")
@@ -53,8 +53,10 @@ request_body = commonFuc().get_business_data(module, "payload20", 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, "checkDict20")
 # print(check_dict)
@@ -62,5 +64,5 @@ check_dict = commonFuc().get_business_data(module, "checkDict20")
 commonFuc().check_result(check_dict, result)
 
 # 进行去除商品控销状态操作
-sql = "UPDATE `cmdc-product`.ic_product t SET t.isControlSales = 0 WHERE t.productId = 7991"
+sql = "UPDATE `cmdc-product`.ic_product t SET t.isControlSales = 0 WHERE t.productId = 9184"
 mysql_handle.executeUpdate(host, port, user, pwd, "cmdc-product", sql)

air_case/cmdc_order_handle/查询jde配置接口验证.air/查询jde配置接口验证.py

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

air_case/cmdc_order_handle/查询商品信息接口验证.air/查询商品信息接口验证.py

@@ -52,9 +52,12 @@ request_body = commonFuc().get_business_data(module, "payload1", product_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 = {"productId": result["data"]["productId"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict1", product_id)
 # print(check_dict)

air_case/cmdc_order_handle/查询条件验证_商品清单_结算页面.air/查询条件验证_商品清单_结算页面.py

@@ -38,10 +38,12 @@ request_body = commonFuc().get_business_data(module, "payload16", product_code,
 
 # 发送请求
 result = requests.get(url, params=request_body)
+# 获取接口响应时间
+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, "checkDict16", product_code)
 # print(check_dict)

air_case/cmdc_order_handle/查询条件验证_收货地址列表_a.air/查询条件验证_收货地址列表_a.py

@@ -42,10 +42,13 @@ request_body = commonFuc().get_business_data(module, "payload8", receiver_name)
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 # print(result)
 # 获取查询结果中收货人姓名
 result = {"receiverName": result["data"]["addresses"]["list"][0]["receiverName"][-2:]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict8_1", receiver_name)
 # print(check_dict)

air_case/cmdc_order_handle/查询条件验证_收货地址列表_b.air/查询条件验证_收货地址列表_b.py

@@ -43,10 +43,12 @@ request_body = commonFuc().get_business_data(module, "payload8", address)
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-# print(result)
 # 获取查询结果中收货人姓名
 result = {"address": result["data"]["addresses"]["list"][0]["address"][-2:]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict8_2", address)
 # print(check_dict)

air_case/cmdc_order_handle/查询条件验证_收货地址列表_c.air/查询条件验证_收货地址列表_c.py

@@ -43,10 +43,13 @@ request_body = commonFuc().get_business_data(module, "payload8", mobile)
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 # print(result)
 # 获取查询结果中收货人姓名
 result = {"mobile": result["data"]["addresses"]["list"][0]["mobile"][-2:]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict8_3", mobile)
 # print(check_dict)

air_case/cmdc_order_handle/查询用户地址接口验证.air/查询用户地址接口验证.py

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

air_case/cmdc_order_handle/物料编码模糊查询验证_结算页面.air/物料编码模糊查询验证_结算页面.py

@@ -37,10 +37,14 @@ request_body = commonFuc().get_business_data(module, "payload12", random_code)
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-# print(result)
+
 # 获取查询结果中数据
 result = {"data": result["data"][0][0]}
+result["api_time"] = api_time
+
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict12", random_code)
 # print(check_dict)

air_case/cmdc_order_handle/获取原订单信息接口验证_再来一单.air/获取原订单信息接口验证_再来一单.py

@@ -36,6 +36,7 @@ result = json.loads(result.content)
 random_demand = random.randint(0, len(result["data"]["list"]) - 1)
 # 获取需求单信息
 demand_id = result["data"]["list"][random_demand]["demandId"]
+demand_code = result["data"]["list"][random_demand]["demandCode"]
 # print(demand_id)
 # 第三步获取原订单信息
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url18")
@@ -49,19 +50,29 @@ request_body = commonFuc().get_business_data(module, "payload18", 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
+
 if result["success"]:
     # 获取预期结果
     check_dict = commonFuc().get_business_data(module, "checkDict18")
     # print(check_dict)
     # 断言实际结果中是否包含预期结果的内容
     commonFuc().check_result(check_dict, result)
-else:
-    # 获取预期结果
+elif result["code"] == "ERROR":
+    # 获取预期结果/原需求单中商品无效获取被删除
     check_dict = commonFuc().get_business_data(module, "checkDictInvalid")
     # print(check_dict)
     # 断言实际结果中是否包含预期结果的内容
     commonFuc().check_result(check_dict, result)
+else:
+    # 获取预期结果/原需求单为历史脏数据导致接口异常
+    check_dict = commonFuc().get_business_data(module, "checkDict_code", demand_code)
+    # print(check_dict)
+    # 断言实际结果中是否包含预期结果的内容
+    commonFuc().check_result(check_dict, result)
 
 

air_case/cmdc_order_handle/获取收款账号接口验证.air/获取收款账号接口验证.py

@@ -36,10 +36,12 @@ request_body = commonFuc().get_business_data(module, "payload23", company_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 = {"companyId": result["data"]["list"][0]["companyId"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict23", company_id)
 # print(check_dict)

air_case/cmdc_order_handle/获取收货地址列表_结算页面.air/获取收货地址列表_结算页面.py

@@ -34,8 +34,11 @@ request_body = commonFuc().get_business_data(module, "payload7")
 
 # 发送请求
 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_order_handle/规格型号模糊查询验证_结算页面.air/规格型号模糊查询验证_结算页面.py

@@ -23,7 +23,8 @@ cmdc_access_token = CmdcMaiiLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers1", cmdc_access_token)
 
 # 生成随机数据
-random_code = random.randint(0, 8)
+random_code = random.randint(0, 7)
+
 # 第二步进行规格型号模糊匹配查询
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url10")
 request_body = commonFuc().get_business_data(module, "payload10", random_code)
@@ -36,11 +37,15 @@ request_body = commonFuc().get_business_data(module, "payload10", random_code)
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-# print(result)
+
 # 获取查询结果中数据
 result = {"data": result["data"][0][0]}
-# print(result)
+result["api_time"] = api_time
+print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict10", random_code)
 # print(check_dict)

air_case/cmdc_order_handle/通过Excel复制添加商品功能验证_结算页面.air/通过Excel复制添加商品功能验证_结算页面.py

@@ -16,16 +16,16 @@ module = "cmdc_order_handle"
 
 # 第一步登录多采商城获取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)
 
 # 生成随机数据
 random_code = random.randint(0, 10)
-product_code = "13977315"
-material_code = "00-8800-000-10"
+product_code = "14384307"
+material_code = "TPVL200"
 # 第二步通过Excel复制添加商品
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url14")
 request_body = commonFuc().get_business_data(module, "payload14", product_code, material_code, random_code)
@@ -38,10 +38,12 @@ request_body = commonFuc().get_business_data(module, "payload14", 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"]["data"][0]["productCode"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict14", product_code)
 # print(check_dict)

air_case/cmdc_order_handle/通过商品编码查询商品验证_结算页面.air/通过商品编码查询商品验证_结算页面.py

@@ -25,10 +25,12 @@ request_body = commonFuc().get_business_data(module, "payload9")
 
 # 发送请求
 result = requests.get(url, params=request_body)
+# 获取接口响应时间
+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, "checkDict9")
 # print(check_dict)

air_case/cmdc_order_handle/通过物料编码查询商品验证_结算页面.air/通过物料编码查询商品验证_结算页面.py

@@ -27,10 +27,12 @@ request_body = commonFuc().get_business_data(module, "payload13", material_code)
 
 # 发送请求
 result = requests.get(url, params=request_body)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-# print(result)
 # 获取查询结果中商品对应的物料编码
 result = {"materialCode": result["data"]["list"][0]["materialCode"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict13", material_code)
 # print(check_dict)

air_case/cmdc_order_handle/通过规格型号查询商品验证_结算页面.air/通过规格型号查询商品验证_结算页面.py

@@ -27,10 +27,12 @@ request_body = commonFuc().get_business_data(module, "payload11", specification)
 
 # 发送请求
 result = requests.get(url, params=request_body)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-# print(result)
 # 获取查询结果中商品对应的规格型号
 result = {"specifications": result["data"]["list"][0]["specifications"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict11", specification)
 # print(check_dict)

air_case/cmdc_order_handle/附件上传接口验证_结算页面.air/附件上传接口验证_结算页面.py

@@ -42,8 +42,10 @@ 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
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict6")
 # print(check_dict)

air_case/cmdc_order_handle/验证下单时不传地址信息.air/验证下单时不传地址信息.py

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