1、补充用例场景

2、参数化优化

air_case/cmdc_demand_delete/删除不存在的需求单.air/删除不存在的需求单.py

@@ -10,6 +10,7 @@ from common.common_func import commonFuc
 from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
 import requests
 import json
+import random
 
 
 module = "cmdc_demand_delete"
@@ -23,9 +24,11 @@ password = commonFuc().get_business_data(module, "password")
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 # cmdc_access_token = CmdcDoLogin("admin2", "FFtmods@365y").get_token()
 print(cmdc_access_token)
-headers = commonFuc().get_business_data(module, "json_headers1",cmdc_access_token)
+headers = commonFuc().get_business_data(module, "json_headers1", cmdc_access_token)
 print(headers)
-request_body = commonFuc().get_business_data(module, "payload2")
+# 随机生成不存在的需求单id
+demand_id = random.randint(10000000000000, 1000000000000000)
+request_body = commonFuc().get_business_data(module, "payload2", demand_id)
 print(request_body)
 """
  场景:删除不存在的需求单

air_case/cmdc_demand_delete/删除其他状态下需求单.air/删除其他状态下需求单.py

+# -*- encoding=utf8 -*-
+__author__ = "liguangyu"
+
+"""
+case_tag:api,cmdc删除其他状态下的需求单,2250,2250-5,sit,bs
+主数据平台:运营后台管理系统需求单删除接口
+"""
+
+from common.common_func import commonFuc
+from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
+import requests
+import json
+
+
+module = "cmdc_demand_delete"
+
+
+# 第一步登录后台运营平台获取cmdc_access_token
+# 获取登录所需账号密码
+username = commonFuc().get_business_data(module, "username")
+password = commonFuc().get_business_data(module, "password")
+# 获取登录后Cmdc_access_token
+cmdc_access_token = CmdcDoLogin(username, password).get_token()
+# cmdc_access_token = CmdcDoLogin("admin2", "FFtmods@365y").get_token()
+print(cmdc_access_token)
+headers = commonFuc().get_business_data(module, "json_headers1", cmdc_access_token)
+print(headers)
+
+# 第二步查询需求单列表中待审核的需求单
+url1 = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url1")
+print(url1)
+request_body = commonFuc().get_business_data(module, "payload40")
+print(request_body)
+# 发送请求
+result = requests.post(url1, json=request_body, headers=headers)
+result = json.loads(result.content)
+print(result)
+# 获取demandId
+demand_id = result["data"]["list"][0]["demandId"]
+print(demand_id)
+
+# 第三步删除操作
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url")
+print(url)
+request_body = commonFuc().get_business_data(module, "payload4", demand_id)
+print(request_body)
+"""
+ 场景:删除其他状态下的需求单
+ 用例名称：删除其他状态下的需求单
+ 输出：{"success":true,"code":"200","message":"OK","data":1,"freshToken":null}
+"""
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+result = json.loads(result.content)
+print(result)
+# 获取预期结果
+check_dict = commonFuc().get_business_data(module, "checkDict5")
+print(check_dict)
+# 断言实际结果中是否包含预期结果的内容
+commonFuc().check_result(check_dict, result)

air_case/cmdc_demand_delete/重复删除需求单.air/重复删除需求单.py

@@ -14,8 +14,8 @@ import json
 
 module = "cmdc_demand_delete"
 
-url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url")
-print(url)
+
+# 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
 username = commonFuc().get_business_data(module, "username")
 password = commonFuc().get_business_data(module, "password")
@@ -23,8 +23,32 @@ password = commonFuc().get_business_data(module, "password")
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 # cmdc_access_token = CmdcDoLogin("admin2", "FFtmods@365y").get_token()
 print(cmdc_access_token)
-headers = commonFuc().get_business_data(module, "json_headers1",cmdc_access_token)
+headers = commonFuc().get_business_data(module, "json_headers1", cmdc_access_token)
 print(headers)
+
+# 第二步查询需求单列表中待审核的需求单
+url1 = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url1")
+print(url1)
+request_body = commonFuc().get_business_data(module, "payload10")
+print(request_body)
+# 发送请求
+result = requests.post(url1, json=request_body, headers=headers)
+result = json.loads(result.content)
+print(result)
+# 获取demandId
+demand_id = result["data"]["list"][0]["demandId"]
+print(demand_id)
+# 第三步删除操作
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url")
+print(url)
+request_body = commonFuc().get_business_data(module, "payload1", demand_id)
+print(request_body)
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+
+# 第四步重复进行删除操作
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url")
+print(url)
 request_body = commonFuc().get_business_data(module, "payload3")
 print(request_body)
 """

air_case/cmdc_demand_delete/需求单删除.air/需求单删除.py

@@ -14,8 +14,8 @@ import json
 
 module = "cmdc_demand_delete"
 
-url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url")
-print(url)
+
+# 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
 username = commonFuc().get_business_data(module, "username")
 password = commonFuc().get_business_data(module, "password")
@@ -23,9 +23,26 @@ password = commonFuc().get_business_data(module, "password")
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 # cmdc_access_token = CmdcDoLogin("admin2", "FFtmods@365y").get_token()
 print(cmdc_access_token)
-headers = commonFuc().get_business_data(module, "json_headers1",cmdc_access_token)
+headers = commonFuc().get_business_data(module, "json_headers1", cmdc_access_token)
 print(headers)
-request_body = commonFuc().get_business_data(module, "payload1")
+
+# 第二步查询需求单列表中待审核的需求单
+url1 = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url1")
+print(url1)
+request_body = commonFuc().get_business_data(module, "payload10")
+print(request_body)
+# 发送请求
+result = requests.post(url1, json=request_body, headers=headers)
+result = json.loads(result.content)
+print(result)
+# 获取demandId
+demand_id = result["data"]["list"][0]["demandId"]
+print(demand_id)
+
+# 第三步删除操作
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url")
+print(url)
+request_body = commonFuc().get_business_data(module, "payload1", demand_id)
 print(request_body)
 """
  场景:需求删除

air_case/cmdc_demand_fail/审核不存在的需求单.air/审核不存在的需求单.py

@@ -10,6 +10,7 @@ from common.common_func import commonFuc
 from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
 import requests
 import json
+import random
 
 
 module = "cmdc_demand_fail"
@@ -23,9 +24,11 @@ password = commonFuc().get_business_data(module, "password")
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 # cmdc_access_token = CmdcDoLogin("admin2", "FFtmods@365y").get_token()
 print(cmdc_access_token)
-headers = commonFuc().get_business_data(module, "json_headers1",cmdc_access_token)
+headers = commonFuc().get_business_data(module, "json_headers1", cmdc_access_token)
 print(headers)
-request_body = commonFuc().get_business_data(module, "payload3")
+# 随机生成不存在的需求单id
+demand_id = random.randint(100000000000, 100000000000000)
+request_body = commonFuc().get_business_data(module, "payload3", demand_id)
 print(request_body)
 """
  场景:审核不存在的需求单

air_case/cmdc_demand_fail/审核其他状态的需求单.air/审核其他状态的需求单.py

@@ -14,8 +14,8 @@ import json
 
 module = "cmdc_demand_fail"
 
-url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url")
-print(url)
+
+# 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
 username = commonFuc().get_business_data(module, "username")
 password = commonFuc().get_business_data(module, "password")
@@ -23,14 +23,30 @@ password = commonFuc().get_business_data(module, "password")
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 # cmdc_access_token = CmdcDoLogin("admin2", "FFtmods@365y").get_token()
 print(cmdc_access_token)
-headers = commonFuc().get_business_data(module, "json_headers1",cmdc_access_token)
+headers = commonFuc().get_business_data(module, "json_headers1", cmdc_access_token)
 print(headers)
-request_body = commonFuc().get_business_data(module, "payload4")
+
+# 第二步查询需求单列表中审核通过的需求单
+url1 = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url1")
+print(url1)
+request_body = commonFuc().get_business_data(module, "payload40")
+print(request_body)
+# 发送请求
+result = requests.post(url1, json=request_body, headers=headers)
+result = json.loads(result.content)
+print(result)
+# 获取demandId
+demand_id = result["data"]["list"][0]["demandId"]
+print(demand_id)
+# 第三步进行审核操作
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url")
+print(url)
+request_body = commonFuc().get_business_data(module, "payload4", demand_id)
 print(request_body)
 """
  场景:审核其他状态下的需求单
  用例名称：审核其他状态下的需求单
- 输出：{"success":true,"code":"200","message":"OK","data":1,"freshToken":"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySWQiOjIsInVzZXJOYW1lIjoiYWRtaW4yIiwidGltZSI6MTY5NDM5NDA0NjA3N30.JQgyXjLa5rH9XKIebln5rpPG4aasKNmVJbWA9UYu7PU"}
+ 输出：{"success":true,"code":"200","message":"OK","data":1}
 """
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)

air_case/cmdc_demand_fail/重复审核.air/重复审核.py

@@ -14,8 +14,8 @@ import json
 
 module = "cmdc_demand_fail"
 
-url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url")
-print(url)
+
+# 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
 username = commonFuc().get_business_data(module, "username")
 password = commonFuc().get_business_data(module, "password")
@@ -23,8 +23,33 @@ password = commonFuc().get_business_data(module, "password")
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 # cmdc_access_token = CmdcDoLogin("admin2", "FFtmods@365y").get_token()
 print(cmdc_access_token)
-headers = commonFuc().get_business_data(module, "json_headers1",cmdc_access_token)
+headers = commonFuc().get_business_data(module, "json_headers1", cmdc_access_token)
 print(headers)
+
+# 第二步查询需求单列表中待审核的需求单
+url1 = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url1")
+print(url1)
+request_body = commonFuc().get_business_data(module, "payload10")
+print(request_body)
+# 发送请求
+result = requests.post(url1, json=request_body, headers=headers)
+result = json.loads(result.content)
+print(result)
+# 获取demandId
+demand_id = result["data"]["list"][0]["demandId"]
+print(demand_id)
+
+# 第三步进行需求单审核拒绝操作
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url")
+print(url)
+request_body = commonFuc().get_business_data(module, "payload1", demand_id)
+print(request_body)
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+
+# 第四步进行需求单重复审核拒绝操作
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url")
+print(url)
 request_body = commonFuc().get_business_data(module, "payload2")
 print(request_body)
 """

air_case/cmdc_demand_fail/需求单审核不通过.air/需求单审核不通过.py

@@ -14,8 +14,7 @@ import json
 
 module = "cmdc_demand_fail"
 
-url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url")
-print(url)
+# 第一步登录后台运营平台获取cmdc_access_token
 # 获取登录所需账号密码
 username = commonFuc().get_business_data(module, "username")
 password = commonFuc().get_business_data(module, "password")
@@ -23,14 +22,31 @@ password = commonFuc().get_business_data(module, "password")
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 # cmdc_access_token = CmdcDoLogin("admin2", "FFtmods@365y").get_token()
 print(cmdc_access_token)
-headers = commonFuc().get_business_data(module, "json_headers1",cmdc_access_token)
+headers = commonFuc().get_business_data(module, "json_headers1", cmdc_access_token)
 print(headers)
-request_body = commonFuc().get_business_data(module, "payload1")
+
+# 第二步查询需求单列表中待审核的需求单
+url1 = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url1")
+print(url1)
+request_body = commonFuc().get_business_data(module, "payload10")
+print(request_body)
+# 发送请求
+result = requests.post(url1, json=request_body, headers=headers)
+result = json.loads(result.content)
+print(result)
+# 获取demandId
+demand_id = result["data"]["list"][0]["demandId"]
+print(demand_id)
+
+# 第三步进行需求单审核拒绝操作
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url")
+print(url)
+request_body = commonFuc().get_business_data(module, "payload1", demand_id)
 print(request_body)
 """
  场景:需求单审核不通过
  用例名称：需求单审核不通过
- 输出：{"success":true,"code":"200","message":"OK","data":1,"freshToken":null}
+ 输出：{"success":true,"code":"200","message":"OK","data":1}
 """
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)

air_case/cmdc_demand_list/获取需求单列表.air/获取需求单列表.py

@@ -22,7 +22,7 @@ password = commonFuc().get_business_data(module, "password")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcDoLogin(username, password).get_token()
 print(cmdc_access_token)
-headers = commonFuc().get_business_data(module, "json_headers1",cmdc_access_token)
+headers = commonFuc().get_business_data(module, "json_headers1", cmdc_access_token)
 print(headers)
 request_body = commonFuc().get_business_data(module, "payload1")
 print(request_body)

air_case/cmdc_demand_list/需求单-草稿订单删除-逆向.air/需求单-草稿订单删除-逆向.py

@@ -14,8 +14,7 @@ import json
 
 module = "cmdc_demand_list"
 
-url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url")
-print(url)
+# 第一步：登录后台运营系统
 # 获取登录所需账号密码
 username = commonFuc().get_business_data(module, "username")
 password = commonFuc().get_business_data(module, "password")
@@ -24,12 +23,36 @@ cmdc_access_token = CmdcDoLogin(username, password).get_token()
 print(cmdc_access_token)
 headers = commonFuc().get_business_data(module, "json_headers2", cmdc_access_token)
 print(headers)
-request_body = commonFuc().get_business_data(module, "payload3")
+# 第二步，获取需求单列表
+url1 = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url1")
+print(url1)
+request_body = commonFuc().get_business_data(module, "payload20")
+print(request_body)
+# 发送请求
+result = requests.post(url1, json=request_body, headers=headers)
+result = json.loads(result.content)
+print(result)
+# 获取demandId
+demand_id = result["data"]["list"][0]["demandId"]
+print(demand_id)
+# 第三步，获取到demandId进行需求单删除操作
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url")
+print(url)
+request_body = commonFuc().get_business_data(module, "payload2", demand_id)
+print(request_body)
+# 发送请求
+result = requests.get(url, params=request_body, headers=headers)
+
+# 第三步，获取到demandId进行需求单重复删除操作
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url")
+print(url)
+request_body = commonFuc().get_business_data(module, "payload3", demand_id)
 print(request_body)
 """
  场景:不可重复删除已保存订单状态下需求单，以及其他状态的需求单
  用例名称：需求草稿订单删除逆向功能验证
  输出：{"success":true,"code":"200","message":"OK","data":null}
+ 备注：目前接口层未进行校验重复删除
 """
 # 发送请求
 result = requests.get(url, params=request_body, headers=headers)

air_case/cmdc_demand_list/需求单-草稿订单删除.air/需求单-草稿订单删除.py

@@ -14,8 +14,7 @@ import json
 
 module = "cmdc_demand_list"
 
-url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url")
-print(url)
+# 第一步：登录后台运营系统
 # 获取登录所需账号密码
 username = commonFuc().get_business_data(module, "username")
 password = commonFuc().get_business_data(module, "password")
@@ -24,7 +23,22 @@ cmdc_access_token = CmdcDoLogin(username, password).get_token()
 print(cmdc_access_token)
 headers = commonFuc().get_business_data(module, "json_headers2", cmdc_access_token)
 print(headers)
-request_body = commonFuc().get_business_data(module, "payload2")
+# 第二步，获取需求单列表
+url1 = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url1")
+print(url1)
+request_body = commonFuc().get_business_data(module, "payload20")
+print(request_body)
+# 发送请求
+result = requests.post(url1, json=request_body, headers=headers)
+result = json.loads(result.content)
+print(result)
+# 获取demandId
+demand_id = result["data"]["list"][0]["demandId"]
+print(demand_id)
+# 第三步，获取到demandId进行需求单删除操作
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url")
+print(url)
+request_body = commonFuc().get_business_data(module, "payload2", demand_id)
 print(request_body)
 """
  场景:需求草稿订单可正常删除，删除后不再显示在需求列表中

air_case/cmdc_demand_list_pc/需求单删除操作.air/需求单删除操作.py

@@ -14,17 +14,29 @@ import json
 
 module = "cmdc_demand_list_pc"
 
-url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url3")
-print(url)
 # 获取登录所需账号密码
 username = commonFuc().get_business_data(module, "username")
 password = commonFuc().get_business_data(module, "password")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcMaiiLogin(username, password).get_token()
 print(cmdc_access_token)
-headers = commonFuc().get_business_data(module, "json_headers3", cmdc_access_token)
+headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
 print(headers)
-request_body = commonFuc().get_business_data(module, "payload3")
+# 获取需求单列表
+url1 = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url1")
+print(url1)
+request_body = commonFuc().get_business_data(module, "payload30")
+print(request_body)
+# 发送请求
+result = requests.post(url1, json=request_body, headers=headers)
+result = json.loads(result.content)
+print(result)
+demand_parent_id = result["data"]["list"][0]["demandParentId"]
+print(demand_parent_id)
+
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url3")
+print(url)
+request_body = commonFuc().get_business_data(module, "payload3", demand_parent_id)
 print(request_body)
 """
  场景:需求草稿订单可正常删除，删除后不再显示在需求列表中

air_case/cmdc_demand_list_pc/需求单取消操作.air/需求单取消操作.py

@@ -14,18 +14,29 @@ import json
 
 module = "cmdc_demand_list_pc"
 
-
-url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url2")
-print(url)
 # 获取登录所需账号密码
 username = commonFuc().get_business_data(module, "username")
 password = commonFuc().get_business_data(module, "password")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcMaiiLogin(username, password).get_token()
 print(cmdc_access_token)
-headers = commonFuc().get_business_data(module, "json_headers2",cmdc_access_token)
+headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
 print(headers)
-request_body = commonFuc().get_business_data(module, "payload2")
+# 获取需求单列表
+url1 = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url1")
+print(url1)
+request_body = commonFuc().get_business_data(module, "payload20")
+print(request_body)
+# 发送请求
+result = requests.post(url1, json=request_body, headers=headers)
+result = json.loads(result.content)
+print(result)
+demand_code = result["data"]["list"][0]["demandCode"]
+print(demand_code)
+
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url2")
+print(url)
+request_body = commonFuc().get_business_data(module, "payload2", demand_code)
 print(request_body)
 """
  场景:在用户对应的多彩商城中的需求单列表进行需求单取消操作验证

air_case/cmdc_frequent_purchase/新增不存在的商品至常购清单列表.air/新增不存在的商品至常购清单列表.py

@@ -10,6 +10,7 @@ from common.common_func import commonFuc
 from air_case.cmdc_login.多彩商城登录.多彩商城登录 import CmdcMaiiLogin
 import requests
 import json
+import random
 
 
 module = "cmdc_frequent_purchase"
@@ -25,7 +26,9 @@ cmdc_access_token = CmdcMaiiLogin(username, password).get_token()
 print(cmdc_access_token)
 headers = commonFuc().get_business_data(module, "json_headers4", cmdc_access_token)
 print(headers)
-request_body = commonFuc().get_business_data(module, "payload4")
+product_id = random.randint(1000000000000, 100000000000000)
+print(product_id)
+request_body = commonFuc().get_business_data(module, "payload4", product_id)
 print(request_body)
 """
  场景:新增不存在的商品至常购清单列表

data/cmdc_demand_delete/data

-#需求单列表接口地址
+#需求单删除接口地址
 "url": "/order/back/refuseDemand"
 
+#需求单列表接口地址
+"url1": "/order/back/listDemand"
+
 # 后台运营管理系统登录信息
 "username": "admin2"
 "password": "Aa123456"
@@ -12,17 +15,27 @@ json_headers1: {
 
 
 #测试场景一：需求正常单删除
-
-"payload1": {"demandId":41472,"auditStatus":0,"auditRemark":"#待国药审核#"}
+#查询待首营状态的需求单
+"payload10": {"times":[null],"listOrderStatus":["99"],"productName":null,"demandCode":null,"demandParentCode":null,"customerName":"测试公司8897","manufacturer":null,"materialCode":null,"sellerCompanyName":null,"produceRegisterNum":null,"productLineName":null,"auditByName":null,"orderSource":null,"changeTypeList":null,"isRebateEdit":null,"jdeType":null,"pageSize":8,"pageStart":1,"orderChangeType":null,"snSgin":null,"changeSign":null,"customerCode":null,"distributionType":null,"busCustomerCode":null,"loginName":null,"cancelSign":0,"shipmentType":null,"startTime":null,"itemStart":0}
+#点击删除图标，进行待首营状态下需求单删除操作请求报文
+"payload1": {"demandId":"%d","auditStatus":2,"auditRemark":"#未首营平台取消#"}
 #预期结果
 checkDict2: {"success":true,"code":"200","message":"OK","data":1,"freshToken":null}
 
 #测试场景二：删除不存在的需求单
-"payload2": {"demandId":41506345345,"auditStatus":1,"auditRemark":"#待国药审核#"}
+"payload2": {"demandId":"%d","auditStatus":2,"auditRemark":"#待国药审核#"}
 #预期结果
 "checkDict3": {"success":false,"code":"demand","message":"审核拒绝没有找到子需求单","data":null,"freshToken":null}
 
 #测试场景三：重复删除已被删除的需求单
-"payload3": {"demandId":11151,"auditStatus":2,"auditRemark":"#未首营平台取消#"}
+"payload3": {"demandId":"%d","auditStatus":2,"auditRemark":"#未首营平台取消#"}
 #预期结果
 "checkDict4": {"success":false,"code":"demand","message":"订单已拒绝，无法重复拒绝","data":null,"freshToken":null}
+
+#测试场景四：删除其他状态的需求单
+#查询审核通过状态的需求单
+"payload40": {"times":[null],"listOrderStatus":["1021"],"productName":null,"demandCode":null,"demandParentCode":null,"customerName":null,"manufacturer":null,"materialCode":null,"sellerCompanyName":null,"produceRegisterNum":null,"productLineName":null,"auditByName":null,"orderSource":null,"changeTypeList":null,"isRebateEdit":null,"jdeType":null,"pageSize":8,"pageStart":1,"orderChangeType":null,"snSgin":null,"changeSign":null,"customerCode":null,"distributionType":null,"busCustomerCode":null,"loginName":null,"cancelSign":0,"shipmentType":null,"startTime":null,"itemStart":0}
+
+"payload4": {"demandId":"%d","auditStatus":2,"auditRemark":""}
+#预期结果
+"checkDict5": {"success":true,"code":"200","message":"OK","data":1,"freshToken":null}
\ No newline at end of file

data/cmdc_demand_fail/data

-#需求单列表接口地址
+#需求单拒绝接口地址
 "url": "/order/back/refuseDemand"
+#需求列表接口地址
+"url1": "/order/back/listDemand"
 
 # 后台运营管理系统登录信息
 "username": "admin2"
@@ -12,22 +14,28 @@ json_headers1: {
 
 
 #测试场景一：需求正常单审核拒绝
-
-"payload1": {"demandId":41512,"auditStatus":2,"auditRemark":"审核拒绝原因"}
+#获取需求单列表中待审核的需求单请求报文
+"payload10": {"times":[null],"listOrderStatus":["102"],"productName":null,"demandCode":null,"demandParentCode":null,"customerName":null,"manufacturer":null,"materialCode":null,"sellerCompanyName":null,"produceRegisterNum":null,"productLineName":null,"auditByName":null,"orderSource":null,"changeTypeList":null,"isRebateEdit":null,"jdeType":null,"pageSize":8,"pageStart":1,"orderChangeType":null,"snSgin":null,"changeSign":null,"customerCode":null,"distributionType":null,"busCustomerCode":null,"loginName":null,"cancelSign":0,"shipmentType":null,"startTime":null}
+#审核拒绝的请求报文
+"payload1": {"demandId":"%d","auditStatus":2,"auditRemark":"审核拒绝原因"}
 #预期结果
-checkDict1: {"success":true,"code":"200","message":"OK","data":1,"freshToken":"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySWQiOjIsInVzZXJOYW1lIjoiYWRtaW4yIiwidGltZSI6MTY5NDM5NDA0NjA3N30.JQgyXjLa5rH9XKIebln5rpPG4aasKNmVJbWA9UYu7PU"}
+checkDict1: {"success":true,"code":"200","message":"OK","data":1}
+
 
 #测试场景二：重复拒绝同一个需求单
-"payload2": {"demandId":41512,"auditStatus":2,"auditRemark":"审核拒绝原因"}
+"payload2": {"demandId":"%d","auditStatus":2,"auditRemark":"审核拒绝原因"}
 #预期结果
 "checkDict2": {"success":false,"code":"demand","message":"订单已拒绝，无法重复拒绝","data":null,"freshToken":null}
 
 #测试场景三：审核拒绝不存在的需求单
-"payload3": {"demandId":111513453535,"auditStatus":2,"auditRemark":"#未首营平台取消#"}
+"payload3": {"demandId":"%s","auditStatus":2,"auditRemark":"#未首营平台取消#"}
 #预期结果
 "checkDict3": {"success":false,"code":"demand","message":"审核拒绝没有找到子需求单","data":null,"freshToken":null}
 
 #测试场景四：审核拒绝其他状态下的需求单，例如，审核通过的需求单
-"payload4": {"demandId":41512,"auditStatus":2,"auditRemark":"审核拒绝原因"}
+#获取需求单列表中审核通过的需求单请求报文
+"payload40": {"times":[null],"listOrderStatus":["1021"],"productName":null,"demandCode":null,"demandParentCode":null,"customerName":null,"manufacturer":null,"materialCode":null,"sellerCompanyName":null,"produceRegisterNum":null,"productLineName":null,"auditByName":null,"orderSource":null,"changeTypeList":null,"isRebateEdit":null,"jdeType":null,"pageSize":8,"pageStart":1,"orderChangeType":null,"snSgin":null,"changeSign":null,"customerCode":null,"distributionType":null,"busCustomerCode":null,"loginName":null,"cancelSign":0,"shipmentType":null,"startTime":null}
+#审核的请求报文
+"payload4": {"demandId":"%d","auditStatus":2,"auditRemark":"审核拒绝原因"}
 #预期结果
-"checkDict4": {"success":true,"code":"200","message":"OK","data":1,"freshToken":"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySWQiOjIsInVzZXJOYW1lIjoiYWRtaW4yIiwidGltZSI6MTY5NDM5NDA0NjA3N30.JQgyXjLa5rH9XKIebln5rpPG4aasKNmVJbWA9UYu7PU"}
+"checkDict4": {"success":true,"code":"200","message":"OK","data":1}

data/cmdc_demand_list/data

@@ -13,6 +13,7 @@ checkDict1: {"code":"401","message":"Unauthorized","success":false}
 "username": "admin2"
 "password": "Aa123456"
 
+#获取后台运营平台需求单列表
 json_headers1: {
   "Content-Type": "application/json",
   "Cmdc_access_token": "%s"
@@ -28,11 +29,15 @@ json_headers2: {
 }
 
 #测试场景一：删除已保存订单状态的需求单
-"payload2": {"demandId": "6585"}
+#查询需求单列表中状态为已保存订单的需求单请求报文
+"payload20": {"times":[null],"listOrderStatus":["302"],"productName":null,"demandCode":null,"demandParentCode":null,"customerName":null,"manufacturer":null,"materialCode":null,"sellerCompanyName":null,"produceRegisterNum":null,"productLineName":null,"auditByName":null,"orderSource":null,"changeTypeList":null,"isRebateEdit":null,"jdeType":null,"pageSize":8,"pageStart":1,"orderChangeType":null,"snSgin":null,"changeSign":null,"customerCode":null,"distributionType":null,"busCustomerCode":null,"loginName":null,"cancelSign":0,"shipmentType":null,"startTime":null}
+#删除需求单请求报文
+"payload2": {"demandId": "%d"}
 #预期结果
 "checkDict3": {'success': True, 'code': '200', 'message': 'OK', 'data': None, 'freshToken': None}
 
+
 #测试场景二：重复删除已保存订单状态的需求单或删除其他状态下需求单
-"payload3": {"demandId": "11095"}
+"payload3": {"demandId": "%d"}
 #预期结果
 "checkDict4": {'success': True, 'code': '200', 'message': 'OK', 'data': None, 'freshToken': None}

data/cmdc_demand_list_pc/data

@@ -2,6 +2,11 @@
 "username": "Test001"
 "password": "Aa123456"
 
+json_headers: {
+  "Cmdc_access_token": "%s",
+  "Sourcetype": "mall"
+}
+
 
 #需求单列表接口地址
 "url1": "/order/public/ownListDemand"
@@ -26,8 +31,9 @@ json_headers2: {
   "Cmdc_access_token": "%s",
   "Sourcetype": "mall"
 }
-
-"payload2": {"demandCode":"16936462668632521","remark":"123"}
+#获取草稿需求单列表请求报文
+"payload20": {"sellerCompanyCodes":[],"materialCode":"","productCode":"","productInfoValue":"","manufacturerList":null,"orderNum":"","paymentType":null,"preferenceType":null,"changeSign":null,"mainOrderStatus":2,"shipmentType":null,"pageStart":1,"pageSize":10}
+"payload2": {"demandCode":"%s","remark":"取消原因测试"}
 #预期结果
 checkDict2: {"success":true,"code":"200","message":"OK","data":1,"freshToken":null}
 
@@ -40,8 +46,9 @@ json_headers3: {
   "Cmdc_access_token": "%s",
   "Sourcetype": "mall"
 }
-
-"payload3": {"demandParentId":"6297"}
+#获取草稿需求单列表请求报文
+"payload30": {"sellerCompanyCodes":[],"materialCode":"","productCode":"","productInfoValue":"","manufacturerList":null,"orderNum":"","paymentType":null,"preferenceType":null,"changeSign":null,"mainOrderStatus":8,"shipmentType":null,"pageStart":1,"pageSize":10}
+"payload3": {"demandParentId":"%d"}
 #预期结果
 checkDict3: {"success":true,"code":"200","message":"OK","data":null,"freshToken":null}
 

data/cmdc_frequent_purchase/data

@@ -36,7 +36,7 @@ json_headers4: {
   "Sourcetype": "mall"
 }
 
-"payload4": {"currentCompanyId":2,"productId":"954647456754764","quantity":1,"agreementPriceId":0,"price":68.88}
+"payload4": {"currentCompanyId":null,"productId":"%d","quantity":1,"agreementPriceId":0,"price":68.88}
 #预期结果
 checkDict4: {"success":false,"code":"1078","message":"该商品不存在，加入购物车失败","data":null,"freshToken":null}