Merge branch 'master' into 'main'

Master|代码更新归档

See merge request !6

air_case/cmdc_rebate/返利发放新增验证.air/返利发放新增验证.py

@@ -40,7 +40,11 @@ request_body = commonFuc().get_business_data(module, "payload43", theme, use_lim
 
 # 发送请求
 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)
 if result["success"]:
     # 获取返利发放明细
@@ -55,6 +59,7 @@ if result["success"]:
     # 数据库查询返利发放规则主题
     sql = "SELECT t.rebateTheme FROM `cmdc-order`.tc_rebatetrip t WHERE rebateTripId = {}".format(rebate_trip_id)
     result = {"rebateTheme": mysql_handle.selectSql(host, port, user, pwd, "cmdc-order", sql)[0][0]}
+    result["api_time"] = api_time
     # print(result)
     # 获取预期结果
     check_dict = commonFuc().get_business_data(module, "checkDict43", rebate_theme)

air_case/cmdc_rebate/返利发放明细获取验证.air/返利发放明细获取验证.py

@@ -25,6 +25,7 @@ headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_toke
 # 第二步获取返利发放明细
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url33")
 request_body = commonFuc().get_business_data(module, "payload33")
+
 """
  场景: 验证返利发放明细查询接口是否可正常使用
  用例名称：返利发放明细获取验证
@@ -33,7 +34,10 @@ request_body = commonFuc().get_business_data(module, "payload33")
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
+
 # print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict33")
@@ -42,7 +46,7 @@ commonFuc().check_result(check_dict, result)
 
 # 获取返利发放明细
 total = result["data"]["total"]
-# print(total)
+
 # 数据库操作
 mysql_handle = mySql()
 # 获取conf.ini文件中配置的数据库信息
@@ -51,8 +55,8 @@ host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
 # 数据库查询返利发放规则状态
 sql = "SELECT t.rebateTripId FROM `cmdc-order`.tc_rebatetrip t"
 result = {"total": len(mysql_handle.selectSql(host, port, user, pwd, "cmdc-order", sql))}
+result["api_time"] = api_time
 # print(result)
-# 核验数据库返利发放规则对应的删除标识是否正确
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict33_1", total)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/返利发放编辑功能验证.air/返利发放编辑功能验证.py

@@ -47,10 +47,13 @@ request_body = rebate_json
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 # print(result)
 # 获取查询结果中的返利信息
 result = {"rebateTripId": result["data"]["rebateTripId"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict42", rebate_trip_id)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/返利审核列表获取验证.air/返利审核列表获取验证.py

@@ -16,8 +16,8 @@ module = "cmdc_rebate"
 
 # 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
-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)
@@ -34,8 +34,10 @@ request_body = commonFuc().get_business_data(module, "payload8")
 
 # 发送请求
 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, "checkDict8")
 # 断言实际结果中是否包含预期结果的内容
@@ -43,7 +45,7 @@ commonFuc().check_result(check_dict, result)
 
 # 获取列表总数量
 total = result["data"]["total"]
-# print(total)
+result["api_time"] = api_time
 
 # 数据库操作
 mysql_handle = mySql()
@@ -51,8 +53,10 @@ mysql_handle = mySql()
 host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
 
 # 数据库查询待审核返利规则数量
-sql = "SELECT t.rebateId FROM `cmdc-order`.tc_rebate t WHERE deleteSign = 0 and isAudit = 1 and auditLevel =2"
+sql = "SELECT t.rebateId FROM `cmdc-order`.tc_rebate t " \
+      "WHERE deleteSign = 0 and isAudit = 1 and auditLevel =2 and filialeCode = 00102"
 result = {"total": len(mysql_handle.selectSql(host, port, user, pwd, "cmdc-order", sql))}
+result["api_time"] = api_time
 # print(result)
 
 # 获取预期结果

air_case/cmdc_rebate/返利规则商品客户范围查询验证.air/返利规则商品客户范围查询验证.py

@@ -48,7 +48,10 @@ request_body = commonFuc().get_business_data(module, "payload13", rebate_id)
 
 # 发送请求
 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, "checkDict13")
@@ -57,7 +60,7 @@ commonFuc().check_result(check_dict, result)
 
 # 获取返利规则对应的客户数量
 total = result["data"]["total"]
-print(total)
+result["api_time"] = api_time
 # 数据库操作
 mysql_handle = mySql()
 # 获取conf.ini文件中配置的数据库信息
@@ -66,7 +69,9 @@ host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
 # 数据库查询返利规则包含的客户数量
 sql = "SELECT t.rebateUserId FROM `cmdc-order`.tc_rebate_user t WHERE rebateId = {}".format(rebate_id)
 result = {"total": len(mysql_handle.selectSql(host, port, user, pwd, "cmdc-order", sql))}
-print(result)
+
+result["api_time"] = api_time
+
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict11_1", total)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_rebate/返利规则商品黑名单查询验证.air/返利规则商品黑名单查询验证.py

@@ -47,8 +47,10 @@ request_body = commonFuc().get_business_data(module, "payload11", rebate_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, "checkDict11")
 # 断言实际结果中是否包含预期结果的内容
@@ -56,7 +58,7 @@ commonFuc().check_result(check_dict, result)
 
 # 获取返利规则对应客户数量
 total = result["data"]["total"]
-print(total)
+result["api_time"] = api_time
 # 数据库操作
 mysql_handle = mySql()
 # 获取conf.ini文件中配置的数据库信息
@@ -65,7 +67,8 @@ host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
 # 数据库查询返利规则包含的可使用商品数量
 sql = "SELECT t.rebateProductId FROM `cmdc-order`.tc_rebate_product t WHERE rebateId = {}".format(rebate_id)
 result = {"total": len(mysql_handle.selectSql(host, port, user, pwd, "cmdc-order", sql))}
-print(result)
+result["api_time"] = api_time
+# print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict13_1", total)
 # 断言实际结果中是否包含预期结果的内容

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

@@ -33,11 +33,14 @@ request_body = commonFuc().get_business_data(module, "payload3")
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 
 # 获取列表总数量
 total = result["data"]["total"]
-print(total)
+result["api_time"] = api_time
+# print(total)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict3")
 # 断言实际结果中是否包含预期结果的内容
@@ -51,7 +54,8 @@ host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
 # 数据库查询返利规则审核状态
 sql = "SELECT t.rebateId FROM `cmdc-order`.tc_rebate t WHERE deleteSign = 0 and filialeCode = 00111"
 result = {"total": len(mysql_handle.selectSql(host, port, user, pwd, "cmdc-order", sql))}
-print(result)
+
+# print(result)
 # 核验数据库返利规则对应的删除标识是否正确
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict3_1", total)

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

@@ -15,8 +15,8 @@ module = "cmdc_special_fresenius_group"
 
 # 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
-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_headers2", cmdc_access_token)
@@ -28,7 +28,6 @@ request_body = commonFuc().get_business_data(module, "payload50")
 result = requests.get(url, params=request_body, headers=headers)
 result = json.loads(result.content)
 
-
 # 此函数用于当x为none时，进行空字符串替换
 def func(x):
     if x is None:
@@ -51,7 +50,7 @@ material_code_split = result["data"][0]["subList"][0]["product"]["materialCode"]
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url50")
 request_body = commonFuc().get_business_data(module, "payload51", group_name, group_product_code, group_product_name,
                                              group_option_str, document_no, product_line_code, material_code_split)
-
+# print(request_body)
 """
  场景: 代客下单_套包清单_查询条件验证
  用例名称：代客下单_套包清单_查询条件验证
@@ -60,11 +59,13 @@ request_body = commonFuc().get_business_data(module, "payload51", group_name, gr
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-
+# print(result)
 # 获取结果中ref单号
 result = {"productLineCode": result["data"][0]["productLineCode"]}
-
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict51", product_line_code)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_special_fresenius_group/停用_套包协议特价.air/停用_套包协议特价.py

@@ -44,7 +44,10 @@ request_body = {"freseniusPriceIds": [fresenius_price_id], "groupPriceStatus": 0
 
 # 发送请求
 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
 
 # 数据库操作
 mysql_handle = mySql()
@@ -54,7 +57,8 @@ host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
 # 数据库查询特价单品数量
 sql = "SELECT t.groupPriceStatus FROM `cmdc-order`.tc_fresenius_agreement_price t WHERE freseniusPriceId = {};".format(fresenius_price_id)
 result = {"groupPriceStatus": mysql_handle.selectSql(host, port, user, pwd, "cmdc-order", sql)[0][0]}
-print(result)
+result["api_time"] = api_time
+# print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict19")
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_special_fresenius_group/停用_批量_特价单品.air/停用_批量_特价单品.py

@@ -76,7 +76,10 @@ request_body = {"freseniusPriceIds": [fresenius_price_id], "groupPriceStatus": 0
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
+
 file.close()
 
 # 数据库操作
@@ -87,7 +90,7 @@ host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
 # 数据库查询特价单品数量
 sql = "SELECT t.groupPriceStatus FROM `cmdc-order`.tc_fresenius_agreement_price t WHERE groupId = {};".format(group_id)
 result = {"groupPriceStatus": mysql_handle.selectSql(host, port, user, pwd, "cmdc-order", sql)[0][0]}
-
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict19")
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_special_fresenius_group/列表查询条件验证_套包协议特价管理.air/列表查询条件验证_套包协议特价管理.py

@@ -73,10 +73,13 @@ request_body = commonFuc().get_business_data(module, "payload13", group_code, gr
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 
 # 获取套包协议价信息groupCode
 result = {"groupCode": result["data"]["list"][0]["groupCode"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict13", group_code)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_special_fresenius_group/列表查询条件验证_套包正价管理.air/列表查询条件验证_套包正价管理.py

@@ -71,10 +71,13 @@ request_body = commonFuc().get_business_data(module, "payload31", group_code, gr
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 
 # 获取套包正价信息groupCode
 result = {"groupCode": result["data"]["list"][0]["groupCode"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict31", group_code)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_special_fresenius_group/列表查询条件验证_客户列表.air/列表查询条件验证_客户列表.py

@@ -44,10 +44,13 @@ request_body = commonFuc().get_business_data(module, "payload16", customer_code,
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 
 # 获取客户信息
 result = {"customerCode": result["data"]["list"][0]["customerCode"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict16", customer_code)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_special_fresenius_group/列表查询条件验证_新老商品关系编码.air/列表查询条件验证_新老商品关系编码.py

@@ -50,8 +50,11 @@ request_body = commonFuc().get_business_data(module, "payload22", product_code,
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 result = {"productCode": result["data"]["list"][0]["products"][0]["productCode"]}
+result["api_time"] = api_time
 print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict22", product_code)

air_case/cmdc_special_fresenius_group/列表查询条件验证_特价单品管理.air/列表查询条件验证_特价单品管理.py

@@ -70,10 +70,13 @@ request_body = commonFuc().get_business_data(module, "payload14", product_code,
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 
 # 获取特价单品code
 result = {"productCode": result["data"]["list"][0]["freseniusProduct"]["productCode"]}
+result["api_time"] = api_time
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict14", product_code)
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_special_fresenius_group/删除_批量_套包正价.air/删除_批量_套包正价.py

@@ -74,8 +74,11 @@ request_body = {"freseniusPriceIds": [fresenius_price_id], "groupPriceStatus": 0
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
-print(result)
+
+# print(result)
 # 数据库操作
 mysql_handle = mySql()
 # 获取conf.ini文件中配置的数据库信息
@@ -85,7 +88,8 @@ host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
 sql = "SELECT t.groupPriceStatus FROM `cmdc-order`.tc_fresenius_agreement_price t WHERE freseniusPriceId = {};".format(
     fresenius_price_id)
 result = {"groupPriceStatus": mysql_handle.selectSql(host, port, user, pwd, "cmdc-order", sql)[0][0]}
-print(result)
+result["api_time"] = api_time
+# print(result)
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict23")
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_special_fresenius_group/单个新增验证_套包协议特价.air/单个新增验证_套包协议特价.py

@@ -117,8 +117,10 @@ print(request_body)
 
 # 发送请求
 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, "checkDict20")

air_case/cmdc_special_fresenius_group/单个新增验证_套包正价_指定客户.air/单个新增验证_套包正价_指定客户.py

@@ -97,7 +97,10 @@ request_body = {"manufacturerGroupName": "", "manufacturerGroupCode": "", "group
 
 # 发送请求
 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)
 
 # 进行结果判断

air_case/cmdc_special_fresenius_group/启用_批量_特价单品.air/启用_批量_特价单品.py

@@ -75,8 +75,10 @@ request_body = {"freseniusPriceIds": [fresenius_price_id], "groupPriceStatus": 1
 
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
+# print(result)
 result = json.loads(result.content)
-print(result)
 file.close()
 if result["success"]:
     # 数据库操作
@@ -89,13 +91,15 @@ if result["success"]:
         group_id)
     print(sql)
     result = {"groupPriceStatus": mysql_handle.selectSql(host, port, user, pwd, "cmdc-order", sql)[0][0]}
-    print(result)
+    result["api_time"] = api_time
+    # print(result)
     # 获取预期结果
     check_dict = commonFuc().get_business_data(module, "checkDict18")
     # 断言实际结果中是否包含预期结果的内容
     commonFuc().check_result(check_dict, result)
 else:
     result = {"success": False, "code": "fresenius_agreement_price", "message": "客户【1071246】商品【14184540】存在效期冲突"}
+    result["api_time"] = api_time
     # 获取预期结果
     check_dict = commonFuc().get_business_data(module, "checkDict180")
     # 断言实际结果中是否包含预期结果的内容

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

@@ -15,8 +15,8 @@ import json
 module = "cmdc_special_fresenius_group"
 # 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
-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)
@@ -36,8 +36,8 @@ group_price = result["data"]["list"][0]["groupPrice"]
 # print(product_code)
 # 第三步登录多采商城获取token信息
 # 获取登录所需账号密码
-username = commonFuc().get_business_data(module, "username")
-password = commonFuc().get_business_data(module, "password")
+username = commonFuc().get_business_data(module, "username4")
+password = commonFuc().get_business_data(module, "password4")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcMaiiLogin(username, password).get_token()
 headers = commonFuc().get_business_data(module, "json_headers1", cmdc_access_token)
@@ -60,10 +60,13 @@ request_body = commonFuc().get_business_data(module, "payload47", product_code,
 
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)
+# 获取接口响应时间
+api_time = float(result.elapsed.total_seconds())
 result = json.loads(result.content)
 # print(result)
 # 获取商品详情页中套包正价信息
 result = {"groupPrice": result["data"][1]["groupPrice"], "documentNo": result["data"][1]["documentNo"]}
+result["api_time"] = api_time
 # print(result)
 # # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict48", group_price, document_no)