Merge branch 'master' into 'main'

Master|需求单模块归档合并

See merge request !4

air_case/cmdc_userinfo_query/用户信息查询.air/用户信息查询.py

@@ -15,14 +15,15 @@ import json
 module = "cmdc_userinfo_query"
 
 
-url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url1")
-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()
 headers = commonFuc().get_business_data(module, "json_headers", cmdc_access_token)
+
+# 进行用户信息查询
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url1")
 request_body = commonFuc().get_business_data(module, "payload1")
 
 """

air_case/cmdc_website/站点切换.air/站点切换.py

@@ -15,7 +15,6 @@ import json
 module = "cmdc_website"
 
 
-url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url2")
 # print(url)
 # 获取登录所需账号密码
 username = commonFuc().get_business_data(module, "username1")
@@ -23,6 +22,9 @@ password = commonFuc().get_business_data(module, "password1")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcMaiiLogin(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, "url2")
 request_body = commonFuc().get_business_data(module, "payload2")
 
 """

air_case/cmdc_website/获取站点信息.air/获取站点信息.py

@@ -15,7 +15,6 @@ import json
 module = "cmdc_website"
 
 
-url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url1")
 # print(url)
 # 获取登录所需账号密码
 username = commonFuc().get_business_data(module, "username")
@@ -23,6 +22,9 @@ password = commonFuc().get_business_data(module, "password")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcMaiiLogin(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, "url1")
 request_body = commonFuc().get_business_data(module, "payload1")
 
 """

air_case/cmdc_website/获取站点商品.air/获取站点商品.py

@@ -21,6 +21,7 @@ password = commonFuc().get_business_data(module, "password1")
 # 获取登录后Cmdc_access_token
 cmdc_access_token = CmdcMaiiLogin(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, "url2")
 request_body = commonFuc().get_business_data(module, "payload2")

data/cmdc_fresenius_group/data

@@ -130,7 +130,7 @@ checkDict15: {"success":false,"code":"FRESENIUS_GROUP_ERROR","message":"组成
 #预期结果
 checkDict16: {"success":false,"code":"FRESENIUS_GROUP_ERROR","message":"组成一个套包内商品需满足套包在同一产品线下","data":null,"freshToken":null}
 "other_product": {"productCode":"10057881","productName":"造口护理用品附件","manufacturer":"Coloplast A/S","manufacturerCode":"7000118","optionStr":"12070","storageCondition":"999","activityUnitAmount":null,"price":15.2,"measuringUnit":"个","materialCode":"","description":"","quantity":"1","manufacturerProductNo":null,"manufacturerProductDesc":null,"produceRegisterNum":"国械注进20152664141","productLineName":"康乐保","productLineCode":"3111"}
-
+checkDict16_1: {"success":true,"code":"200","message":"OK","data":true}
 
 #测试场景十七：套包更新验证
 

data/cmdc_purchase_list/data

-#采购单查询接口
-"url": "/order/purchase/list"
-
-
 # 后台运营管理系统登录信息
 "username": "Admin00111"
 "password": "Aa123456"
@@ -10,6 +6,9 @@ json_headers1: {
   "Content-Type": "application/json",
   "Cmdc_access_token": "%s"
 }
+
+#采购单查询接口
+"url": "/order/purchase/list"
 "payload1": {"billNo":"","billStatusList":[],"creator":"","demandNo":"","startTime":"","endTime":"","times":null,"status":null,"pageNumber":1,"pageSize":8}
 #预期结果
 checkDict2: {"success":true,"code":"200","message":null}

data/cmdc_special_fresenius_group/data

@@ -175,6 +175,7 @@ checkDict19: {"groupPriceStatus": 0}
 #预期结果
 checkDict20: {"success":true,"code":"200","message":"OK"}
 checkDict20_1: {"success":false,"code":"FRESENIUS_GROUP_ERROR","message":"本次新增组内商品编码已存在于其他组里，请核对已建立的组","data":null,"freshToken":null}
+checkDict20_2: {"success":false,"code":"fresenius_agreement_price","message":"该套包面向该客户已存在套包正价记录，无需重复添加！","data":null,"freshToken":null}
 
 
 #测试场景：新老编码组停用
@@ -301,6 +302,7 @@ checkDict47: {"groupPrice":"%s","groupName":"%s"}
 checkDict48: {"groupPrice":"%s","documentNo":"%s"}
 #查询指定套包协议特价信息
 "payload49": {"groupCode":"","groupName":"","productCode":"","productInfo":"","materialCode":"","manufacturerList":[],"productLineName":"","description":"","manufacturerProductDesc":"","manufacturerProductNo":"","customerCode":"","customerName":"","manufacturerUserNo":"","manufacturerUserDesc":"","documentNo":"协议套包","companyCode":"","groupType":0,"status":null,"pageStart":1,"pageSize":8}
+"payload49_1": {"groupCode":"","groupName":"","productCode":"","productInfo":"","materialCode":"","manufacturerList":[],"productLineName":"","description":"","manufacturerProductDesc":"","manufacturerProductNo":"","customerCode":"","customerName":"","manufacturerUserNo":"","manufacturerUserDesc":"","documentNo":"套包协议特价商品显示验证","companyCode":"","groupType":0,"status":null,"pageStart":1,"pageSize":8}
 
 
 #测试场景：代客下单_套包清单_查询条件验证

log/runtime.txt

-查询赠品	1695341383430	1695341383724	liguangyu
-查询失效商品	1695341384600	1695341384617	liguangyu
-查询控销商品	1695341384633	1695341384651	liguangyu
-查询已上架商品	1695341384667	1695341384689	liguangyu
-需求单_获取用户信息失败	1695341384705	1695341385259	liguangyu
-需求单-草稿订单删除	1695341385277	1695341387469	liguangyu
-获取需求单列表	1695341387487	1695341389446	liguangyu
-需求单-草稿订单删除-逆向	1695341389468	1695341391342	liguangyu
-需求单删除	1695341391362	1695341392901	liguangyu
-重复删除需求单	1695341392919	1695341394639	liguangyu
-删除其他状态下需求单	1695341394659	1695341396211	liguangyu
-删除不存在的需求单	1695341396229	1695341397377	liguangyu
-需求单审核通过_代客下单	1695341397397	1695341404105	liguangyu
-需求单审核通过_快速下单	1695341404119	1695341412518	liguangyu
-需求单创建	1695341412538	1695341414487	liguangyu
-需求草稿订单创建	1695341414505	1695341416671	liguangyu
-新增赠品_控销_商品至常购清单列表	1695341416690	1695341418596	liguangyu
-新增不存在的商品至常购清单列表	1695341418615	1695341419290	liguangyu
-新增赠品至常购清单列表	1695341419306	1695341421315	liguangyu
-获取用户常购清单列表	1695341421332	1695341425024	liguangyu
-常购清单列表商品移除	1695341425048	1695341428888	liguangyu
-新增JDE已停用的商品至常购清单列表	1695341428904	1695341430797	liguangyu
-新增控销商品至常购清单列表	1695341430813	1695341432656	liguangyu
-添加跨站点商品至常购清单列表	1695341432673	1695341433626	liguangyu
-新增商品至常购清单列表	1695341433646	1695341435762	liguangyu
-新增已失效商品至常购清单列表	1695341435783	1695341437875	liguangyu
-客户查询	1695341437892	1695341439033	liguangyu
-审核不存在的需求单	1695341439053	1695341440000	liguangyu
-重复审核	1695341440016	1695341442815	liguangyu
-审核其他状态的需求单	1695341442838	1695341444398	liguangyu
-需求单审核不通过	1695341444418	1695341445828	liguangyu
-需求单创建	1695341445842	1695341448060	liguangyu
-需求单删除操作	1695341448077	1695341449480	liguangyu
-获取需求单列表	1695341449498	1695341454095	liguangyu
-需求单取消操作	1695341454118	1695341455477	liguangyu
-新增跨站点商品至购物车	1695341455494	1695341457125	liguangyu
-新增已控销商品至购物车列表	1695341457144	1695341459274	liguangyu
-购物车新增商品	1695341459290	1695341461465	liguangyu
-添加JDE已停用的商品至购物车列表	1695341461484	1695341463728	liguangyu
-购物车数量修改验证	1695341463749	1695341466697	liguangyu
-购物车商品移除	1695341466715	1695341468735	liguangyu
-新增赠品至购物车	1695341468755	1695341469929	liguangyu
-新增不存在商品至购物车列表	1695341469952	1695341470828	liguangyu
-获取购物车列表	1695341470846	1695341472525	liguangyu
-新增已失效商品至购物车列表	1695341472545	1695341474619	liguangyu
-新增赠品_控销_商品至购物车	1695341474635	1695341476709	liguangyu
-用户信息查询	1695341476728	1695341477685	liguangyu
-商品列表_快速下单	1695341477706	1695341479429	liguangyu
-商品列表_代客下单	1695341479449	1695341481128	liguangyu
-获取客户列表	1695341481149	1695341482426	liguangyu
-采购单查询	1695341482446	1695341483593	liguangyu
-快速下单权限_否	1695341483614	1695341484605	liguangyu
-快速下单权限_能	1695341484623	1695341485617	liguangyu
-获取站点信息	1695341485636	1695341486392	liguangyu
-站点切换	1695341486412	1695341487156	liguangyu
+商品下架拦截验证_订单修改	1702431554548	1702431564240	liguangyu