Merge branch 'master' into 'main'

用例优化

See merge request !2

air_case/cmdc_demand_list_pc/需求单删除操作.air/需求单删除操作.py

@@ -33,6 +33,8 @@ request_body = commonFuc().get_business_data(module, "payload30")
 # 发送请求
 result = requests.post(url1, json=request_body, headers=headers)
 result = json.loads(result.content)
+
+# 获取草稿订单对应的demandParentId
 demand_parent_id = result["data"]["list"][0]["demandParentId"]
 
 # 对获取到的需求单进行删除操作
@@ -47,9 +49,9 @@ request_body = commonFuc().get_business_data(module, "payload3", demand_parent_i
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
 result = json.loads(result.content)
-# print(result)
+
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict3")
-print(check_dict)
+
 # 断言实际结果中是否包含预期结果的内容
 commonFuc().check_result(check_dict, result)

air_case/cmdc_rebate/列表查询条件验证_返利使用明细.air/列表查询条件验证_返利使用明细.py

+# -*- encoding=utf8 -*-
+__author__ = "liguangyu"
+
+"""
+case_tag:cmdc_api,cmdc列表查询条件验证_返利使用明细,2271,2271-2,sit,bs
+主数据平台:后台运营系统返利使用明细查询接口
+"""
+
+from common.common_func import commonFuc
+from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
+import requests
+import datetime
+import random
+import json
+
+module = "cmdc_rebate"
+
+# 第一步登录后台运营平台获取cmdc_access_token
+# 获取登录所需账号密码
+username = commonFuc().get_business_data(module, "username1")
+password = commonFuc().get_business_data(module, "password1")
+# 获取登录后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")
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+result = json.loads(result.content)
+
+
+# 此函数用于当x为none时，进行空字符串替换
+def func(x):
+    if x is None:
+        x = ""
+        return x
+    else:
+        return x
+
+
+# 生成一个随机数字，用于后续随机选择某一条返利使用明细
+rebate_random = random.randint(0, len(result["data"]["list"]) - 1)
+# 获取返利使用明细列表中某一条明细信息
+customer_code = result["data"]["list"][rebate_random]["customerCode"]
+customer_name = result["data"]["list"][rebate_random]["customerName"]
+relevance_name = result["data"]["list"][rebate_random]["relevanceName"]
+transaction_type = result["data"]["list"][rebate_random]["transactionType"]
+rebate_id = result["data"]["list"][rebate_random]["rebateId"]
+rebate_name = result["data"]["list"][rebate_random]["rebateName"]
+list_order_status = func(result["data"]["list"][rebate_random]["orderStatus"])
+demand_code = func(result["data"]["list"][rebate_random]["demandCode"])
+start_time = result["data"]["list"][rebate_random]["createTimeStr"]
+# 获取当前时间作为交易时间截止时间
+end_time = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+
+# 第三步进行条件查询验证
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url2")
+request_body = commonFuc().get_business_data(module, "payload2", customer_code, customer_name, relevance_name,
+                                             transaction_type,
+                                             rebate_id, rebate_name, list_order_status, demand_code, start_time,
+                                             end_time)
+
+"""
+ 场景: 验证返利使用明细列表查询条件是否可以正常使用
+ 用例名称：列表查询条件验证_返利使用明细
+ 输出：{"customerCode":"%s"}
+"""
+
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+result = json.loads(result.content)
+print(result)
+# 获取查询结果中使用明细对应的客户编号
+result = {"customerCode": result["data"]["list"][0]["customerCode"]}
+# 获取预期结果
+check_dict = commonFuc().get_business_data(module, "checkDict2", customer_code)
+# 断言实际结果中是否包含预期结果的内容
+commonFuc().check_result(check_dict, result)

air_case/cmdc_rebate/列表查询条件验证_返利规则.air/列表查询条件验证_返利规则.py

+# -*- encoding=utf8 -*-
+__author__ = "liguangyu"
+
+"""
+case_tag:cmdc_api,cmdc列表查询条件验证_返利规则,2271,2271-4,sit,bs
+主数据平台:后台运营系统返利规则查询接口
+"""
+
+from common.common_func import commonFuc
+from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
+import requests
+import random
+import json
+
+module = "cmdc_rebate"
+
+# 第一步登录后台运营平台获取cmdc_access_token
+# 获取登录所需账号密码
+username = commonFuc().get_business_data(module, "username1")
+password = commonFuc().get_business_data(module, "password1")
+# 获取登录后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, "url3")
+request_body = commonFuc().get_business_data(module, "payload3")
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+result = json.loads(result.content)
+
+
+# 此函数用于当x为none时，进行空字符串替换
+def func(x):
+    if x is None:
+        x = ""
+        return x
+    else:
+        return x
+
+
+# 生成一个随机数字，用于后续随机选择某一条返利规则
+rebate_random = random.randint(0, len(result["data"]["list"]) - 1)
+# 获取返利规则列表中某一条规则信息
+rebate_name = result["data"]["list"][rebate_random]["rebatename"]
+product_code = func(result["data"]["list"][rebate_random]["productcode"])
+product_name = func(result["data"]["list"][rebate_random]["productname"])
+customer_code = func(result["data"]["list"][rebate_random]["customercode"])
+customer_name = func(result["data"]["list"][rebate_random]["customername"])
+rebate_status = result["data"]["list"][rebate_random]["status"]
+audit_statuss = result["data"]["list"][rebate_random]["auditstatus"]
+
+# 第三步进行条件查询验证
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url4")
+request_body = commonFuc().get_business_data(module, "payload4", rebate_name, product_code, product_name,
+                                             customer_code, customer_name, rebate_status, audit_statuss)
+
+"""
+ 场景: 验证返利使用明细列表查询条件是否可以正常使用
+ 用例名称：列表查询条件验证_返利使用明细
+ 输出：{"rebatename":"%s"}
+"""
+
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+result = json.loads(result.content)
+
+# 获取查询结果中使用明细对应的客户编号
+result = {"rebatename": result["data"]["list"][0]["rebatename"]}
+# 获取预期结果
+check_dict = commonFuc().get_business_data(module, "checkDict4", rebate_name)
+# 断言实际结果中是否包含预期结果的内容
+commonFuc().check_result(check_dict, result)

air_case/cmdc_rebate/客户发放返利信息获取验证.air/客户发放返利信息获取验证.py

+# -*- encoding=utf8 -*-
+__author__ = "liguangyu"
+
+"""
+case_tag:cmdc_api,cmdc客户发放返利信息获取验证,2271,2271-5,sit,bs
+主数据平台:后台运营系统客户发放返利查询接口
+"""
+
+from common.common_func import commonFuc
+from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
+import requests
+import json
+
+module = "cmdc_rebate"
+
+# 第一步登录后台运营平台获取cmdc_access_token
+# 获取登录所需账号密码
+username = commonFuc().get_business_data(module, "username1")
+password = commonFuc().get_business_data(module, "password1")
+# 获取登录后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, "url5")
+request_body = commonFuc().get_business_data(module, "payload5")
+"""
+ 场景: 验证是否可以正常获取客户发放返利信息列表
+ 用例名称：客户发放返利信息获取验证
+ 输出：{"success":true,"code":"200","message":"OK"}
+"""
+
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+result = json.loads(result.content)
+
+# 获取预期结果
+check_dict = commonFuc().get_business_data(module, "checkDict5")
+# 断言实际结果中是否包含预期结果的内容
+commonFuc().check_result(check_dict, result)
+

air_case/cmdc_rebate/返利使用明细.air/返利使用明细.py

+# -*- encoding=utf8 -*-
+__author__ = "liguangyu"
+
+"""
+case_tag:cmdc_api,cmdc获取返利使用明细,2271,2271-1,sit,bs
+主数据平台:后台运营系统返利使用明细查询接口
+"""
+
+from common.common_func import commonFuc
+from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
+import requests
+import json
+
+module = "cmdc_rebate"
+
+# 第一步登录后台运营平台获取cmdc_access_token
+# 获取登录所需账号密码
+username = commonFuc().get_business_data(module, "username1")
+password = commonFuc().get_business_data(module, "password1")
+# 获取登录后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")
+"""
+ 场景: 验证是否可以正常获取返利使用明细
+ 用例名称：获取返利使用明细
+ 输出：{"success":true,"code":"200","message":"OK"}
+"""
+
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+result = json.loads(result.content)
+
+# 获取预期结果
+check_dict = commonFuc().get_business_data(module, "checkDict1")
+# 断言实际结果中是否包含预期结果的内容
+commonFuc().check_result(check_dict, result)

air_case/cmdc_rebate/返利规则获取验证.air/返利规则获取验证.py

+# -*- encoding=utf8 -*-
+__author__ = "liguangyu"
+
+"""
+case_tag:cmdc_api,cmdc返利规则获取验证,2271,2271-3,sit,bs
+主数据平台:后台运营系统返利规则查询接口
+"""
+
+from common.common_func import commonFuc
+from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
+import requests
+import json
+
+module = "cmdc_rebate"
+
+# 第一步登录后台运营平台获取cmdc_access_token
+# 获取登录所需账号密码
+username = commonFuc().get_business_data(module, "username1")
+password = commonFuc().get_business_data(module, "password1")
+# 获取登录后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, "url3")
+request_body = commonFuc().get_business_data(module, "payload3")
+"""
+ 场景: 验证是否可以正常获取返利规则列表
+ 用例名称：返利规则获取验证
+ 输出：{"success":true,"code":"200","message":"OK"}
+"""
+
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+result = json.loads(result.content)
+
+# 获取预期结果
+check_dict = commonFuc().get_business_data(module, "checkDict3")
+# 断言实际结果中是否包含预期结果的内容
+commonFuc().check_result(check_dict, result)
+

air_case/cmdc_special_fresenius_group/代客下单_套包清单_查询条件验证.air/代客下单_套包清单_查询条件验证.py

@@ -27,13 +27,23 @@ request_body = commonFuc().get_business_data(module, "payload50")
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
 result = json.loads(result.content)
-# print(result)
+
+
+# 此函数用于当x为none时，进行空字符串替换
+def func(x):
+    if x is None:
+        x = ""
+        return x
+    else:
+        return x
+
+
 # 获取套包信息
 group_name = result["data"][0]["groupName"][:4]
 group_product_code = result["data"][0]["subList"][0]["product"]["productCode"]
 group_product_name = result["data"][0]["subList"][0]["product"]["productName"]
 group_option_str = result["data"][0]["subList"][0]["product"]["specifications"]
-document_no = result["data"][0]["documentNo"]
+document_no = func(result["data"][0]["documentNo"])
 product_line_code = result["data"][0]["productLineCode"]
 material_code_split = result["data"][0]["subList"][0]["product"]["materialCode"]
 
@@ -45,16 +55,17 @@ request_body = commonFuc().get_business_data(module, "payload51", group_name, gr
 """
  场景: 代客下单_套包清单_查询条件验证
  用例名称：代客下单_套包清单_查询条件验证
- 输出：{"groupPriceStatus": 0}
+ 输出：{"productLineCode": "%s"}
 """
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
 result = json.loads(result.content)
+
 # 获取结果中ref单号
-result = {"documentNo": result["data"][0]["documentNo"]}
-print(result)
+result = {"productLineCode": result["data"][0]["productLineCode"]}
+
 # 获取预期结果
-check_dict = commonFuc().get_business_data(module, "checkDict51", document_no)
+check_dict = commonFuc().get_business_data(module, "checkDict51", product_line_code)
 # 断言实际结果中是否包含预期结果的内容
 commonFuc().check_result(check_dict, result)

air_case/cmdc_special_fresenius_group/商品详情页_套包协议价显示验证.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, "url3")
-request_body = commonFuc().get_business_data(module, "payload_10056821")
+request_body = commonFuc().get_business_data(module, "payload49")
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)

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

@@ -23,13 +23,13 @@ headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_toke
 
 # 第二步套包正价查询
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url2")
-request_body = commonFuc().get_business_data(module, "payload_10056821")
+request_body = commonFuc().get_business_data(module, "payload_14260024")
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
 
 # 获取商品信息
-product_code = result["data"]["list"][0]["products"][0]["productCode"]
+product_code = result["data"]["list"][0]["products"][1]["productCode"]
 company_code = result["data"]["list"][0]["companyCode"]
 group_name = result["data"]["list"][0]["groupName"]
 group_price = result["data"]["list"][0]["groupPrice"]
@@ -61,9 +61,10 @@ request_body = commonFuc().get_business_data(module, "payload47", product_code,
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
 result = json.loads(result.content)
+
 # 获取商品详情页中套包正价信息
-result = {"groupPrice": result["data"][2]["groupPrice"], "groupName": result["data"][2]["groupName"]}
-print(result)
+result = {"groupPrice": result["data"][1]["groupPrice"], "groupName": result["data"][1]["groupName"]}
+
 # # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict47", group_price, group_name)
 # # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_special_fresenius_group/获取特殊套包详情.air/获取特殊套包详情.py

@@ -34,12 +34,13 @@ request_body = commonFuc().get_business_data(module, "payload38")
 """
  场景:获取特殊套包详情
  用例名称：获取特殊套包详情
- 输出：{"productCode":"10056821"}
+ 输出：{"productCode":"14037826"}
 """
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
 result = json.loads(result.content)
+print(result)
 result = {"productCode": result["data"][0]["productCode"]}
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict38")

data/cmdc_rebate/data

+# 多采商城登录信息
+"username": "BJ0621"
+"password": "Aa123456"
+
+#后台运营管理系统登录信息(子站点上海医疗器械有限公司)
+"username1": "Admin00111"
+"password1": "Aa123456"
+
+
+#后台管理系统headers
+json_headers: {
+  "Content-Type": "application/json",
+  "Cmdc_access_token": "%s"
+}
+
+#文件上传headers
+json_headers_file: {
+  "Cmdc_access_token": "%s"
+}
+
+#多采商城headers
+json_headers1: {
+  "Cmdc_access_token": "%s",
+  "Sourcetype": "mall"
+}
+
+#测试场景一：返利使用明细
+"url1": "/order/public/getRebateDetailAllList"
+"payload1": {"terminalSign":1,"companyName":null,"customerCode":null,"customerName":null,"relevanceName":null,"transactionType":null,"relevanceCode":null,"rebateId":null,"rebateName":null,"listOrderStatus":null,"demandCode":null,"startTime":null,"endTime":null,"pageNum":1,"pageSize":10}
+#预期结果
+checkDict1: {"success":true,"code":"200","message":"OK"}
+
+#测试场景二：列表查询条件验证_返利使用明细
+"url2": "/order/public/getRebateDetailAllList"
+"payload2": {"terminalSign":1,"companyName":null,"customerCode":"%s","customerName":"%s","relevanceName":"%s","transactionType":"%s","relevanceCode":null,"rebateId":"%s","rebateName":"%s","listOrderStatus":["%s"],"demandCode":"%s","startTime":"%s","endTime":"%s","pageNum":1,"pageSize":10}
+#预期结果
+checkDict2: {"customerCode":"%s"}
+
+#测试场景三：返利规则获取验证
+"url3": "/order/rebate/getList"
+"payload3": {"rebatename":null,"productcode":null,"productname":null,"customercode":null,"customername":null,"pageSize":10,"pageStart":1,"rebateStatus":[],"auditstatuss":[],"pageNum":1}
+#预期结果
+checkDict3: {"success":true,"code":"200","message":"OK"}
+
+
+#测试场景四：列表查询条件验证_返利规则
+"url4": "/order/rebate/getList"
+"payload4": {"rebatename":"%s","productcode":"%s","productname":"%s","customercode":"%s","customername":"%s","pageSize":10,"pageStart":1,"rebateStatus":["%s"],"auditstatuss":["%s"],"pageNum":1}
+#预期结果
+checkDict4: {"rebatename":"%s"}
+
+
+#测试场景五：客户发放返利信息获取验证
+"url5": "/order/rebate/queryRebateInfoList"
+"payload5": {"customerCode":null,"telephone":null,"companyName":null,"rebateId":null,"rebateName":null,"relevanceName":null,"pageSize":10,"pageNum":1}
+#预期结果
+checkDict5: {"success":true,"code":"200","message":"OK"}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

data/cmdc_special_fresenius_group/data

@@ -239,9 +239,9 @@ checkDict31: {"groupCode": "%s"}
 #测试场景：获取特殊套包详情
 #获取特殊套包详情接口信息
 "url38": "/order/public/getDetailFreseniusGroup"
-"payload38": {"productCode":"10056821","companyCode":"00111"}
+"payload38": {"productCode":"14037826","companyCode":"00111"}
 #预期结果
-checkDict38: {"productCode": "10056821"}
+checkDict38: {"productCode": "14037826"}
 
 #切换站点信息
 "url_website": "/user/mall/switchWebsite"
@@ -291,7 +291,7 @@ checkDict46: {"demandParentCode": "%s"}
 
 #测试场景：验证商品详情页面套包正价的展示
 #查询指定套包正价信息
-"payload_10056821": {"groupCode":"","groupName":"正价套包验证","productCode":"","productInfo":"","materialCode":"","manufacturerList":[],"productLineName":"","description":"","manufacturerProductDesc":"","manufacturerProductNo":"","customerCode":"","customerName":"","manufacturerUserNo":"","manufacturerUserDesc":"","documentNo":"","companyCode":"","groupType":0,"status":null,"pageStart":1,"pageSize":8,"regularPriceSign":1,"groupPriceStatus":1,"isRegularPrice":1}
+"payload_14260024": {"groupCode":"","groupName":"费森尤斯套包000002","productCode":"","productInfo":"","materialCode":"","manufacturerList":[],"productLineName":"","description":"","manufacturerProductDesc":"","manufacturerProductNo":"","customerCode":"","customerName":"","manufacturerUserNo":"","manufacturerUserDesc":"","documentNo":"","companyCode":"","groupType":0,"status":null,"pageStart":1,"pageSize":8,"regularPriceSign":1,"groupPriceStatus":1,"isRegularPrice":1}
 #获取套包信息
 "url47": "/order/public/getFreseniusGroup"
 "payload47": {"productCode":"%s","companyCode":"%s","detail":true,"buyCart":true,"num":1}
@@ -310,7 +310,7 @@ checkDict48: {"groupPrice":"%s","documentNo":"%s"}
 #查询条件验证
 "payload51": {"groupName":"%s","groupProductCode":"%s","groupProductName":"%s","groupOptionStr":"%s","documentNo":"%s","productLineCode":"%s","userNo":1126384,"companyCode":"00111","materialCodeSplit":"%s","back":true,"p":true,"buyCart":true,"num":1}
 #预期结果
-checkDict51: {"documentNo":"%s"}
+checkDict51: {"productLineCode":"%s"}