Merge remote-tracking branch 'origin/master'

air_case/cmdc_product/查看雅培商品折扣规则批量导入日志.air/查看雅培商品折扣规则批量导入日志.py

+# -*- encoding=utf8 -*-
+__author__ = "liguangyu"
+
+"""
+case_tag:cmdc_api,cmdc查看雅培商品折扣规则批量导入日志,2293,2293-061,sit,bs
+主数据平台:运营后台管理系统查看雅培商品折扣规则批量导入日志接口
+"""
+
+from common.common_func import commonFuc
+from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
+import requests
+import json
+
+module = "cmdc_product"
+
+# 获取登录所需账号密码
+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, "url52")
+request_body = commonFuc().get_business_data(module, "payload52")
+
+"""
+
+ 场景: 查看雅培商品折扣规则批量导入日志
+ 用例名称：查看雅培商品折扣规则批量导入日志
+ 输出：{"success":true,"code":"200","message":"OK"}
+"""
+
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+result = json.loads(result.content)
+# print(result)
+# 获取预期结果
+check_dict = commonFuc().get_business_data(module, "checkDict52")
+# print(check_dict)
+# 断言实际结果中是否包含预期结果的内容
+commonFuc().check_result(check_dict, result)

air_case/cmdc_product/查询条件验证_雅培折扣价格信息列表.air/查询条件验证_雅培折扣价格信息列表.py

+# -*- encoding=utf8 -*-
+__author__ = "liguangyu"
+
+"""
+case_tag:cmdc_api,cmdc查询条件验证_雅培折扣价格信息列表,2293,2293-055,sit,bs
+主数据平台:运营后台管理系统获取雅培折扣价格信息列表接口
+"""
+
+from common.common_func import commonFuc
+from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
+import requests
+import random
+import json
+
+module = "cmdc_product"
+
+# 获取登录所需账号密码
+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, "url49")
+request_body = commonFuc().get_business_data(module, "payload49")
+
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+result = json.loads(result.content)
+
+# 生成随机数
+product_random = random.randint(0, len(result["data"]["list"]) - 1)
+# 获取折扣规则信息
+product_code = result["data"]["list"][product_random]["productCode"]
+product_name = result["data"]["list"][product_random]["productName"]
+area_name = result["data"]["list"][product_random]["areaName"]
+product_line_name = result["data"]["list"][product_random]["productLineName"]
+specifications = result["data"]["list"][product_random]["specifications"]
+material_code = result["data"]["list"][product_random]["materialCode"]
+manufacturer = result["data"]["list"][product_random]["manufacturer"]
+customer_code = result["data"]["list"][product_random]["customerCode"]
+customer_name = result["data"]["list"][product_random]["customerName"]
+effective_date = result["data"]["list"][product_random]["effectiveDate"]
+expiration_date = result["data"]["list"][product_random]["expirationDate"]
+
+# 进行列表查询验证
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url50")
+request_body = commonFuc().get_business_data(module, "payload50", product_code, product_name, area_name,
+                                             product_line_name,
+                                             specifications, material_code, manufacturer, customer_code, customer_name,
+                                             effective_date, expiration_date)
+
+"""
+ 场景: 查询条件验证_雅培折扣价格信息列表
+ 用例名称：查询条件验证_雅培折扣价格信息列表
+ 输出：{"productCode":"%s"}
+"""
+
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+result = json.loads(result.content)
+# print(result)
+# 获取查询结果中商品code
+result = {"productCode": result["data"]["list"][0]["productCode"]}
+# 获取预期结果
+check_dict = commonFuc().get_business_data(module, "checkDict50", product_code)
+# print(check_dict)
+# 断言实际结果中是否包含预期结果的内容
+commonFuc().check_result(check_dict, result)

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

+# -*- encoding=utf8 -*-
+__author__ = "liguangyu"
+
+"""
+case_tag:cmdc_api,cmdc获取雅培产品线信息,2293,2293-056,sit,bs
+主数据平台:运营后台管理系统获取雅培产品线信息接口
+"""
+
+from common.common_func import commonFuc
+from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
+import requests
+import random
+import json
+
+
+module = "cmdc_product"
+
+# 获取登录所需账号密码
+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, "url51")
+request_body = commonFuc().get_business_data(module, "payload51")
+
+"""
+
+ 场景: 获取雅培产品线信息
+ 用例名称：获取雅培产品线信息
+ 输出：{"success":true,"code":"200","message":"OK"}
+"""
+
+# 发送请求
+result = requests.get(url, params=request_body, headers=headers)
+result = json.loads(result.content)
+# print(result)
+# 获取预期结果
+check_dict = commonFuc().get_business_data(module, "checkDict51")
+# print(check_dict)
+# 断言实际结果中是否包含预期结果的内容
+commonFuc().check_result(check_dict, result)

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

+# -*- encoding=utf8 -*-
+__author__ = "liguangyu"
+
+"""
+case_tag:cmdc_api,cmdc获取雅培公司列表,2293,2293-053,sit,bs
+主数据平台:运营后台管理系统获取雅培公司列表接口
+"""
+
+from common.common_func import commonFuc
+from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
+import requests
+import random
+import json
+
+
+module = "cmdc_product"
+
+
+# 获取雅培公司列表
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url48")
+
+"""
+
+ 场景: 获取雅培公司列表
+ 用例名称：获取雅培公司列表
+ 输出：{"success":true,"code":"200","message":"OK"}
+"""
+
+# 发送请求
+result = requests.get(url)
+result = json.loads(result.content)
+# print(result)
+# 获取预期结果
+check_dict = commonFuc().get_business_data(module, "checkDict48")
+# print(check_dict)
+# 断言实际结果中是否包含预期结果的内容
+commonFuc().check_result(check_dict, result)

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

+# -*- encoding=utf8 -*-
+__author__ = "liguangyu"
+
+"""
+case_tag:cmdc_api,cmdc获取雅培折扣价格信息列表,2293,2293-054,sit,bs
+主数据平台:运营后台管理系统获取雅培折扣价格信息列表接口
+"""
+
+from common.common_func import commonFuc
+from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
+import requests
+import json
+
+
+module = "cmdc_product"
+
+# 获取登录所需账号密码
+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, "url49")
+request_body = commonFuc().get_business_data(module, "payload49")
+
+"""
+
+ 场景: 获取雅培折扣价格信息列表
+ 用例名称：获取雅培折扣价格信息列表
+ 输出：{"success":true,"code":"200","message":"OK"}
+"""
+
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+result = json.loads(result.content)
+# print(result)
+# 获取预期结果
+check_dict = commonFuc().get_business_data(module, "checkDict49")
+# print(check_dict)
+# 断言实际结果中是否包含预期结果的内容
+commonFuc().check_result(check_dict, result)

data/cmdc_product/data

@@ -339,18 +339,38 @@ checkDict46: {"success":true,"code":"200","message":"OK"}
 checkDict47: {"success":true,"code":"200","message":"OK","data":True}
 
 
+#测试场景四十八：获取雅培公司列表
+"url48": "/user/public/yapeiCompanyList"
 
+#预期结果
+checkDict48: {"success":true,"code":"200","message":"OK"}
 
+#测试场景四十九：获取雅培折扣价格信息列表
+"url49": "/product/queryYaPeiPriceList"
+"payload49": {"companyName":null,"productCode":null,"productName":null,"areaName":null,"productLineName":null,"specifications":null,"materialCode":null,"manufacturer":null,"customerCode":null,"customerName":null,"queryTimes":[],"pageNum":1,"pageSize":8,"total":null}
+#预期结果
+checkDict49: {"success":true,"code":"200","message":"OK"}
 
 
+#测试场景五十：查询条件验证_雅培折扣价格信息列表
+"url50": "/product/queryYaPeiPriceList"
+"payload50": {"companyName":null,"productCode":"%s","productName":"%s","areaName":"%s","productLineName":"%s","specifications":"%s","materialCode":"%s","manufacturer":"%s","customerCode":"%s","customerName":"%s","queryTimes":["%s","%s"],"pageNum":1,"pageSize":8,"total":null}
+#预期结果
+checkDict50: {"productCode":"%s"}
 
 
+#测试场景五十一：获取雅培产品线信息
+"url51": "/product/back/getYaPeiProductLines"
+"payload51": {"companyCode":"00111"}
+#预期结果
+checkDict51: {"success":true,"code":"200","message":"OK"}
 
 
-
-
-
-
+#测试场景五十二：查看雅培商品折扣规则批量导入日志
+"url52": "/product/yapeiFile/queryList"
+"payload52": {"pageNum":1,"pageSize":10,"total":null}
+#预期结果
+checkDict52: {"success":true,"code":"200","message":"OK"}