Merge branch 'master' into 'main'

Master|代码更新归档

See merge request !6

air_case/cmdc_commodity_activity/商品_折扣_活动验证.air/商品_折扣_活动验证.py

@@ -56,8 +56,11 @@ request_body = commonFuc().get_business_data(module, "payload7", product_id, com
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
 result = {"activityBasicId": result["data"]["activity"]["activityBasicId"]}
+result["api_time"] = api_time
 # print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict13")

air_case/cmdc_commodity_activity/商品_折扣_购买数量不满足_金额验证.air/商品_折扣_购买数量不满足_金额验证.py

@@ -60,8 +60,11 @@ request_body = commonFuc().get_business_data(module, "payload10", company_code,
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
 activity_amount = result["data"]["orderProductList"][0]["activityAmount"]
+result["api_time"] = api_time
 # print(activity_amount)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict11")

air_case/cmdc_commodity_activity/商品_折扣_购买数量满足_金额验证.air/商品_折扣_购买数量满足_金额验证.py

@@ -45,7 +45,7 @@ product_id = result["data"][0]["productId"]
 company_code = result["data"][0]["companyCode"]
 product_code = result["data"][0]["productCode"]
 product_price = result["data"][0]["referencePrice"]
-purchase_quantity = random.randint(2, 10)
+purchase_quantity = random.randint(3, 10)
 # 计算减免金额
 amount = (product_price - (result["data"][0]["unitDiscount"] * product_price)/100) * purchase_quantity
 # 保留两位小数(四舍五入)
@@ -64,8 +64,11 @@ request_body = commonFuc().get_business_data(module, "payload10", company_code,
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
 activity_amount = result["data"]["orderProductList"][0]["activityAmount"]
+result["api_time"] = api_time
 # print(activity_amount)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict10", amount)

air_case/cmdc_commodity_activity/商品_未参与活动.air/商品_未参与活动.py

@@ -33,9 +33,12 @@ request_body = commonFuc().get_business_data(module, "payload8")
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
 # print(result)
 result = {"activity": result["data"]["activity"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict8")
 print(check_dict)

air_case/cmdc_commodity_activity/商品_满减_活动验证.air/商品_满减_活动验证.py

@@ -56,8 +56,11 @@ request_body = commonFuc().get_business_data(module, "payload7", product_id, com
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
 result = {"activityBasicId": result["data"]["activity"]["activityBasicId"]}
+result["api_time"] = api_time
 # print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict14")

air_case/cmdc_commodity_activity/商品_满减_购买数量不满足_金额验证.air/商品_满减_购买数量不满足_金额验证.py

@@ -60,8 +60,11 @@ request_body = commonFuc().get_business_data(module, "payload10", company_code,
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
 activity_amount = result["data"]["orderProductList"][0]["activityAmount"]
+result["api_time"] = api_time
 # print(activity_amount)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict11")

air_case/cmdc_commodity_activity/商品_满减_购买数量满足_金额验证.air/商品_满减_购买数量满足_金额验证.py

@@ -45,7 +45,7 @@ product_id = result["data"][0]["productId"]
 company_code = result["data"][0]["companyCode"]
 product_code = result["data"][0]["productCode"]
 product_price = result["data"][0]["referencePrice"]
-purchase_quantity = random.randint(3, 10)
+purchase_quantity = random.randint(11, 20)
 # 计算减免金额
 amount = result["data"][0]["reductTotal"]
 # 保留两位小数(四舍五入)
@@ -64,8 +64,11 @@ request_body = commonFuc().get_business_data(module, "payload10", company_code,
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
 activity_amount = result["data"]["orderProductList"][0]["activityAmount"]
+result["api_time"] = api_time
 print(activity_amount)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict10", amount)

air_case/cmdc_commodity_activity/商品_特价_数量不满足规则_金额验证.air/商品_特价_数量不满足规则_金额验证.py

@@ -24,7 +24,7 @@ headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_toke
 
 # 第二步进行促销活动列表获取
 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, "payload100")
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
@@ -45,7 +45,7 @@ product_id = result["data"][0]["productId"]
 company_code = result["data"][0]["companyCode"]
 product_code = result["data"][0]["productCode"]
 product_price = result["data"][0]["referencePrice"]
-purchase_quantity = random.randint(1, 5)
+purchase_quantity = random.randint(1, 4)
 # print(purchase_quantity)
 # 第四步验证减免金额正确性
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url10")
@@ -60,9 +60,11 @@ request_body = commonFuc().get_business_data(module, "payload10", company_code,
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
 activity_amount = result["data"]["orderProductList"][0]["activityAmount"]
-print(activity_amount)
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict11")
 print(check_dict)

air_case/cmdc_commodity_activity/商品_特价_数量满足规则_金额验证.air/商品_特价_数量满足规则_金额验证.py

@@ -24,7 +24,7 @@ headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_toke
 
 # 第二步进行促销活动列表获取
 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, "payload100")
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
@@ -63,9 +63,11 @@ request_body = commonFuc().get_business_data(module, "payload10", company_code,
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
 activity_amount = result["data"]["orderProductList"][0]["activityAmount"]
-print(activity_amount)
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict10", amount)
 print(check_dict)

air_case/cmdc_commodity_activity/商品_特价_活动验证.air/商品_特价_活动验证.py

@@ -23,7 +23,7 @@ headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_toke
 
 # 第二步进行促销活动列表获取
 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, "payload100")
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
@@ -56,8 +56,11 @@ request_body = commonFuc().get_business_data(module, "payload7", product_id, com
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
 result = {"activityBasicId": result["data"]["activity"]["activityBasicId"]}
+result["api_time"] = api_time
 # print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict9", activity_basic_id)

air_case/cmdc_commodity_activity/查询商品对应的促销活动.air/查询商品对应的促销活动.py

@@ -15,15 +15,15 @@ module = "cmdc_commodity_activity"
 
 # 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
+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, "url1")
-request_body = commonFuc().get_business_data(module, "payload1")
+request_body = commonFuc().get_business_data(module, "payload1_1")
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
@@ -35,6 +35,7 @@ activity_type = result["data"]["list"][0]["activityType"]
 # 第三步获取对应活动包含的商品信息
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url3")
 request_body = commonFuc().get_business_data(module, "payload3", activity_basic_id, activity_type)
+# print(request_body)
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
@@ -56,7 +57,10 @@ request_body = commonFuc().get_business_data(module, "payload7", product_id, com
 
 # 发送请求
 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, "checkDict7")

air_case/cmdc_commodity_activity/查询商品详情.air/查询商品详情.py

@@ -15,15 +15,15 @@ module = "cmdc_commodity_activity"
 
 # 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
+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, "url1")
-request_body = commonFuc().get_business_data(module, "payload1")
+request_body = commonFuc().get_business_data(module, "payload1_1")
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
@@ -54,8 +54,10 @@ request_body = commonFuc().get_business_data(module, "payload6", product_id)
 
 # 发送请求
 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
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict6")
 print(check_dict)

air_case/cmdc_commodity_activity/活动非黑名单用户验证.air/活动非黑名单用户验证.py

@@ -15,8 +15,8 @@ module = "cmdc_commodity_activity"
 
 # 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
+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)
@@ -27,7 +27,7 @@ request_body = commonFuc().get_business_data(module, "payload22")
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
-
+# print(result)
 # 获取活动对应的activityBasicId和activityType
 activity_basic_id = result["data"]["list"][0]["activityBasicId"]
 activity_type = result["data"]["list"][0]["activityType"]
@@ -47,20 +47,22 @@ product_code = result["data"][0]["productCode"]
 # 第四步获取对应商品详情
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url7")
 request_body = commonFuc().get_business_data(module, "payload7", product_id, company_code, product_code)
-# print(request_body)
 """
  场景:商品活动非黑名单用户验证
  用例名称：商品活动非黑名单用户验证
- 输出：{"activityBasicId": 10127}
+ 输出：{"activityBasicId": "%s"}
 """
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
-result = {"activityBasicId": result["data"]["activity"]["activityBasicId"]}
+result = {"activityBasicId": result["data"]["zero"]["purchaseZeroProductList"][0]["activityBasicId"]}
+result["api_time"] = api_time
 # print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict9", activity_basic_id)
-print(check_dict)
+# print(check_dict)
 # 断言实际结果中是否包含预期结果的内容
 commonFuc().check_result(check_dict, result)

air_case/cmdc_commodity_activity/活动黑名单用户验证.air/活动黑名单用户验证.py

@@ -16,8 +16,8 @@ module = "cmdc_commodity_activity"
 
 # 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
+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)
@@ -64,9 +64,12 @@ request_body = commonFuc().get_business_data(module, "payload7", product_id, com
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
 print(result)
 result = {"activity": result["data"]["activity"]}
+result["api_time"] = api_time
 # print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict22")

air_case/cmdc_commodity_activity/生成活动规则code接口验证.air/生成活动规则code接口验证.py

+# -*- encoding=utf8 -*-
+__author__ = "liguangyu"
+
+"""
+case_tag:cmdc_api,cmdc生成活动规则code接口验证,2262,2262-41,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, "url41")
+request_body = commonFuc().get_business_data(module, "payload41")
+
+"""
+ 场景:生成活动规则code接口验证
+ 用例名称：生成活动规则code接口验证
+ 输出：{"success":true,"code":"200","message":"OK"}
+"""
+
+# 发送请求
+result = requests.get(url, params=request_body)
+# 获取接口响应时间
+api_time = result.elapsed.total_seconds()
+
+# 将接口响应时间添加至结果中
+result = json.loads(result.content)
+result["api_time"] = api_time
+
+# 获取预期结果
+check_dict = commonFuc().get_business_data(module, "checkDict41")
+# 断言实际结果中是否包含预期结果的内容
+commonFuc().check_result(check_dict, result)
+
+

air_case/cmdc_commodity_activity/获取商品对应的赠品信息.air/获取商品对应的赠品信息.py

@@ -10,14 +10,14 @@ from common.common_func import commonFuc
 from air_case.cmdc_login.多采商城登录.多采商城登录 import CmdcMaiiLogin
 import requests
 import json
-import random
+
 
 module = "cmdc_commodity_activity"
 
 # 第一步登录多采商城获取token信息
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username")
-password = commonFuc().get_business_data(module, "password")
+username = commonFuc().get_business_data(module, "username5")
+password = commonFuc().get_business_data(module, "password5")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcMaiiLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers1", cmdc_access_token)
@@ -35,8 +35,10 @@ request_body = commonFuc().get_business_data(module, "payload16")
 
 # 发送请求
 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
 
 
 # 获取预期结果

air_case/cmdc_commodity_activity/获取活动包含的商品信息.air/获取活动包含的商品信息.py

@@ -15,8 +15,8 @@ module = "cmdc_commodity_activity"
 
 # 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
+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)
@@ -44,8 +44,10 @@ request_body = commonFuc().get_business_data(module, "payload3", activity_basic_
 
 # 发送请求
 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, "checkDict3")
 print(check_dict)

air_case/cmdc_commodity_activity/获取活动基本信息.air/获取活动基本信息.py

@@ -15,8 +15,8 @@ module = "cmdc_commodity_activity"
 
 # 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
+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)
@@ -43,8 +43,10 @@ request_body = commonFuc().get_business_data(module, "payload2", activity_basic_
 
 # 发送请求
 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, "checkDict2")
 print(check_dict)

air_case/cmdc_commodity_activity/获取活动对应的指定客户差异促销规则.air/获取活动对应的指定客户差异促销规则.py

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

air_case/cmdc_commodity_activity/获取活动对应的黑名单.air/获取活动对应的黑名单.py

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