优化

air_case/cmdc_order_list/勾选合并_jde配货管理.air/勾选合并_jde配货管理.py

@@ -15,8 +15,8 @@ import json
 module = "cmdc_order_list"
 
 # 第一步登录后台运营系统获取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)

air_case/cmdc_order_list/合并已推送配货单校验验证_jde配货管理.air/合并已推送配货单校验验证_jde配货管理.py

@@ -15,8 +15,8 @@ import json
 module = "cmdc_order_list"
 
 # 第一步登录后台运营系统获取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)
@@ -51,6 +51,7 @@ result = requests.get(url, params=request_body, headers=headers)
 api_time = float(result.elapsed.total_seconds())
 
 result = json.loads(result.content)
+# print(result)
 # 将接口响应时间添加至result
 result["api_time"] = api_time
 

air_case/cmdc_order_list/手机号查询验证_收货地址列表_代客下单.air/手机号查询验证_收货地址列表_代客下单.py

@@ -15,8 +15,8 @@ import json
 module = "cmdc_order_list"
 
 # 第一步登录后台运营系统获取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)
@@ -32,7 +32,7 @@ result = json.loads(result.content)
 customer_random = random.randint(0, len(result["data"]["list"]) - 1)
 # 获取客户信息
 user_id = result["data"]["list"][customer_random]["userId"]
-company_id = "6"
+company_id = "7"
 
 # 第三步获取收货地址列表
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url37")
@@ -40,6 +40,7 @@ request_body = commonFuc().get_business_data(module, "payload37", company_id, us
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
+# print(result)
 # 判断地址是否存在
 if result["data"]["addresses"]["list"]:
     # 获取收货人手机号

air_case/cmdc_order_list/推送功能验证_jde配货.air/推送功能验证_jde配货.py

@@ -15,8 +15,8 @@ import json
 module = "cmdc_order_list"
 
 # 第一步登录后台运营系统获取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)

air_case/cmdc_order_list/推送已推送成功的jde配货单拦截验证.air/推送已推送成功的jde配货单拦截验证.py

@@ -15,8 +15,8 @@ import json
 module = "cmdc_order_list"
 
 # 第一步登录后台运营系统获取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)

air_case/cmdc_order_list/收件人查询验证_收货地址列表_代客下单.air/收件人查询验证_收货地址列表_代客下单.py

@@ -15,8 +15,8 @@ import json
 module = "cmdc_order_list"
 
 # 第一步登录后台运营系统获取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)
@@ -32,7 +32,7 @@ result = json.loads(result.content)
 customer_random = random.randint(0, len(result["data"]["list"]) - 1)
 # 获取客户信息
 user_id = result["data"]["list"][customer_random]["userId"]
-company_id = "6"
+company_id = "7"
 
 # 第三步获取收货地址列表
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url37")

air_case/cmdc_order_list/查询条件验证_jde配货列表.air/查询条件验证_jde配货列表.py

@@ -15,8 +15,8 @@ import json
 module = "cmdc_order_list"
 
 # 第一步登录后台运营系统获取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)

air_case/cmdc_order_list/查询条件验证_采购单列表.air/查询条件验证_采购单列表.py

@@ -16,8 +16,8 @@ import json
 module = "cmdc_order_list"
 
 # 第一步登录后台运营系统获取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)

air_case/cmdc_order_list/根据推送单号获取配货单信息.air/根据推送单号获取配货单信息.py

@@ -15,8 +15,8 @@ import json
 module = "cmdc_order_list"
 
 # 第一步登录后台运营系统获取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)

air_case/cmdc_order_list/获取jde配货单信息.air/获取jde配货单信息.py

@@ -15,8 +15,8 @@ import json
 module = "cmdc_order_list"
 
 # 第一步登录后台运营系统获取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)

air_case/cmdc_order_list/获取收货地址列表_代客下单.air/获取收货地址列表_代客下单.py

@@ -16,8 +16,8 @@ import json
 module = "cmdc_order_list"
 
 # 第一步登录后台运营系统获取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)
@@ -33,7 +33,7 @@ result = json.loads(result.content)
 customer_random = random.randint(0, len(result["data"]["list"]) - 1)
 # 获取客户信息
 user_id = result["data"]["list"][customer_random]["userId"]
-company_id = "6"
+company_id = "7"
 
 # 第三步获取收货地址列表
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url37")

air_case/cmdc_order_list/获取订单信息_jde配货合并页面.air/获取订单信息_jde配货合并页面.py

@@ -15,8 +15,8 @@ import json
 module = "cmdc_order_list"
 
 # 第一步登录后台运营系统获取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)

air_case/cmdc_order_list/获取配货单合并详情.air/获取配货单合并详情.py

@@ -15,8 +15,8 @@ import json
 module = "cmdc_order_list"
 
 # 第一步登录后台运营系统获取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)

air_case/cmdc_order_list/获取需求单列表_后台运营系统.air/获取需求单列表_后台运营系统.py

@@ -52,7 +52,7 @@ host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
 # 查询数据库中需求单数量
 sql = "SELECT count(t.demandId) FROM `cmdc-order`.tc_demand t " \
       "WHERE deleteSign = 0 and sellerCompanyCode = 00111 and paymentType is not null"
-total = int(mysql_handle.selectSql(host, port, user, pwd, "cmdc-user", sql)[0][0]) - 1
+total = int(mysql_handle.selectSql(host, port, user, pwd, "cmdc-user", sql)[0][0])
 
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict1", total)

air_case/cmdc_order_list/详细地址查询验证_收货地址列表_代客下单.air/详细地址查询验证_收货地址列表_代客下单.py

@@ -15,8 +15,8 @@ import json
 module = "cmdc_order_list"
 
 # 第一步登录后台运营系统获取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)
@@ -32,7 +32,7 @@ result = json.loads(result.content)
 customer_random = random.randint(0, len(result["data"]["list"]) - 1)
 # 获取客户信息
 user_id = result["data"]["list"][customer_random]["userId"]
-company_id = "6"
+company_id = "7"
 
 # 第三步获取收货地址列表
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url37")

air_case/cmdc_order_list/通过Excel添加无效商品_代客下单.air/通过Excel添加无效商品_代客下单.py

@@ -51,6 +51,7 @@ result = requests.post(url, json=request_body, headers=headers)
 api_time = float(result.elapsed.total_seconds())
 
 result = json.loads(result.content)
+# print(result)
 # 将接口响应时间添加至result
 result["api_time"] = api_time
 

air_case/cmdc_order_list/配货单导出_jde配货列表.air/配货单导出_jde配货列表.py

@@ -18,8 +18,8 @@ import os
 module = "cmdc_order_list"
 
 # 第一步登录后台运营系统获取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)