Merge remote-tracking branch 'origin/master'

air_case/cmdc_product/h_商品附件删除功能验证.air/h_商品附件删除功能验证.py

@@ -44,7 +44,7 @@ request_body = commonFuc().get_business_data(module, "payload33", id)
 # 发送请求
 result = requests.get(url, params=request_body)
 result = json.loads(result.content)
-print(result)
+# print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict33")
 # print(check_dict)

air_case/cmdc_product/m_商品限购规则批量导入.air/m_商品限购规则批量导入.py

@@ -8,6 +8,7 @@ case_tag:cmdc_api,cmdc商品限购规则批量导入,2293,2293-014,sit,bs
 
 from common.common_func import commonFuc
 from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
+from common.handle_excel import HandleExcel
 import requests
 import json
 import os
@@ -27,6 +28,19 @@ headers = commonFuc().get_business_data(module, "json_headers_file", cmdc_access
 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"
 
+# 设定商品信息
+product_code = "12364265"
+product_name = "医用检查手套"
+cus_code = "1071246"
+cus_name = "上海勘泽贸易商行"
+
+# 将商品信息写入文件中
+excel = HandleExcel(file_path, "Sheet1")
+excel.write_data(row=2, column=1, value=product_code)
+excel.write_data(row=2, column=2, value=product_name)
+excel.write_data(row=2, column=3, value=cus_code)
+excel.write_data(row=2, column=4, value=cus_name)
+
 # 第二步商品限购规则批量导入操作
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url46")
 
@@ -49,4 +63,4 @@ check_dict = commonFuc().get_business_data(module, "checkDict46")
 # print(check_dict)
 # 断言实际结果中是否包含预期结果的内容
 commonFuc().check_result(check_dict, result)
-
+file.close()

air_case/cmdc_product/n_商品限购删除功能验证.air/n_商品限购删除功能验证.py

@@ -43,7 +43,7 @@ request_body = commonFuc().get_business_data(module, "payload47", id)
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
 result = json.loads(result.content)
-print(result)
+# print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict47")
 # print(check_dict)

air_case/cmdc_product/o_雅培商品折扣规则批量导入验证.air/o_雅培商品折扣规则批量导入验证.py

+# -*- encoding=utf8 -*-
+__author__ = "liguangyu"
+
+"""
+case_tag:cmdc_api,cmdc雅培商品折扣规则批量导入验证,2293,2293-058,sit,bs
+涉及到接口:运营后台管理雅培商品折扣规则批量导入接口
+"""
+
+from common.common_func import commonFuc
+from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
+import requests
+import json
+import os
+
+
+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_file", cmdc_access_token)
+
+# 获取文件地址
+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"
+
+# 第二步雅培商品折扣规则批量导入操作
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url54")
+
+# 获取文件
+file = open(file_path, "rb")
+files = {"file": file}
+
+"""
+ 场景: 雅培商品折扣规则批量导入验证
+ 用例名称：雅培商品折扣规则批量导入验证
+ 输出：{"success":true,"code":"200","message":"OK"}
+"""
+
+# 发送请求
+result = requests.post(url, files=files, headers=headers)
+result = json.loads(result.content)
+# print(result)
+# 获取预期结果
+check_dict = commonFuc().get_business_data(module, "checkDict54")
+# print(check_dict)
+# 断言实际结果中是否包含预期结果的内容
+commonFuc().check_result(check_dict, result)
+file.close()
\ No newline at end of file

air_case/cmdc_product/p_雅培商品折扣规则删除验证.air/p_雅培商品折扣规则删除验证.py

+# -*- encoding=utf8 -*-
+__author__ = "liguangyu"
+
+"""
+case_tag:cmdc_api,cmdc雅培商品折扣规则删除验证,2293,2293-059,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, "payload55")
+
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+result = json.loads(result.content)
+
+# 获取折扣规则信息
+id = result["data"]["list"][0]["id"]
+
+# 对商品折扣规则进行删除操作
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url55")
+request_body = [id]
+
+"""
+ 场景: 雅培商品折扣规则删除验证
+ 用例名称：雅培商品折扣规则删除验证
+ 输出：{"success":true,"code":"200"}
+"""
+
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+result = json.loads(result.content)
+# print(result)
+
+# 获取预期结果
+check_dict = commonFuc().get_business_data(module, "checkDict55")
+# print(check_dict)
+# 断言实际结果中是否包含预期结果的内容
+commonFuc().check_result(check_dict, result)
+

air_case/cmdc_product/q_按条件删除协议价验证.air/q_按条件删除协议价验证.py

+# -*- encoding=utf8 -*-
+__author__ = "liguangyu"
+
+"""
+case_tag:cmdc_api,cmdc按条件删除协议价验证,2293,2293-060,sit,bs
+涉及到接口:运营后台管理系统按条件删除协议价接口
+"""
+
+from common.common_func import commonFuc
+from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
+import requests
+import json
+import os
+
+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_file", cmdc_access_token)
+
+# 获取文件地址
+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"
+
+# 进行文件上传操作
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url56")
+
+# 获取文件
+file = open(file_path, "rb")
+files = {"file": file}
+
+# 发送请求
+result = requests.post(url, files=files, headers=headers)
+result = json.loads(result.content)
+# print(result)
+# 上传成功后获取对应的id，用于后续确认删除操作
+id = result["data"]["yapeiPrices"][0]["id"]
+
+# 确认删除操作
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url56_1")
+request_body = {"ids": [id]}
+
+"""
+ 场景: 按条件删除协议价验证
+ 用例名称：按条件删除协议价验证
+ 输出：{"success":true,"code":"200","message":"OK","data":true,"freshToken":null}
+"""
+
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+result = json.loads(result.content)
+
+# 获取预期结果
+check_dict = commonFuc().get_business_data(module, "checkDict56")
+# print(check_dict)
+# 断言实际结果中是否包含预期结果的内容
+commonFuc().check_result(check_dict, result)
+file.close()
\ No newline at end of file

air_case/cmdc_product/商品价格明细导出验证.air/商品价格明细导出验证.py

+# -*- encoding=utf8 -*-
+__author__ = "liguangyu"
+
+"""
+case_tag:cmdc_api,cmdc商品价格明细导出验证,2293,2293-057,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_product"
+
+# 第一步登录多采商城获取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_file", 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"]
+
+# 第三步商品价格明细导出
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url53")
+request_body = commonFuc().get_business_data(module, "payload53", product_code)
+# print(request_body)
+
+"""
+
+ 场景: 商品价格明细导出验证
+ 用例名称：商品价格明细导出验证
+ 输出：{"productCode":"%s"}
+"""
+
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+# result = json.loads(result.content)
+# print(result)
+
+# 获取文件
+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 = {"productCode": excel.read_data()[0].get("商品编码")}
+# print(result)
+# 获取预期结果
+check_dict = commonFuc().get_business_data(module, "checkDict53", product_code)
+# print(check_dict)
+# 断言实际结果中是否包含预期结果的内容
+commonFuc().check_result(check_dict, result)

air_case/cmdc_product/附件上传功能验证.air/附件上传功能验证.py

@@ -43,9 +43,10 @@ files = {"file": file}
 # 发送请求
 result = requests.post(url, files=files, headers=headers)
 result = json.loads(result.content)
-# print(result)
+
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict28")
 # print(check_dict)
 # 断言实际结果中是否包含预期结果的内容
 commonFuc().check_result(check_dict, result)
+file.close()
\ No newline at end of file

data/cmdc_product/data

@@ -372,6 +372,62 @@ checkDict51: {"success":true,"code":"200","message":"OK"}
 #预期结果
 checkDict52: {"success":true,"code":"200","message":"OK"}
 
+#测试场景五十三：商品价格明细导出验证
+"url53": "/product/back/exportYapeiPriceDetail"
+"payload53": {"companyName":null,"productCode":"%s","productName":null,"areaName":null,"productLineName":null,"specifications":null,"materialCode":null,"manufacturer":null,"customerCode":null,"customerName":null,"queryTimes":[],"pageNum":1,"pageSize":8,"total":1,"startTime":null,"endTime":null}
+#预期结果
+checkDict53: {"productCode":"%s"}
+
+#测试场景五十四：雅培商品折扣规则批量导入验证
+"url54": "/product/public/importYapeiPrice"
+
+#预期结果
+checkDict54: {"success":true,"code":"200","message":"OK"}
+
+
+#测试场景五十五：雅培商品折扣规则删除验证
+"url55": "/product/batchDelete"
+
+#预期结果
+checkDict55: {"success":true,"code":"200"}
+# 获取指定商品折扣信息报文
+"payload55": {"companyName":null,"productCode":"10082402","productName":null,"areaName":null,"productLineName":null,"specifications":null,"materialCode":null,"manufacturer":null,"customerCode":null,"customerName":null,"queryTimes":[],"pageNum":1,"pageSize":8,"total":null,"startTime":null,"endTime":null}
+
+
+#测试场景五十六：按条件删除协议价验证
+# 文件上传
+"url56": "/product/back/importYaPeiDelete"
+
+# 确认删除
+"url56_1": "/product/back/submitYaPeiDelete"
+
+#预期结果
+checkDict56: {"success":true,"code":"200","message":"OK","data":true,"freshToken":null}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+