Merge branch 'master' into 'main'

Master|代码更新归档

See merge request !6

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)
@@ -35,10 +35,14 @@ request_body = commonFuc().get_business_data(module, "payload70")
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
+
 # print(result)
 # 获取制单员列表数量
 result = {"total": len(result["data"])}
+result["api_time"] = api_time
 # print(result)
 # 数据库操作
 mysql_handle = mySql()
@@ -47,7 +51,7 @@ host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
 
 # 查询数据库中对应制单员数量
 sql = "SELECT count(t.userId) FROM `cmdc-user`.cmdc_user t " \
-      "WHERE userType = 1 and companyId =6 and deleteSign = 0 in" \
+      "WHERE userType = 1 and companyId =7 and deleteSign = 0 in" \
       "(SELECT t.userId FROM `cmdc-user`.cmdc_manager_user t)"
 total = mysql_handle.selectSql(host, port, user, pwd, "cmdc-user", sql)[0][0]
 

air_case/cmdc_product/获取发货时间.air/获取发货时间.py

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

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

@@ -34,8 +34,10 @@ request_body = commonFuc().get_business_data(module, "payload3")
 
 # 发送请求
 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_product/获取商品列表_发货时间管理.air/获取商品列表_发货时间管理.py

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

air_case/cmdc_product/获取商品列表_库存配置.air/获取商品列表_库存配置.py

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

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)
@@ -38,13 +38,16 @@ 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 = {"total": result["data"]["total"]}
+result["api_time"] = api_time
 # print(result)
 # 查询数据库中对应公司对应的商品属性数量
-sql = "SELECT count(t.productId) FROM `cmdc-product`.ic_product_properties t WHERE companyCode = 00111 and deleteSign = 0"
+sql = "SELECT count(t.productId) FROM `cmdc-product`.ic_product_properties t WHERE companyCode = 00102 and deleteSign = 0"
 total = mysql_handle.selectSql(host, port, user, pwd, "cmdc-product", sql)[0][0]
 
 # 获取预期结果

air_case/cmdc_product/获取商品限购信息.air/获取商品限购信息.py

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

air_case/cmdc_product/获取属性值列表.air/获取属性值列表.py

@@ -35,12 +35,14 @@ request_body = commonFuc().get_business_data(module, "payload65")
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-# print(result)
+
 
 # 获取属性值数量
 result = {"total": len(result["data"])}
-
+result["api_time"] = api_time
 # 数据库操作
 mysql_handle = mySql()
 # 获取conf.ini文件中配置的数据库信息

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

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,13 @@ request_body = commonFuc().get_business_data(module, "payload25", rule_id)
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
+
 # 获取查询结果中库存配置id
 result = {"stockRuleId": result["data"]["stockRuleId"]}
-
+result["api_time"] = api_time
 # print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict25", rule_id)

air_case/cmdc_product/获取生产厂商信息.air/获取生产厂商信息.py

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

air_case/cmdc_product/获取雅培产品线信息.air/获取雅培产品线信息.py

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

air_case/cmdc_product/获取雅培公司列表.air/获取雅培公司列表.py

@@ -28,8 +28,10 @@ url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url48")
 
 # 发送请求
 result = requests.get(url)
+# 获取接口响应时间
+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, "checkDict48")
 # print(check_dict)

air_case/cmdc_product/获取雅培折扣价格信息列表.air/获取雅培折扣价格信息列表.py

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

air_case/cmdc_product/附件上传功能验证.air/附件上传功能验证.py

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

air_case/cmdc_product_list_query/商品列表_代客下单.air/商品列表_代客下单.py

@@ -42,7 +42,11 @@ request_body = commonFuc().get_business_data(module, "payload1", user_no)
 
 # 发送请求
 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)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict1")

air_case/cmdc_product_list_query/商品列表_快速下单.air/商品列表_快速下单.py

@@ -61,7 +61,11 @@ url13 = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url13
 """
 # 发送请求
 result = requests.get(url13, 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, "checkDict13")
 print(check_dict)

air_case/cmdc_product_list_query/获取客户列表.air/获取客户列表.py

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

air_case/cmdc_purchase_list/采购单查询.air/采购单查询.py

@@ -34,8 +34,11 @@ 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, "checkDict2")
 print(check_dict)

air_case/cmdc_query_customer/客户查询.air/客户查询.py

@@ -34,10 +34,14 @@ 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
 # print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict2")
-print(check_dict)
+# print(check_dict)
 # 断言实际结果中是否包含预期结果的内容
 commonFuc().check_result(check_dict, result)