Merge branch 'master' into 'main'

Master|代码更新归档

See merge request !6

air_case/cmdc_commodity_activity/选赠促销导出功能验证.air/选赠促销导出功能验证.py

+# -*- encoding=utf8 -*-
+__author__ = "liguangyu"
+
+"""
+case_tag:cmdc_api,cmdc选赠促销导出功能验证,2262,2262-40,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_commodity_activity"
+
+
+# 第一步登录后台运营平台获取cmdc_access_token
+# 获取登录所需账号密码
+username = commonFuc().get_business_data(module, "username30")
+password = commonFuc().get_business_data(module, "password30")
+# 获取登录后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, "url40_1")
+request_body = commonFuc().get_business_data(module, "payload40_1")
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+result = json.loads(result.content)
+
+# 生成随机数
+activity_random = random.randint(0, len(result["data"]["list"]) - 1)
+# 获取促销活动信息
+activityBasicId = result["data"]["list"][activity_random]["activityBasicId"]
+activityName = result["data"]["list"][activity_random]["activityName"]
+print(activityName)
+# 第三步进行选赠活动信息导出
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url40")
+request_body = commonFuc().get_business_data(module, "payload40", activityBasicId, activityBasicId)
+
+"""
+ 场景:选赠促销导出功能验证
+ 用例名称：选赠促销导出功能验证
+ 输出：{"activityName": "%s"}
+"""
+
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = 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")
+result = {"activityName": excel.read_data()[0].get("活动名称")}
+
+# 将接口响应时间添加至结果中
+result["api_time"] = api_time
+
+
+# 获取预期结果
+check_dict = commonFuc().get_business_data(module, "checkDict40", activityName)
+# 断言实际结果中是否包含预期结果的内容
+commonFuc().check_result(check_dict, result)
+

air_case/cmdc_commodity_activity/通过code获取服务商品信息.air/通过code获取服务商品信息.py

+# -*- encoding=utf8 -*-
+__author__ = "liguangyu"
+
+"""
+case_tag:cmdc_api,cmdc通过code获取服务商品信息,2262,2262-42,sit,bs
+主数据平台:运营后台管理系统通过code获取服务商品信息接口
+"""
+
+from common.common_func import commonFuc
+from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
+import requests
+import json
+
+
+module = "cmdc_commodity_activity"
+
+# 第一步登录后台运营平台获取cmdc_access_token
+# 获取登录所需账号密码
+username = commonFuc().get_business_data(module, "username30")
+password = commonFuc().get_business_data(module, "password30")
+# 获取登录后Cmdc_access_token
+cmdc_access_token = CmdcDoLogin(username, password).get_token()
+headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
+
+# 第二步通过code获取服务商品信息
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url42")
+request_body = commonFuc().get_business_data(module, "payload42")
+
+"""
+ 场景:通过code获取服务商品信息
+ 用例名称：通过code获取服务商品信息
+ 输出：{"companyCode":"00102"}
+"""
+
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
+
+# 获取商品所属站点
+result = json.loads(result.content)
+result = {"companyCode": result["data"][0]["filialeCode"]}
+# 将接口响应时间添加至结果中
+result["api_time"] = api_time
+
+# 获取预期结果
+check_dict = commonFuc().get_business_data(module, "checkDict42")
+# 断言实际结果中是否包含预期结果的内容
+commonFuc().check_result(check_dict, result)
+

air_case/cmdc_commodity_activity/雅培选赠_活动商品验证.air/雅培选赠_活动商品验证.py

@@ -66,9 +66,12 @@ request_body = commonFuc().get_business_data(module, "payload21", company_code,
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
 # 获取活动客户对应的活动规则id
 result = {"activityBasicId": result["data"][0]["activityBasicId"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict20", activity_basic_id)
 print(check_dict)

air_case/cmdc_commodity_activity/雅培选赠_活动用户验证.air/雅培选赠_活动用户验证.py

@@ -65,9 +65,12 @@ request_body = commonFuc().get_business_data(module, "payload20", company_code,
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
 # 获取活动客户对应的活动规则id
 result = {"activityBasicId": result["data"][0]["activityBasicId"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict20", activity_basic_id)
 print(check_dict)

air_case/cmdc_commodity_list/查询失效商品.air/查询失效商品.py

@@ -33,7 +33,10 @@ request_body = commonFuc().get_business_data(module, "payload1")
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = 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_commodity_list/查询已上架商品.air/查询已上架商品.py

@@ -33,7 +33,10 @@ request_body = commonFuc().get_business_data(module, "payload2")
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict2")
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_commodity_list/查询控销商品.air/查询控销商品.py

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

air_case/cmdc_commodity_list/查询赠品.air/查询赠品.py

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

air_case/cmdc_coupon/优惠券_导入式_用户发放验证.air/优惠券_导入式_用户发放验证.py

@@ -32,9 +32,13 @@ url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url12")
 
 # 发送请求
 result = requests.get(url, headers=headers)
+
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 # print(result)
 result = {"couponId": result["data"][0]["couponId"]}
+result["api_time"] = api_time
 # print(result)
 
 # 获取预期结果

air_case/cmdc_coupon/优惠券列表查询条件验证.air/优惠券列表查询条件验证.py

@@ -49,8 +49,11 @@ request_body = commonFuc().get_business_data(module, "payload2", coupon_id, coup
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
 result = {"couponId": result["data"]["list"][0]["couponId"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict2", coupon_id)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_coupon/优惠券商品验证.air/优惠券商品验证.py

@@ -28,9 +28,9 @@ request_body = commonFuc().get_business_data(module, "payload_goods")
 result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
 # 获取商品的productId、productCode、companyCode
-product_id = result["data"]["list"][0]["productid"]
-product_code = result["data"]["list"][0]["productcode"]
-company_code = result["data"]["list"][0]["filialecode"]
+product_id = result["data"]["list"][1]["productid"]
+product_code = result["data"]["list"][1]["productcode"]
+company_code = result["data"]["list"][1]["filialecode"]
 
 # 第四步验证商品活动列表中是否包含对应的优惠券
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url_discount")
@@ -44,13 +44,17 @@ request_body = [{"productId": product_id, "productCode": product_code, "companyC
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
+
 # print(result)
 result = {"couponAmount": result["data"][0]["coupon"]["couponAmount"]}
+result["api_time"] = api_time
 # print(result)
 
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict3")
-print(check_dict)
+
 # 断言实际结果中是否包含预期结果的内容
 commonFuc().check_result(check_dict, result)

air_case/cmdc_coupon/优惠券基本信息查询.air/优惠券基本信息查询.py

@@ -32,8 +32,11 @@ request_body = commonFuc().get_business_data(module, "payload8")
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
 result = {"couponId": result["data"]["couponId"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict8")
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_coupon/优惠券库存不足无法领取验证.air/优惠券库存不足无法领取验证.py

@@ -45,7 +45,10 @@ request_body = commonFuc().get_business_data(module, "payload_collect_coupon", c
 
 # 发送请求
 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, "checkDict_collect_coupon2")

air_case/cmdc_coupon/优惠券活动未生效验证.air/优惠券活动未生效验证.py

@@ -45,7 +45,10 @@ request_body = commonFuc().get_business_data(module, "payload_collect_coupon", c
 
 # 发送请求
 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, "checkDict_collect_coupon4")

air_case/cmdc_coupon/优惠券活动过期无法领取验证.air/优惠券活动过期无法领取验证.py

@@ -45,7 +45,10 @@ request_body = commonFuc().get_business_data(module, "payload_collect_coupon", c
 
 # 发送请求
 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, "checkDict_collect_coupon3")

air_case/cmdc_coupon/优惠券金额验证.air/优惠券金额验证.py

@@ -46,7 +46,10 @@ request_body = commonFuc().get_business_data(module, "payload_collect_coupon", c
 
 # 发送请求
 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, "checkDict_collect_coupon")

air_case/cmdc_coupon/优惠券领取次数超限验证.air/优惠券领取次数超限验证.py

@@ -40,12 +40,15 @@ request_body = commonFuc().get_business_data(module, "payload_collect_coupon", c
 """
  场景:优惠券领取次数超限制验证
  用例名称：优惠券领取次数超限制验证
- 输出：{"success":false,"code":"500","message":"该券已超过用户最大领取限制，请您关注平台后续其他活动","data":null,"freshToken":null}
+ 输出：{"success":false,"code":"500","message":"该券已抢完，请您关注平台后续其他活动","data":null,"freshToken":null}
 """
 
 # 发送请求
 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, "checkDict_collect_coupon1")

air_case/cmdc_coupon/优惠券领取验证.air/优惠券领取验证.py

@@ -44,7 +44,10 @@ request_body = commonFuc().get_business_data(module, "payload_collect_coupon", c
 
 # 发送请求
 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
 if result["code"] == "200":
     # 获取预期结果
     check_dict = commonFuc().get_business_data(module, "checkDict_collect_coupon")

air_case/cmdc_coupon/查询优惠券活动指定商品信息.air/查询优惠券活动指定商品信息.py

@@ -43,10 +43,12 @@ request_body = commonFuc().get_business_data(module, "payload10", coupon_id)
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
 # 获取商品对应的优惠券id
 result = {"couponId": result["data"][0]["couponId"]}
-
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict10", coupon_id)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_coupon/获取优惠券列表.air/获取优惠券列表.py

@@ -32,7 +32,10 @@ request_body = commonFuc().get_business_data(module, "payload1")
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict1")
 # 断言实际结果中是否包含预期结果的内容