Merge branch 'master' into 'main'

Master|代码更新归档

See merge request !6

air_case/cmdc_product/ae_下单数量设置删除功能验证.air/ae_下单数量设置删除功能验证.py

@@ -15,8 +15,8 @@ import json
 module = "cmdc_product"
 
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
+username = commonFuc().get_business_data(module, "username2")
+password = commonFuc().get_business_data(module, "password2")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
@@ -46,8 +46,10 @@ request_body = commonFuc().get_business_data(module, "payload63", product_packag
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-# print(result)
+result["api_time"] = api_time
 
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict63")

air_case/cmdc_product/af_下单数量设置批量删除功能验证.air/af_下单数量设置批量删除功能验证.py

@@ -15,8 +15,8 @@ import json
 module = "cmdc_product"
 
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
+username = commonFuc().get_business_data(module, "username2")
+password = commonFuc().get_business_data(module, "password2")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
@@ -42,13 +42,15 @@ request_body = [product_package]
 
  场景: 下单数量设置批量删除功能验证
  用例名称：下单数量设置批量删除功能验证
- 输出：{"success": False,"code":"200","message":"OK","data":1}
+ 输出：{"success":true,"code":"200","message":"OK","data":1,"freshToken":null}
 """
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-# print(result)
+result["api_time"] = api_time
 
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict64")

air_case/cmdc_product/am_属性值配置新增验证.air/am_属性值配置新增验证.py

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

air_case/cmdc_product/an_属性值配置删除功能验证.air/an_属性值配置删除功能验证.py

@@ -44,8 +44,11 @@ request_body = commonFuc().get_business_data(module, "payload69", dirt_id)
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 # print(result)
+result["api_time"] = api_time
 
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict69")

air_case/cmdc_product/b_商品属性删除功能验证.air/b_商品属性删除功能验证.py

@@ -53,14 +53,17 @@ request_body = {"propertyIds": [property_id]}
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-# print(result)
+result["api_time"] = api_time
 if result["success"]:
     # 查询数据库中对应公司对应的商品属性id
     sql = "SELECT t.deleteSign FROM `cmdc-product`.ic_product_properties t  WHERE companyCode = 00111 and propertyId ={}".format(
         property_id)
     total = mysql_handle.selectSql(host, port, user, pwd, "cmdc-product", sql)[0][0]
     result = {"deleteSign": total}
+    result["api_time"] = api_time
     # 获取预期结果
     check_dict = commonFuc().get_business_data(module, "checkDict7")
     # print(check_dict)

air_case/cmdc_product/c_库存配置新增验证.air/c_库存配置新增验证.py

@@ -38,10 +38,12 @@ request_body = commonFuc().get_business_data(module, "payload23")
 """
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-# print(result)
 # 获取新增后库存配置id
 result = {"data": result["data"]}
+result["api_time"] = api_time
 # print(result)
 # 查询数据库中新增的库存配置对应id
 sql = "SELECT t.stockRuleId  FROM `cmdc-product`.ic_stock_rule t WHERE companyCode = 00111 and deleteSign = 0 and ruleName = '测试数据12321'"

air_case/cmdc_product/d_库存配置删除功能验证.air/d_库存配置删除功能验证.py

@@ -42,11 +42,14 @@ request_body = commonFuc().get_business_data(module, "payload24", rule_id)
 """
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 # print(result)
 # 查询数据库中对应库存配置删除标识
 sql = "SELECT t.deleteSign  FROM `cmdc-product`.ic_stock_rule t WHERE stockRuleId = {}".format(rule_id)
 result = {"deleteSign": mysql_handle.selectSql(host, port, user, pwd, "cmdc-product", sql)[0][0]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict24")
 # print(check_dict)

air_case/cmdc_product/e_商品附件启用功能验证.air/e_商品附件启用功能验证.py

@@ -25,7 +25,10 @@ request_body = commonFuc().get_business_data(module, "payload31")
 """
 # 发送请求
 result = requests.get(url, params=request_body)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
+result["api_time"] = api_time
 
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict31")

air_case/cmdc_product/f_商品附件停用功能验证.air/f_商品附件停用功能验证.py

@@ -25,7 +25,10 @@ request_body = commonFuc().get_business_data(module, "payload32")
 """
 # 发送请求
 result = requests.get(url, params=request_body)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
+result["api_time"] = api_time
 
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict32")

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

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

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

@@ -43,8 +43,10 @@ request_body = commonFuc().get_business_data(module, "payload33", id)
 
 # 发送请求
 result = requests.get(url, params=request_body)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-# print(result)
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict33")
 # print(check_dict)

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

@@ -29,10 +29,10 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.pa
 file_path = BASE_DIR + "/data/cmdc_files/商品限购模板.xlsx"
 
 # 设定商品信息
-product_code = "12364265"
-product_name = "医用检查手套"
-cus_code = "1071246"
-cus_name = "上海勘泽贸易商行"
+product_code = "10145131"
+product_name = "掌指骨部支具(腱鞘炎)"
+cus_code = "1007035"
+cus_name = "北京东信医疗器械有限公司"
 
 # 将商品信息写入文件中
 excel = HandleExcel(file_path, "Sheet1")
@@ -56,8 +56,10 @@ files = {"file": file}
 
 # 发送请求
 result = requests.post(url, files=files, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-# print(result)
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict46")
 # print(check_dict)

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

@@ -26,7 +26,7 @@ request_body = commonFuc().get_business_data(module, "payload47_1")
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
 result = json.loads(result.content)
-
+# print(result)
 # 获取商品限购信息
 id = result["data"]["list"][0]["id"]
 
@@ -42,7 +42,10 @@ request_body = commonFuc().get_business_data(module, "payload47", id)
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
+result["api_time"] = api_time
 # print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict47")

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

@@ -17,8 +17,8 @@ module = "cmdc_product"
 
 
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
+username = commonFuc().get_business_data(module, "username2")
+password = commonFuc().get_business_data(module, "password2")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers_file", cmdc_access_token)
@@ -42,8 +42,10 @@ files = {"file": file}
 
 # 发送请求
 result = requests.post(url, files=files, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-# print(result)
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict54")
 # print(check_dict)

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

@@ -14,8 +14,8 @@ import json
 module = "cmdc_product"
 
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
+username = commonFuc().get_business_data(module, "username2")
+password = commonFuc().get_business_data(module, "password2")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
@@ -28,27 +28,30 @@ 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)
+if result["data"]["list"]:
+    # 获取折扣规则信息
+    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)
+    # 获取接口响应时间
+    api_time = float(result.elapsed.total_seconds())
+    result = json.loads(result.content)
+    result["api_time"] = api_time
+
+    # 获取预期结果
+    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

@@ -15,8 +15,8 @@ import os
 module = "cmdc_product"
 
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
+username = commonFuc().get_business_data(module, "username2")
+password = commonFuc().get_business_data(module, "password2")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers_file", cmdc_access_token)
@@ -37,25 +37,34 @@ result = requests.post(url, files=files, headers=headers)
 result = json.loads(result.content)
 # print(result)
 # 上传成功后获取对应的id，用于后续确认删除操作
-id = result["data"]["yapeiPrices"][0]["id"]
+if result["data"]["yapeiPrices"]:
+    id = result["data"]["yapeiPrices"][0]["id"]
+    # 确认删除操作
+    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url56_1")
+    request_body = {"ids": [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}
+    """
 
-"""
- 场景: 按条件删除协议价验证
- 用例名称：按条件删除协议价验证
- 输出：{"success":true,"code":"200","message":"OK","data":true,"freshToken":null}
-"""
-
-# 发送请求
-result = requests.post(url, json=request_body, headers=headers)
-result = json.loads(result.content)
+    # 发送请求
+    result = requests.post(url, json=request_body, headers=headers)
+    # 获取接口响应时间
+    api_time = float(result.elapsed.total_seconds())
+    result = json.loads(result.content)
+    result["api_time"] = api_time
 
-# 获取预期结果
-check_dict = commonFuc().get_business_data(module, "checkDict56")
-# print(check_dict)
-# 断言实际结果中是否包含预期结果的内容
-commonFuc().check_result(check_dict, result)
+    # 获取预期结果
+    check_dict = commonFuc().get_business_data(module, "checkDict56")
+    # print(check_dict)
+    # 断言实际结果中是否包含预期结果的内容
+    commonFuc().check_result(check_dict, result)
+else:
+    # 获取预期结果
+    check_dict = commonFuc().get_business_data(module, "checkDict56_1")
+    # print(check_dict)
+    # 断言实际结果中是否包含预期结果的内容
+    commonFuc().check_result(check_dict, result)
 file.close()
\ No newline at end of file

air_case/cmdc_product/上传日志信息获取.air/上传日志信息获取.py

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

air_case/cmdc_product/产品线信息获取验证.air/产品线信息获取验证.py

@@ -25,8 +25,10 @@ request_body = commonFuc().get_business_data(module, "payload29")
 """
 # 发送请求
 result = requests.get(url, json=request_body)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-# print(result)
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict29")
 # print(check_dict)

air_case/cmdc_product/产品线分配制单员功能验证.air/产品线分配制单员功能验证.py

+# -*- encoding=utf8 -*-
+__author__ = "liguangyu"
+
+"""
+case_tag:cmdc_api,cmdc产品线分配制单员功能验证,2293,2293-082,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, "username2")
+password = commonFuc().get_business_data(module, "password2")
+# 获取登录后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, "url71")
+request_body = commonFuc().get_business_data(module, "payload71")
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+result = json.loads(result.content)
+
+# 生成随机数
+line_random = random.randint(0, len(result["data"]["list"]) - 1)
+# 获取产品线信息
+product_line_code = result["data"]["list"][line_random]["productLineCode"]
+member_ids_list = result["data"]["list"][line_random]["memberIdsList"]
+
+# 第三步获取制单员列表
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url75")
+request_body = {"productLineCode": product_line_code, "realName": "", "memberIdsList": member_ids_list, "pageNumber": 1,
+                "pageSize": 5}
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+result = json.loads(result.content)
+
+# 生成随机数
+marker_random = random.randint(0, len(result["data"]["list"]) - 1)
+# 获取制单员信息
+marker_list = result["data"]["list"][marker_random]
+
+# 第四步分配制单员
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url76")
+request_body = {"productLineCode": product_line_code, "userList": [marker_list]}
+
+"""
+ 场景: 产品线分配制单员功能验证
+ 用例名称：产品线分配制单员功能验证
+ 输出：{"success":false,"code":"200","message":"操作成功!","data":null,"freshToken":null}
+"""
+
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
+result = json.loads(result.content)
+result["api_time"] = api_time
+# 获取预期结果
+check_dict = commonFuc().get_business_data(module, "checkDict76")
+# 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-085,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, "url71")
+request_body = commonFuc().get_business_data(module, "payload74_1")
+
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+result = json.loads(result.content)
+# print(result)
+
+for i in result["data"]["list"]:
+    # 只对包含多个制单员的产品线进行制单员删除操作
+    if len(i["memberIdsList"]) > 1:
+        # 获取产品线信息
+        product_line_code = i["productLineCode"]
+        # 生成随机数
+        member_random = random.randint(0, len(i["memberIdsList"]) - 1)
+        # 获取制单员id
+        member_id = i["memberIdsList"][member_random]
+
+        # 第三步对产品已分配制单员进行删除操作
+        url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url79")
+        request_body = commonFuc().get_business_data(module, "payload79", product_line_code, member_id)
+
+        """
+        
+         场景: 产品线制单员删除功能验证
+         用例名称：产品线制单员删除功能验证
+         输出：{"success":false,"code":"200","message":"操作成功!","data":null,"freshToken":null}
+        """
+
+        # 发送请求
+        result = requests.post(url, json=request_body, headers=headers)
+        # 获取接口响应时间
+        api_time = float(result.elapsed.total_seconds())
+        result = json.loads(result.content)
+        result["api_time"] = api_time
+
+        # 获取预期结果
+        check_dict = commonFuc().get_business_data(module, "checkDict79")
+        # print(check_dict)
+        # 断言实际结果中是否包含预期结果的内容
+        commonFuc().check_result(check_dict, result)
+
+        # 跳出循环
+        break