Merge branch 'master' into 'main'

Master|代码更新归档

See merge request !6

air_case/cmdc_special_fresenius_group/商品详情页_套包正价显示验证.air/商品详情页_套包正价显示验证.py

@@ -15,8 +15,8 @@ import json
 module = "cmdc_special_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, "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)
@@ -36,8 +36,8 @@ group_price = result["data"]["list"][0]["groupPrice"]
 
 # 第三步登录多采商城获取token信息
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username")
-password = commonFuc().get_business_data(module, "password")
+username = commonFuc().get_business_data(module, "username4")
+password = commonFuc().get_business_data(module, "password4")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcMaiiLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers1", cmdc_access_token)
@@ -60,11 +60,13 @@ request_body = commonFuc().get_business_data(module, "payload47", product_code,
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 
 # 获取商品详情页中套包正价信息
 result = {"groupPrice": result["data"][1]["groupPrice"], "groupName": result["data"][1]["groupName"]}
-
+result["api_time"] = api_time
 # # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict47", group_price, group_name)
 # # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_special_fresenius_group/商品详情页_特价单品显示验证.air/商品详情页_特价单品显示验证.py

@@ -15,8 +15,8 @@ import json
 module = "cmdc_special_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, "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,8 @@ company_code = result["data"]["list"][0]["companyCode"]
 print(product_code)
 # 第三步登录多采商城获取token信息
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username")
-password = commonFuc().get_business_data(module, "password")
+username = commonFuc().get_business_data(module, "username4")
+password = commonFuc().get_business_data(module, "password4")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcMaiiLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers1", cmdc_access_token)
@@ -53,16 +53,18 @@ request_body = commonFuc().get_business_data(module, "payload41", product_code,
 """
  场景:验证特价单品详情页特价信息展示是否正确
  用例名称：验证商品详情页面特价单品的展示
- 输出：{"activityName":"每只特价101元,有效期2023-11-09至2031-12-31"}
+ 输出：{"activityName":"每支特价11.11元,有效期2024-02-11至2036-03-29"}
 """
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 
 # 获取活动信息
 result = {"activityName": result["data"][0]["activityName"]}
-
+result["api_time"] = api_time
 # # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict41")
 # # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_special_fresenius_group/套包停用_套包商品管理.air/套包停用_套包商品管理.py

@@ -46,6 +46,8 @@ request_body = {"groupIds": [group_id], "type": 1, "remarks": "验证套包停
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 # 数据库操作
 mysql_handle = mySql()
 # 获取conf.ini文件中配置的数据库信息
@@ -54,7 +56,7 @@ host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
 # 数据库查询套包状态
 sql = "SELECT t.status FROM `cmdc-order`.tc_fresenius_group t WHERE groupId = {}".format(group_id)
 result = {"status": mysql_handle.selectSql(host, port, user, pwd, "cmdc-order", sql)[0][0]}
-
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict7")
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_special_fresenius_group/套包协议特价查询.air/套包协议特价查询.py

@@ -33,11 +33,13 @@ request_body = commonFuc().get_business_data(module, "payload03")
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 
 # 获取套包协议特价总数量
 result = {"total": result["data"]["total"]}
-
+result["api_time"] = api_time
 # 数据库操作
 mysql_handle = mySql()
 # 获取conf.ini文件中配置的数据库信息

air_case/cmdc_special_fresenius_group/套包启用_套包商品管理.air/套包启用_套包商品管理.py

@@ -16,8 +16,8 @@ module = "cmdc_special_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, "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,6 +47,8 @@ request_body = {"groupIds": [group_id], "type": 0, "remarks": ""}
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 # 数据库操作
 mysql_handle = mySql()
 # 获取conf.ini文件中配置的数据库信息
@@ -55,7 +57,7 @@ host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
 # 数据库查询套包状态
 sql = "SELECT t.status FROM `cmdc-order`.tc_fresenius_group t WHERE groupId = {}".format(group_id)
 result = {"status": mysql_handle.selectSql(host, port, user, pwd, "cmdc-order", sql)[0][0]}
-
+result["api_time"] = api_time
 # 获取
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict6")

air_case/cmdc_special_fresenius_group/套包商品新增.air/套包商品新增.py

@@ -39,6 +39,8 @@ request_body = commonFuc().get_business_data(module, "payload5", group_name, qua
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 # 数据库操作
 mysql_handle = mySql()
 # 获取conf.ini文件中配置的数据库信息
@@ -47,7 +49,7 @@ host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
 # 数据库查询套包正价数量
 sql = "SELECT t.groupName FROM `cmdc-order`.tc_fresenius_group t ORDER BY createTime DESC LIMIT 1"
 result = {"groupName": mysql_handle.selectSql(host, port, user, pwd, "cmdc-order", sql)[0][0]}
-# 获取
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict5", group_name)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_special_fresenius_group/套包商品管理查询条件验证.air/套包商品管理查询条件验证.py

@@ -69,11 +69,13 @@ request_body = commonFuc().get_business_data(module, "payload9", group_code, gro
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 
 # 获取套包code
 result = {"groupCode": result["data"]["list"][0]["groupCode"]}
-
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict9", group_code)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_special_fresenius_group/套包正价_指定客户查询.air/套包正价_指定客户查询.py

@@ -33,11 +33,14 @@ request_body = commonFuc().get_business_data(module, "payload4")
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 
 # 获取套包正价_指定客户总数量
 result = {"total": result["data"]["total"]}
-print(result)
+result["api_time"] = api_time
+# print(result)
 # 数据库操作
 mysql_handle = mySql()
 # 获取conf.ini文件中配置的数据库信息
@@ -47,7 +50,7 @@ host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
 sql = "SELECT t.groupId FROM `cmdc-order`.tc_fresenius_agreement_price t " \
       "WHERE isRegularPrice = 2 and groupPriceStatus = 1 and companyCode = 00111"
 total = len(mysql_handle.selectSql(host, port, user, pwd, "cmdc-order", sql))
-print(total)
+# print(total)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict2", total)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_special_fresenius_group/套包正价查询.air/套包正价查询.py

@@ -33,11 +33,13 @@ 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 = {"total": result["data"]["total"]}
-
+result["api_time"] = api_time
 # 数据库操作
 mysql_handle = mySql()
 # 获取conf.ini文件中配置的数据库信息

air_case/cmdc_special_fresenius_group/审核节点_特价单品_限购拦截验证.air/审核节点_特价单品_限购拦截验证.py

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

air_case/cmdc_special_fresenius_group/批量新增_套包商品管理.air/批量新增_套包商品管理.py

@@ -19,8 +19,8 @@ module = "cmdc_special_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, "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_headers2", cmdc_access_token)
@@ -76,9 +76,14 @@ 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
+
 file.close()
-print(result)
+# print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict12")
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_special_fresenius_group/批量新增_套包正价.air/批量新增_套包正价.py

@@ -68,12 +68,17 @@ files = {"file": file}
 用例名称：批量新增_套包商品管理
 输出：{"success":true,"code":"200","message":"OK","data":{"success":true},"freshToken":null}
 """
-print(headers)
+# print(headers)
 # 发送请求
 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
+
 file.close()
-print(result)
+# print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict12")
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_special_fresenius_group/按条件停用_停用已停用的套包_套包商品管理.air/按条件停用_停用已停用的套包_套包商品管理.py

@@ -63,11 +63,16 @@ 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()
 # 截取结果中errList信息
 result = {"errList": result["data"]["errMsg"]["errList"]}
-print(result)
+result["api_time"] = api_time
+# print(result)
 # 获取预期结果
 err_list = "平台套包编号【{}】 在待停用记录里不存在！".format(group_code)
 check_dict = commonFuc().get_business_data(module, "checkDict11", err_list)

air_case/cmdc_special_fresenius_group/按条件停用_草稿状态的套包_套包商品管理.air/按条件停用_草稿状态的套包_套包商品管理.py

@@ -63,11 +63,13 @@ 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()
 # 截取结果中errList信息
 result = {"errList": result["data"]["errMsg"]["errList"]}
-
+result["api_time"] = api_time
 # 获取预期结果
 err_list = "平台套包编号【{}】 在待停用记录里不存在！".format(group_code)
 check_dict = commonFuc().get_business_data(module, "checkDict11", err_list)

air_case/cmdc_special_fresenius_group/按条件停用功能验证.air/按条件停用功能验证.py

@@ -72,8 +72,10 @@ request_body = {"groupIds": [group_id], "type": 1, "remarks": "验证套包停
 
 # 发送请求
 result = requests.post(url, headers=headers, json=request_body)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-
+result["api_time"] = api_time
 # 数据库操作
 mysql_handle = mySql()
 # 获取conf.ini文件中配置的数据库信息
@@ -82,7 +84,7 @@ host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
 # 数据库查询套包状态
 sql = "SELECT t.status FROM `cmdc-order`.tc_fresenius_group t WHERE groupId = {}".format(group_id)
 result = {"status": mysql_handle.selectSql(host, port, user, pwd, "cmdc-order", sql)[0][0]}
-
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict7")
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_special_fresenius_group/按条件启用_启用已停用的套包_套包商品管理.air/按条件启用_启用已停用的套包_套包商品管理.py

@@ -61,11 +61,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()
 # 截取结果中errList信息
 result = {"errList": result["data"]["errMsg"]["errList"]}
-
+result["api_time"] = api_time
 # 获取预期结果
 err_list = "平台套包编号【{}】 在待启用记录里不存在！".format(group_code)
 check_dict = commonFuc().get_business_data(module, "checkDict11", err_list)

air_case/cmdc_special_fresenius_group/按条件启用_启用已启用的套包_套包商品管理.air/按条件启用_启用已启用的套包_套包商品管理.py

@@ -61,11 +61,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()
 # 截取结果中errList信息
 result = {"errList": result["data"]["errMsg"]["errList"]}
-
+result["api_time"] = api_time
 # 获取预期结果
 err_list = "平台套包编号【{}】 在待启用记录里不存在！".format(group_code)
 check_dict = commonFuc().get_business_data(module, "checkDict11", err_list)

air_case/cmdc_special_fresenius_group/按条件启用验证.air/按条件启用验证.py

@@ -72,6 +72,8 @@ request_body = {"groupIds": [group_id], "type": 0, "remarks": ""}
 
 # 发送请求
 result = requests.post(url, headers=headers, json=request_body)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 
 # 数据库操作
@@ -82,7 +84,7 @@ host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
 # 数据库查询套包状态
 sql = "SELECT t.status FROM `cmdc-order`.tc_fresenius_group t WHERE groupId = {}".format(group_id)
 result = {"status": mysql_handle.selectSql(host, port, user, pwd, "cmdc-order", sql)[0][0]}
-
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict6")
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_special_fresenius_group/新老商品关系编码维护新增验证.air/新老商品关系编码维护新增验证.py

@@ -16,8 +16,8 @@ module = "cmdc_special_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, "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_headers2", cmdc_access_token)
@@ -47,8 +47,11 @@ request_body = {"manufacturerGroupName": "", "manufacturerGroupCode": "", "group
 
 # 发送请求
 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
+# print(result)
 if result["success"]:
     # 获取预期结果
     check_dict = commonFuc().get_business_data(module, "checkDict20")

air_case/cmdc_special_fresenius_group/新老编码替换明细导出验证.air/新老编码替换明细导出验证.py

+# -*- encoding=utf8 -*-
+__author__ = "liguangyu"
+
+"""
+case_tag:cmdc_api,cmdc新老编码替换明细导出验证,2264,2264-79,sit,bs
+主数据平台:运营后台管理系统新老商品编码替换明细导出接口
+"""
+
+from common.common_func import commonFuc
+from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
+from common.handle_excel import HandleExcel
+import requests
+import random
+import json
+import os
+
+
+module = "cmdc_special_fresenius_group"
+
+# 第一步登录后台运营系统获取token
+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)
+
+# 第二步新老编码替换列表
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url_product_code")
+request_body = commonFuc().get_business_data(module, "payload_product_code")
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+result = json.loads(result.content)
+# print(result)
+# 生成随机数
+dis_random = random.randint(0, len(result["data"]["list"]) - 1)
+# 获取商品新老编码替换信息
+group_code = result["data"]["list"][dis_random]["groupCode"]
+product_code = result["data"]["list"][dis_random]["products"][0]["productCode"]
+productLineName = result["data"]["list"][dis_random]["productLineName"]
+# 第三步进行商品新老编码明细导出
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url60")
+request_body = commonFuc().get_business_data(module, "payload60", productLineName)
+
+"""
+ 场景: 验证商品新老编码替换列表明细导出接口联通性以及数据的正确性
+ 用例名称：新老编码替换明细导出验证
+ 输出：{"productLineName":"%s"}
+"""
+
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+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__)))))
+file_path = BASE_DIR + "/data/cmdc_files/新老商品编码关系导出明细.xlsx"
+
+# 获取到导出文件存入cmdc_files文件中
+with open(file_path, 'wb') as f:
+    f.write(result.content)
+
+# 获取导出文件中子需求单
+excel = HandleExcel(file_path, "Sheet1")
+# print(excel.read_data())
+result = {"productLineName": excel.read_data()[0].get("产品线")}
+
+# 将接口响应时间添加至结果中
+result["api_time"] = api_time
+
+# 获取预期结果
+check_dict = commonFuc().get_business_data(module, "checkDict60", productLineName)
+# print(check_dict)
+# 断言实际结果中是否包含预期结果的内容
+commonFuc().check_result(check_dict, result)
+
+