1、用例优化

2、环境调整至uat环境
3、新增商品活动相关用例

data/cmdc_commodity_activity/data

+# 多采商城登录信息
+"username": "BJ0621"
+"password": "Aa123456"
+
+#后台运营管理系统登录信息(子公司)
+"username1": "Admin00111"
+"password1": "Aa123456"
+
+#后台运营管理系统登录信息(总公司)
+"username2": "admin"
+"password2": "Aa123456"
+
+#后台管理系统headers
+json_headers: {
+  "Content-Type": "application/json",
+  "Cmdc_access_token": "%s"
+}
+
+#多采商城headers
+json_headers1: {
+  "Cmdc_access_token": "%s",
+  "Sourcetype": "mall"
+}
+
+#测试场景一：促销活动列表获取
+"url1": "/order/back/activityBasic/listBackActivity"
+"payload1": {"activityBasic":{"activityBasicId":"10127","activityName":"特价验证","activityStatus":102,"activityType":1},"activityDifferenceUser":{"customerCode":"","customerCompanyName":""},"activityProduct":{"productCode":"","materialCode":"","productLineCode":null,"specifications":""},"allowanceFlag":null,"pageSize":10,"pageStart":1,"startTime":null,"cStartTime":null,"endTime":null,"cEndTime":null,"pageNum":1}
+#预期结果
+checkDict1: {"success":true,"code":"200","message":"OK"}
+
+
+#测试场景二：获取活动基本信息
+"url2": "/order/back/activityBasic/selectOne"
+"payload2": {"activityBasicId":"%s"}
+#预期结果
+checkDict2: {"success":true,"code":"200","message":null}
+
+
+#测试场景三：获取活动包含的商品信息
+"url3": "/order/back/activityProduct/listBackActivityProduct"
+"payload3": {"activityProduct":{"activityBasicId":"%d"},"activityType":"%d"}
+#预期结果
+checkDict3: {"success":true,"code":"200","message":"OK"}
+
+
+#测试场景四：获取活动对应的黑名单
+"url4": "/order/back/activityUserBlacklist/listBackActivityUserBlacklist"
+"payload4": {"activityUserBlacklist":{"activityBasicId":"%d"}}
+#预期结果
+checkDict4: {"success":true,"code":"200","message":"OK"}
+
+#测试场景五：获取活动对应的指定客户差异促销规则
+"url5": "/order/back/activityDifferenceUser/listBackActivityDifferenceUser"
+"payload5": {"activityDifferenceUser":{"activityBasicId":"%s"},"activityType":"%s"}
+#预期结果
+checkDict5: {"success":true,"code":"200","message":"OK"}
+
+
+#测试场景六：获取商品详情
+"url6": "/product/mall/queryProductInfoById"
+"payload6": {"productId":"%s"}
+#预期结果
+checkDict6: {"success":true,"code":"200","message":"OK"}
+
+
+#测试场景七：查询商品对应的促销活动
+"url7": "/order/public/getDiscountByProductId"
+"payload7": {"productId":"%s","companyCode":"%s","productCode":"%s"}
+#预期结果
+checkDict7: {"success":true,"code":"200","message":"OK"}
+
+
+
+
+
+
+
+
+
+
+
+

data/cmdc_commodity_list/data

 #后台运营管理系统登录信息(总公司)
-"username": "admin1"
+"username": "admin"
 "password": "Aa123456"
 
 json_headers: {

data/cmdc_demand_delete/data

@@ -5,7 +5,7 @@
 "url1": "/order/back/listDemand"
 
 # 后台运营管理系统登录信息
-"username": "admin2"
+"username": "admin"
 "password": "Aa123456"
 
 json_headers1: {
@@ -33,8 +33,8 @@ checkDict2: {"success":true,"code":"200","message":"OK","data":1,"freshToken":nu
 "checkDict4": {"success":false,"code":"demand","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}
+#查询审核通过状态的需求单(待支付)
+"payload40": {"times":[null],"listOrderStatus":["132"],"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":""}
 #预期结果

data/cmdc_demand_fail/data

@@ -4,7 +4,7 @@
 "url1": "/order/back/listDemand"
 
 # 后台运营管理系统登录信息
-"username": "admin2"
+"username": "Admin00111"
 "password": "Aa123456"
 
 json_headers1: {
@@ -33,8 +33,8 @@ checkDict1: {"success":true,"code":"200","message":"OK","data":1}
 "checkDict3": {"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}
+#获取需求单列表中审核通过的需求单请求报文(待支付)
+"payload40": {"times":[null],"listOrderStatus":["132"],"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":"审核拒绝原因"}
 #预期结果

data/cmdc_demand_list_pc/data

 # 多采商城登录信息
-"username": "Test001"
+"username": "GL1000086"
 "password": "Aa123456"
 
 json_headers: {

data/cmdc_frequent_purchase/data

 # 多采商城登录信息
-"username": "Test001"
+"username": "BJ0621"
 "password": "Aa123456"
 #后台运营管理系统登录信息
-"username1": "admin2"
+"username1": "admin"
 "password1": "Aa123456"
 
 json_headers: {
@@ -16,6 +16,7 @@ json_headers: {
 
 
 json_headers1: {
+"Content-Type": "application/json",
   "Cmdc_access_token": "%s",
   "Sourcetype": "mall"
 }
@@ -24,9 +25,9 @@ json_headers1: {
 #查询已上架商品列表接口地址
 "url10": "/product/mall/queryProductInfoByPage"
 #查询已上架商品列表请求报文
-"payload10": {"isFbList":0,"filialeCode":null,"productName":null,"productCode":null,"specifications":null,"materialCode":null,"manufacturer":null,"lineName":null,"riskRank":null,"isRelease":"1","isExistImage":null,"jdeStatus":"P","isGift":"0","description":null,"tbsj":[],"pageNum":1,"pageSize":8,"total":453,"firstQuery":true,"flag":true,"preInvalidStatus":null,"isControlSales":"0","startTime":null,"endTime":null,"status":101}
+"payload10": {"isFbList":0,"filialeCode":"00111","productName":null,"productCode":null,"specifications":null,"materialCode":null,"manufacturer":null,"lineName":null,"riskRank":null,"isRelease":"1","isExistImage":null,"jdeStatus":"P","isGift":null,"description":null,"tbsj":[],"pageNum":1,"pageSize":8,"total":3,"firstQuery":true,"flag":true,"preInvalidStatus":null,"isControlSales":"0","startTime":null,"endTime":null,"status":101}
 #添加商品至购物车报文
-"payload1": {"currentCompanyId":null,"productId":"%d","quantity":1,"agreementPriceId":0,"price":"%d"}
+"payload1": {"currentCompanyId":3,"productId":"315","quantity":1,"agreementPriceId":0,"price":30}
 #预期结果
 checkDict1: {"success":true,"code":"200","message":"OK","data":"ok"}
 
@@ -77,7 +78,7 @@ checkDict3: {"success":true,"code":"200","message":"OK","data":"ok"}
 #查询已上架商品列表接口地址
 "url40": "/product/mall/queryProductByJdeStatus"
 #查询已失效商品列表请求报文
-"payload40": {"isFbList":0,"filialeCode":null,"productName":null,"productCode":null,"specifications":null,"materialCode":null,"manufacturer":null,"lineName":null,"riskRank":null,"isRelease":null,"isExistImage":null,"jdeStatus":null,"isGift":"0","description":null,"tbsj":[],"pageNum":1,"pageSize":8,"total":4,"firstQuery":true,"flag":true,"preInvalidStatus":null,"isControlSales":"0","startTime":null,"endTime":null}
+"payload40": {"isFbList":0,"filialeCode":"00102","productName":null,"productCode":null,"specifications":null,"materialCode":null,"manufacturer":null,"lineName":null,"riskRank":null,"isRelease":null,"isExistImage":null,"jdeStatus":null,"isGift":null,"description":null,"tbsj":[],"pageNum":1,"pageSize":8,"total":6,"firstQuery":true,"flag":true,"preInvalidStatus":null,"isControlSales":"0","startTime":null,"endTime":null}
 #添加已失效商品至购物车报文
 "payload4": {"currentCompanyId":null,"productId":"%d","quantity":1,"agreementPriceId":0,"price":"%d"}
 #预期结果
@@ -88,7 +89,7 @@ checkDict4: {'success': False, 'code': 'addFrequentPurchaseFail', 'message': '
 #查询控销商品列表接口地址
 "url50": "/product/mall/queryProductInfoByPage"
 #查询控销商品列表请求报文
-"payload50": {"isFbList":0,"filialeCode":null,"productName":null,"productCode":null,"specifications":null,"materialCode":null,"manufacturer":null,"lineName":null,"riskRank":null,"isRelease":null,"isExistImage":null,"jdeStatus":null,"isGift":null,"description":null,"tbsj":[],"pageNum":1,"pageSize":8,"total":28,"firstQuery":true,"flag":true,"preInvalidStatus":null,"isControlSales":null,"startTime":null,"endTime":null,"status":102}
+"payload50": {"isFbList":0,"filialeCode":"00102","productName":null,"productCode":null,"specifications":null,"materialCode":null,"manufacturer":null,"lineName":null,"riskRank":null,"isRelease":"1","isExistImage":null,"jdeStatus":"P","isGift":"0","description":null,"tbsj":[],"pageNum":1,"pageSize":8,"total":115,"firstQuery":true,"flag":true,"preInvalidStatus":null,"isControlSales":"1","startTime":null,"endTime":null,"status":101}
 #添加控销商品至购物车报文
 "payload5": {"currentCompanyId":null,"productId":"%d","quantity":1,"agreementPriceId":0,"price":"%d"}
 #预期结果
@@ -110,7 +111,7 @@ checkDict6: {'success': False, 'code': 'addFrequentPurchaseFail', 'message': '
 #查询赠品列表接口地址
 "url70": "/product/mall/queryProductInfoByPage"
 #查询赠品列表请求报文
-"payload70": {"isFbList":0,"filialeCode":null,"productName":null,"productCode":null,"specifications":null,"materialCode":null,"manufacturer":null,"lineName":"","riskRank":null,"isRelease":"1","isExistImage":null,"jdeStatus":"P","isGift":"1","description":null,"tbsj":[],"pageNum":1,"pageSize":8,"total":21,"firstQuery":true,"flag":true,"preInvalidStatus":null,"isControlSales":"0","sdOutStorage":"","startTime":null,"endTime":null,"status":101}
+"payload70": {"isFbList":0,"filialeCode":"00102","productName":null,"productCode":null,"specifications":null,"materialCode":null,"manufacturer":null,"lineName":null,"riskRank":null,"isRelease":"1","isExistImage":null,"jdeStatus":"P","isGift":"1","description":null,"tbsj":[],"pageNum":1,"pageSize":8,"total":11,"firstQuery":true,"flag":true,"preInvalidStatus":null,"isControlSales":"0","startTime":null,"endTime":null,"status":101}
 #添加赠品至购物车报文
 "payload7": {"currentCompanyId":null,"productId":"%d","quantity":1,"agreementPriceId":0,"price":"%d"}
 #预期结果
@@ -130,8 +131,15 @@ checkDict8: {'success': False, 'code': 'addFrequentPurchaseFail', 'message': '
 
 
 #新增跨站点商品至常购清单列表
-"payload90": {"currentCompanyId":2,"productId":"1","quantity":1,"agreementPriceId":0,"price":270}
-"payload91": {"currentCompanyId":3,"productId":"25794","quantity":1,"agreementPriceId":0,"price":2800}
+"payload90": {"currentCompanyId":3,"productId":23400,"quantity":1,"agreementPriceId":0,"price":1260,"filialeCode":"00103"}
+"payload91": {"currentCompanyId":3,"productId":"23400","quantity":1,"agreementPriceId":0,"price":1260}
+#商品查询
+#查询站点国药集团河南省医疗器械有限公司商品信息
+"payload4000": {"isFbList":0,"filialeCode":"00140","productName":null,"productCode":null,"specifications":null,"materialCode":null,"manufacturer":null,"lineName":null,"riskRank":null,"isRelease":"1","isExistImage":null,"jdeStatus":"P","isGift":"0","description":null,"tbsj":[],"pageNum":1,"pageSize":8,"total":8850,"firstQuery":true,"flag":true,"preInvalidStatus":null,"isControlSales":"0","startTime":null,"endTime":null,"status":101}
+#查询站点国药集团联合医疗器械有限公司商品信息
+"payload4001": {"isFbList":0,"filialeCode":"00102","productName":null,"productCode":null,"specifications":null,"materialCode":null,"manufacturer":null,"lineName":null,"riskRank":null,"isRelease":"1","isExistImage":null,"jdeStatus":"P","isGift":"0","description":null,"tbsj":[],"pageNum":1,"pageSize":8,"total":218,"firstQuery":true,"flag":true,"preInvalidStatus":null,"isControlSales":"0","startTime":null,"endTime":null,"status":101}
+
+
 
 #预期结果
 checkDict9: {"success":true,"code":"200","message":"OK","data":"ok"}
@@ -139,5 +147,8 @@ checkDict90: {"success":false,"code":"1078","message":"该商品不存在，加
 
 
 
-
-
+#站点切换
+"url2000": "/user/mall/switchWebsite"
+"payload2000": {"companyId":3,"companyCode":"00103"}
+"payload2001": {"companyId":7,"companyCode":"00102"}
+"payload2002": {"companyId":8,"companyCode":"00140"}
\ No newline at end of file

data/cmdc_login/data

@@ -3,11 +3,11 @@
 # 多采商城登录地址
 "maii_login_url": "/sso/mallLogin"
 # 多采商城登录信息
-"do_username": "Test001"
+"do_username": "BJ0621"
 "do_password": "Aa123456"
 # 国药运营后台管理系统登录地址
 "do_login_url": "/sso/doLogin"
-# 多采商城登录信息
-"username": "admin1"
+# 国药运营后台管理系统账号信息
+"username": "Admin00111"
 "password": "Aa123456"
 

data/cmdc_product_list_query/data

-#后台运营管理系统登录信息(子公司)
-"username": "admin2"
+#后台运营管理系统登录信息(上海公司)
+"username": "Admin00111"
 "password": "Aa123456"
 json_headers: {
   "Content-Type": "application/json",
@@ -7,7 +7,7 @@ json_headers: {
 }
 
 # 多采商城登录信息
-"username1": "Test001"
+"username1": "BJ0621"
 "password1": "Aa123456"
 json_headers1: {
   "Cmdc_access_token": "%s",

data/cmdc_purchase_list/data

@@ -3,7 +3,7 @@
 
 
 # 后台运营管理系统登录信息
-"username": "admin2"
+"username": "Admin00111"
 "password": "Aa123456"
 
 json_headers1: {

data/cmdc_query_customer/data

@@ -3,7 +3,7 @@
 
 
 # 后台运营管理系统登录信息
-"username": "admin2"
+"username": "Admin00111"
 "password": "Aa123456"
 
 json_headers1: {

data/cmdc_userinfo_query/data

 # 多采商城登录信息
-"username": "Test001"
+"username": "BJ0621"
 "password": "Aa123456"
 
 json_headers: {

data/cmdc_website/data

-#后台运营管理系统登录信息(子公司)
-"username": "admin2"
+#后台运营管理系统登录信息(子公司-上海公司)
+"username": "Admin00111"
 "password": "Aa123456"
 
 # 多采商城登录信息
-"username1": "Test001"
+"username1": "BJ0621"
 "password1": "Aa123456"
 
 json_headers: {
@@ -20,7 +20,7 @@ checkDict1: {"success":true,"code":"200","message":"操作成功"}
 
 #站点切换接口地址
 "url2": "/user/mall/switchWebsite"
-"payload2": {"companyId":2,"companyCode":"00102"}
+"payload2": {"companyId":3,"companyCode":"00103"}
 #预期结果
 checkDict2: {"success":true,"code":"200","message":"OK","data":null}