1、用例优化

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

air_case/cmdc_demand/快速下单-申请取消-审核.air/快速下单-申请取消-审核.py

@@ -28,12 +28,13 @@ request_body1 = commonFuc().get_business_data(module, "payload10")
 # 发送请求
 result1 = requests.post(url1, json=request_body1, headers=headers1)
 result1 = json.loads(result1.content)
+print(result1)
 # 获取预期结果
 check_dict1 = commonFuc().get_business_data(module, "checkDict10")
 # 断言实际结果中是否包含预期结果的内容
 commonFuc().check_result(check_dict1, result1)
 # 获取新创建需求单对应的订单编号
-order_num = result1["data"]["国药集团联合医疗器械有限公司"]["demandItems"][0]["demandCode"]
+order_num = result1["data"]["国药集团北京医疗器械有限公司"]["demandItems"][0]["demandCode"]
 print(order_num)
 # 第三步在需求单列表根据订单编号查询出新创建的需求单
 url2 = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url20")

air_case/cmdc_demand_create_pc/多采商城需求单创建.air/多采商城需求单创建.py

@@ -2,7 +2,7 @@
 __author__ = "liguangyu"
 
 """
-case_tag:cmdc_api,cmdc需求单创建（快速下单）,2252,2252-36,sit,bs
+case_tag:cmdc_api,cmdc需求单创建（快速下单）,2252234234,2252-36,sit,bs
 主数据平台:多采商城需求单创建接口 
 """
 

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

@@ -39,6 +39,7 @@ request_body = commonFuc().get_business_data(module, "payload1", demand_id)
  场景:需求删除
  用例名称：需求单删除
  输出：{"success":true,"code":"200","message":"OK","data":1,"freshToken":null}
+ 备注：此模块删除为待首营状态下需求单对应的删除图标，非删除按钮
 """
 
 # 发送请求

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

@@ -29,7 +29,6 @@ result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
 # 获取demandId
 demand_id = result["data"]["list"][0]["demandId"]
-print(demand_id)
 
 # 第三步进行需求单审核拒绝操作
 url1 = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url")

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

@@ -35,6 +35,7 @@ result = requests.post(url1, json=request_body, headers=headers)
 result = json.loads(result.content)
 # 获取demandId
 demand_id = result["data"]["list"][0]["demandId"]
+print(demand_id)
 
 # 第四步，获取到demandId进行需求单删除操作
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url")

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

@@ -8,42 +8,29 @@ case_tag:cmdc_api,cmdc新增商品至常购清单列表,2252,2252-36,sit,bs
 
 from common.common_func import commonFuc
 from air_case.cmdc_login.多采商城登录.多采商城登录 import CmdcMaiiLogin
-from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
 import requests
 import json
 
 
 module = "cmdc_frequent_purchase"
 
-# 步骤一登录后台管理系统查询商品列表获取已上架商品信息
-# 获取登录后台管理系统所需账号密码
-username = commonFuc().get_business_data(module, "username1")
-password = commonFuc().get_business_data(module, "password1")
-# 获取登录后Cmdc_access_token
-cmdc_access_token = CmdcDoLogin(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, "url10")
-request_body = commonFuc().get_business_data(module, "payload10")
-
-# 发送请求
-result = requests.post(url, json=request_body, headers=headers)
-result = json.loads(result.content)
-# 获取已加上商品信息并进行参数化处理
-product_id = result["data"]["list"][0]["productId"]
-price = result["data"]["list"][0]["referencePrice"]
-
-# 第二步登录多采商城添加商品至常购清单列表
+# 第一步登录多采商城获取token
 # 获取登录所需账号密码
 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_headers1", cmdc_access_token)
+
+# 第二步切换至子站点
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url2000")
+request_body = commonFuc().get_business_data(module, "payload2000")
+result = requests.post(url, json=request_body, headers=headers)
+
 # 添加商品至常购清单列表
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url1")
-request_body = commonFuc().get_business_data(module, "payload1", product_id, price)
-
+request_body = commonFuc().get_business_data(module, "payload1")
+print(request_body)
 """
  场景:新增商品至常购清单列表
  用例名称：新增商品至常购清单列表

air_case/cmdc_frequent_purchase/新增已失效商品至常购清单列表.air/新增已失效商品至常购清单列表.py

@@ -29,6 +29,7 @@ request_body = commonFuc().get_business_data(module, "payload40")
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
+print(result)
 # 获取商品信息并进行参数化处理
 product_id = result["data"]["list"][0]["productId"]
 price = result["data"]["list"][0]["referencePrice"]
@@ -40,7 +41,13 @@ 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_headers1", cmdc_access_token)
-# 添加已失效商品至常购清单列表
+
+# 第三步切换至子站点
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url2000")
+request_body = commonFuc().get_business_data(module, "payload2001")
+result = requests.post(url, json=request_body, headers=headers)
+
+# 第四步添加已失效商品至常购清单列表
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url1")
 request_body = commonFuc().get_business_data(module, "payload4", product_id, price)
 

air_case/cmdc_frequent_purchase/新增控销商品至常购清单列表.air/新增控销商品至常购清单列表.py

@@ -40,7 +40,13 @@ 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_headers1", cmdc_access_token)
-# 添加控销商品至常购清单列表
+
+# 第三步切换至子站点
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url2000")
+request_body = commonFuc().get_business_data(module, "payload2001")
+result = requests.post(url, json=request_body, headers=headers)
+
+# 第四步添加控销商品至常购清单列表
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url1")
 request_body = commonFuc().get_business_data(module, "payload5", product_id, price)
 

air_case/cmdc_frequent_purchase/新增赠品至常购清单列表.air/新增赠品至常购清单列表.py

@@ -40,7 +40,13 @@ 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_headers1", cmdc_access_token)
-# 添加赠品至常购清单列表
+
+# 第三步切换至子站点
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url2000")
+request_body = commonFuc().get_business_data(module, "payload2001")
+result = requests.post(url, json=request_body, headers=headers)
+
+# 第四步添加赠品至常购清单列表
 url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url1")
 request_body = commonFuc().get_business_data(module, "payload7", product_id, price)
 

air_case/cmdc_frequent_purchase/添加跨站点商品至常购清单列表.air/添加跨站点商品至常购清单列表.py

@@ -3,52 +3,96 @@ __author__ = "liguangyu"
 
 """
 case_tag:cmdc_api,cmdc新增跨站商品至常购清单列表,2252,2252-41,sit,bs
-主数据平台:多采商城常购清单列表新增商品接口  
+主数据平台:多采商城常购清单列表新增商品接口
+备注：常购清单添加商品，需先切换至相应的子站点，否则无法直接添加跨站商品  
 """
 
 from common.common_func import commonFuc
 from air_case.cmdc_login.多采商城登录.多采商城登录 import CmdcMaiiLogin
+from air_case.cmdc_login.后台管理系统登录.后台管理系统登录 import CmdcDoLogin
 import requests
 import json
 
 
 module = "cmdc_frequent_purchase"
 
-url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url1")
-print(url)
+# 步骤一登录后台管理系统查询商品列表获取已失效商品信息
+# 获取登录后台管理系统所需账号密码
+username = commonFuc().get_business_data(module, "username1")
+password = commonFuc().get_business_data(module, "password1")
+# 获取登录后Cmdc_access_token
+cmdc_access_token = CmdcDoLogin(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, "url10")
+request_body = commonFuc().get_business_data(module, "payload4000")
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+result = json.loads(result.content)
+# 获取商品信息并进行参数化处理
+product_id_103 = result["data"]["list"][0]["productId"]
+price_103 = result["data"]["list"][0]["referencePrice"]
+
+# 查询站点国药集团联合医疗器械有限公司商品信息
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url10")
+request_body = commonFuc().get_business_data(module, "payload4001")
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+result = json.loads(result.content)
+# 获取商品信息并进行参数化处理
+product_id_102 = result["data"]["list"][0]["productId"]
+price_102 = result["data"]["list"][0]["referencePrice"]
+
+# 步骤三登录多采商城获取token
 # 获取登录所需账号密码
 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_headers1", cmdc_access_token)
-request_body1 = commonFuc().get_business_data(module, "payload90")
 
-# 发送请求
-result1 = requests.post(url, json=request_body1, headers=headers)
-result1 = json.loads(result1.content)
-print(result1)
-# 获取预期结果
-check_dict1 = commonFuc().get_business_data(module, "checkDict9")
-print(check_dict1)
-# 断言实际结果中是否包含预期结果的内容
-commonFuc().check_result(check_dict1, result1)
-# 组装跨站点商品报文
-request_body = commonFuc().get_business_data(module, "payload91")
+# 步骤四切换至子站点国药集团联合医疗器械有限公司并添加商品至常购清单列表
+# 切换至子站点
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url2000")
+request_body = commonFuc().get_business_data(module, "payload2001")
+result = requests.post(url, json=request_body, headers=headers)
+
+# 添加已商品至常购清单列表
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url1")
+request_body = commonFuc().get_business_data(module, "payload4", product_id_102, price_102)
 
 """
  场景:跨站商品至常购清单列表
  用例名称：跨站商品至常购清单列表
- 输出：{"success":false,"code":"1078","message":"该商品不存在，加入购物车失败","data":null,"freshToken":null}
- 备注：目前常购清单列表不支持添加跨站点商品
+ 输出：{"success":true,"code":"200","message":"OK","data":"ok"}
 """
 
+# 发送请求
+result = requests.post(url, json=request_body, headers=headers)
+result = json.loads(result.content)
+# # 获取预期结果
+check_dict = commonFuc().get_business_data(module, "checkDict9")
+# # 断言实际结果中是否包含预期结果的内容
+commonFuc().check_result(check_dict, result)
+
+# 步骤五切换至子站点国药集团河南省医疗器械有限公司并添加商品至常购清单列表
+# 切换至子站点
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url2000")
+request_body = commonFuc().get_business_data(module, "payload2002")
+result = requests.post(url, json=request_body, headers=headers)
+
+# 添加商品至常购清单列表
+url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url1")
+request_body = commonFuc().get_business_data(module, "payload4", product_id_103, price_103)
+
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
 print(result)
 # 获取预期结果
-check_dict = commonFuc().get_business_data(module, "checkDict90")
+check_dict = commonFuc().get_business_data(module, "checkDict9")
 print(check_dict)
 # 断言实际结果中是否包含预期结果的内容
 commonFuc().check_result(check_dict, result)

air_case/cmdc_login/后台管理系统登录.air/后台管理系统登录.py

@@ -3,7 +3,7 @@
 __author__ = "liguangyu"
 
 """
-case_tag:api,cmdc-dologin,多采商城登录,sit,bs
+case_tag:api,cmdc-dologin,运营后台管理系统登录,sit,bs
 """
 from common.common_func import commonFuc
 import requests
@@ -12,12 +12,10 @@ from common.verification_code_ocr import VerificationCodeOcr
 import json
 import os
 
-
 module = "cmdc_login"
 
 
 class CmdcDoLogin():
-
     """国药运营后台管理系统登录"""
 
     def __init__(self, username, password):
@@ -41,7 +39,7 @@ class CmdcDoLogin():
         BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
         code_path = BASE_DIR + "/多采商城登录.air/verifycode.png"
         # 识别并获取验证码
-        code = VerificationCodeOcr(code_path, "rainbow123","rainbow123").base64_api()
+        code = VerificationCodeOcr(code_path, "rainbow123", "rainbow123").base64_api()
         # 获取多彩商城登录地址
         cmdc_url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "do_login_url")
         # cmdc_url = "https://service-slb.cmic.com.cn/sso/mallLogin"
@@ -58,7 +56,3 @@ class CmdcDoLogin():
         result = json.loads(result.content)
         token = commonFuc().analysis_json('accessToken', result)
         return token
-
-
-if __name__ == "__main__":
-    print(CmdcDoLogin("Test001", "Aa123456").get_token())

air_case/cmdc_login/后台管理系统登录/后台管理系统登录.py

@@ -3,7 +3,7 @@
 __author__ = "liguangyu"
 
 """
-case_tag:api,cmdc-dologin,多采商城登录,sit,bs
+case_tag:api,cmdc-dologin,运营后台管理系统登录,sit,bs
 """
 from common.common_func import commonFuc
 import requests
@@ -67,6 +67,6 @@ class CmdcDoLogin():
 
 
 if __name__ == "__main__":
-    cmdc_access_token = CmdcDoLogin("admin2", "FFtmods@365y").get_token()
+    cmdc_access_token = CmdcDoLogin("Admin00111", "Aa123456").get_token()
     print(cmdc_access_token)
 

air_case/cmdc_login/多采商城登录.air/多采商城登录.py

@@ -11,12 +11,10 @@ from common.verification_code_ocr import VerificationCodeOcr
 import json
 import os
 
-
 module = "cmdc_login"
 
 
 class CmdcMaiiLogin():
-
     """多采商城登录"""
 
     def __init__(self, username, password):
@@ -46,7 +44,7 @@ class CmdcMaiiLogin():
         cmdc_url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "maii_login_url")
         # cmdc_url = "https://service-slb.cmic.com.cn/sso/mallLogin"
         # 组装请求报文
-        request_body = {"userName": self.username,"password": self.password,"validateCode": code,"uuid": uuid_handle}
+        request_body = {"userName": self.username, "password": self.password, "validateCode": code, "uuid": uuid_handle}
         print(request_body)
         # 发送请求
         result = requests.post(cmdc_url, params=request_body)
@@ -58,7 +56,3 @@ class CmdcMaiiLogin():
         result = json.loads(result.content)
         token = commonFuc().analysis_json('accessToken', result)
         return token
-
-
-if __name__ == "__main__":
-    print(CmdcMaiiLogin("Test001", "Aa123456").get_token())

air_case/cmdc_login/多采商城登录/多采商城登录.py

@@ -11,12 +11,10 @@ from common.verification_code_ocr import VerificationCodeOcr
 import json
 import os
 
-
 module = "cmdc_login"
 
 
 class CmdcMaiiLogin():
-
     """多采商城登录"""
 
     def __init__(self, username, password):
@@ -46,7 +44,7 @@ class CmdcMaiiLogin():
         cmdc_url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "maii_login_url")
         # cmdc_url = "https://service-slb.cmic.com.cn/sso/mallLogin"
         # 组装请求报文
-        request_body = {"userName": self.username,"password": self.password,"validateCode": code,"uuid": uuid_handle}
+        request_body = {"userName": self.username, "password": self.password, "validateCode": code, "uuid": uuid_handle}
         print(request_body)
         # 发送请求
         result = requests.post(cmdc_url, params=request_body)
@@ -58,7 +56,3 @@ class CmdcMaiiLogin():
         result = json.loads(result.content)
         token = commonFuc().analysis_json('accessToken', result)
         return token
-
-
-if __name__ == "__main__":
-    print(CmdcMaiiLogin("Test001", "Aa123456").get_token())

air_case/cmdc_product_list_query/商品列表_快速下单.air/商品列表_快速下单.py

@@ -2,7 +2,7 @@
 __author__ = "liguangyu"
 
 """
-case_tag:cmdc_api,cmdc获取商品列表(快速下单),2252345,2252-43,sit,bs
+case_tag:cmdc_api,cmdc获取商品列表(快速下单),2252,2252-43,sit,bs
 主数据平台:多采商城商品列表接口 
 """
 
@@ -30,7 +30,7 @@ result10 = requests.post(url10, json=request_body10, headers=headers)
 result10 = json.loads(result10.content)
 
 # 获取站点companyId
-company_id = result10["data"][2]["companyId"]
+company_id = result10["data"][3]["companyId"]
 # 第二步查询站点对应的JDEcode
 url11 = commonFuc().get_api_url() + commonFuc().get_business_data(module, "url11")
 request_body11 = commonFuc().get_business_data(module, "payload11", company_id)

common/common_func.py

@@ -69,7 +69,8 @@ class commonFuc(object):
         elif env == "od":  # 骨科
             url = ""
         elif env == "bs":  # 电商
-            url = "https://service-slb.cmic.com.cn"
+            url = "https://service-uat.gyqxmall.com"
+            # url = "https://service-slb.cmic.com.cn"
         else:
             url = 'http://spddev.cmic.com.cn'
 

common/verification_code_ocr.py

@@ -32,4 +32,4 @@ class VerificationCodeOcr:
 
 
 if __name__ == '__main__':
-    print(VerificationCodeOcr(r"air_case/cmdc_login/多彩商城登录.air/verifycode.png","rainbow123","rainbow123").base64_api())
+    print(VerificationCodeOcr(r"air_case/cmdc_login/多采商城登录.air/verifycode.png","rainbow123","rainbow123").base64_api())

data/cmdc-qos/data

@@ -11,7 +11,7 @@ checkDict2: {"success":true,"code":"200","message":null,"data":{"quickOrderSign"
 
 
 # 多采商城登录信息
-"username": "Test001"
+"username": "BJ0621"
 "password": "Aa123456"
 
 json_headers: {

data/cmdc_buyercar_list/data

 # 多采商城登录信息
-"username": "Test001"
+"username": "BJ0621"
 "password": "Aa123456"
 
 #后台运营管理系统登录信息(子公司)
-"username1": "admin2"
+"username1": "Admin00111"
 "password1": "Aa123456"
 
 #后台运营管理系统登录信息(总公司)
-"username2": "admin1"
+"username2": "Admin"
 "password2": "Aa123456"
 
 json_headers: {
@@ -46,7 +46,7 @@ json_headers2: {
 #查询已上架商品列表请求报文
 "payload20": {"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}
 #添加商品至购物车报文
-"payload2": {"currentCompanyId":null,"productId":"%d","quantity":1,"agreementPriceId":null,"price":"%d"}
+"payload2": {"currentCompanyId":null,"productId":"%d","quantity":1,"agreementPriceId":null,"price":"%d","filialeCode":"%s"}
 #预期结果
 checkDict2: {"success":true,"code":"200","message":"OK","data":"ok"}
 
@@ -71,7 +71,7 @@ json_headers5: {
 #查询已失效商品列表请求报文
 "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}
 #增加已失效商品至购物车报文
-"payload5": {"currentCompanyId":null,"productId":"%d","quantity":1,"agreementPriceId":null,"price":"%d"}
+"payload5": {"currentCompanyId":null,"productId":"%d","quantity":1,"agreementPriceId":null,"price":"%d","filialeCode":"%s"}
 #预期结果
 checkDict5: {"success":false,"code":"addBuyerCartFail","message":"商品为失效状态，不可加入购物车","data":null,"freshToken":null}
 
@@ -86,7 +86,7 @@ json_headers7: {
 #查询已控销商品列表请求报文
 "payload70": {"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}
 #增加控销商品至购物车报文
-"payload7": {"currentCompanyId":null,"productId":"%d","quantity":1,"agreementPriceId":null,"price":"%d"}
+"payload7": {"currentCompanyId":null,"productId":"%d","quantity":1,"agreementPriceId":null,"price":"%d","filialeCode":"%s"}
 #预期结果
 checkDict7: {"success":false,"code":"addBuyerCartFail","message":"商品为控销商品，不可加入购物车","data":null,"freshToken":null}
 
@@ -100,7 +100,7 @@ json_headers10: {
 #查询JDE已停用商品列表请求报文
 "payload100": {"isFbList":0,"filialeCode":null,"productName":null,"productCode":null,"specifications":null,"materialCode":null,"manufacturer":null,"lineName":null,"riskRank":null,"isRelease":null,"isExistImage":null,"jdeStatus":"O","isGift":null,"description":null,"tbsj":[],"pageNum":1,"pageSize":8,"total":121,"firstQuery":true,"flag":true,"preInvalidStatus":null,"isControlSales":"","startTime":null,"endTime":null,"status":101}
 #添加JDE已停用商品至购物车报文
-"payload10": {"currentCompanyId":null,"productId":"%d","quantity":1,"agreementPriceId":null,"price":"%d"}
+"payload10": {"currentCompanyId":null,"productId":"%d","quantity":1,"agreementPriceId":null,"price":"%d","filialeCode":"%s"}
 #预期结果
 checkDict10: {"success":false,"code":"addBuyerCartFail","message":"商品为失效状态，不可加入购物车","data":null,"freshToken":null}
 
@@ -116,7 +116,7 @@ json_headers8: {
 #查询赠品请求报文
 "payload80": {"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}
 #添加赠品至购物车报文
-"payload8": {"currentCompanyId":null,"productId":"%d","quantity":1,"agreementPriceId":null,"price":"%d"}
+"payload8": {"currentCompanyId":null,"productId":"%d","quantity":1,"agreementPriceId":null,"price":"%d","filialeCode":"%s"}
 #预期结果
 checkDict8: {"success":true,"code":"200","message":"OK","data":"ok"}
 
@@ -134,7 +134,7 @@ json_headers11: {
 #查询赠品请求报文
 "payload110": {"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":6,"firstQuery":true,"flag":true,"preInvalidStatus":null,"isControlSales":"1","sdOutStorage":"","startTime":null,"endTime":null,"status":101}
 #添加赠品至购物车报文
-"payload11": {"currentCompanyId":null,"productId":"%d","quantity":1,"agreementPriceId":null,"price":"%d"}
+"payload11": {"currentCompanyId":null,"productId":"%d","quantity":1,"agreementPriceId":null,"price":"%d","filialeCode":"%s"}
 #预期结果
 checkDict11: {"success":false,"code":"addBuyerCartFail","message":"商品为控销商品，不可加入购物车","data":null,"freshToken":null}
 
@@ -171,7 +171,7 @@ checkDict3: {"success":true,"code":"200","message":"OK","data":"ok"}
 
 
 #新增跨站点商品至购物车
-"payload300": {"currentCompanyId":3,"productId":23363,"quantity":1,"agreementPriceId":0,"price":300000,"filialeCode":"00103"}
+"payload300": {"currentCompanyId":6,"productId":7892,"quantity":1,"agreementPriceId":0,"price":1879,"filialeCode":"00111"}
 "payload301": {"currentCompanyId":3,"productId":25769,"quantity":1,"agreementPriceId":0,"price":69,"filialeCode":"00103"}
 
 #预期结果
@@ -207,7 +207,7 @@ checkDict82: {"quantity":"%s"}
 #通过Excel复制添加商品接口地址
 "url_batch": "/product/mall/batchAddBuyerCart"
 #测试场景一：添加失败
-"payload21": {"currentCompanyId":"","buyerCartList":[{"productCode":"%s","materialCode":"","quantity":"1"}],"excelCopySort":0,"companyId":2}
+"payload21": {"currentCompanyId":"","buyerCartList":[{"productCode":"%s","materialCode":"","quantity":"1"}],"excelCopySort":0,"companyId":7}
 #预期结果
 checkDict21: {"success":false,"code":"200","message":"商品添加完毕，本次添加商品【1】条，成功【0】条，失败【1】条：\n第1行，该商品不存在!","data":[],"freshToken":null}
 
@@ -224,4 +224,4 @@ checkDict24: {"success":false,"code":"999","message":"找不到该公司的首
 #测试场景四：添加商品成功
 "payload23": {"currentCompanyId":"","buyerCartList":[{"productCode":"%s","materialCode":"","quantity":"1"}],"excelCopySort":0,"companyId":"%s"}
 #预期结果
-checkDict23: {"success":false,"code":"2001","message":"商品添加完毕，本次添加商品【1】条，成功【1】条，失败【0】条。"}
+checkDict23: {"success":False,"code":"200","message":"商品添加完毕，本次添加商品【1】条，成功【1】条，失败【0】条。"}

data/cmdc_buyercart_handle/data

 # 多采商城登录信息
-"username": "Test001"
+"username": "BJ0621"
 "password": "Aa123456"
 
 #多采商城headers
@@ -18,9 +18,9 @@ json_headers: {
 
 #测试场景一：购物车添加跨站点商品-下单
 #新增商品报文
-#商品-102公司-脉搏血氧测量仪
+#商品-国联公司-脉搏血氧测量仪
 "payload1": {"currentCompanyId":2,"productId":9036,"quantity":1,"agreementPriceId":0,"price":15000,"filialeCode":"00102"}
-#商品-103公司-百能速干手消毒凝胶
+#商品-北京公司-百能速干手消毒凝胶
 "payload2": {"currentCompanyId":3,"productId":1190,"quantity":1,"agreementPriceId":0,"price":30,"filialeCode":"00103"}
 #预期结果
 checkDict1: {"success":true,"code":"200","message":"OK"}
@@ -34,16 +34,16 @@ checkDict1: {"success":true,"code":"200","message":"OK"}
 checkDict2: {"success":true,"code":"200","message":null}
 
 #查询已添加至购物车商品对应的id
-#商品-102公司-脉搏血氧测量仪
+#商品-国联公司-脉搏血氧测量仪
 "payload4": {"productName":"","materialCode":"9197","manufacturer":"","licenseCode":"","timeSortStatus":0,"pageSize":100,"pageStart":1}
-#商品-103公司-百能速干手消毒凝胶
+#商品-北京公司-百能速干手消毒凝胶
 "payload5": {"productName":"百能速干手消毒凝胶","materialCode":"","manufacturer":"杭州朗索医用消毒剂有限公司","licenseCode":"","timeSortStatus":0,"pageSize":100,"pageStart":1}
 
 
 #商品的选择
-#商品-102公司-脉搏血氧测量仪
+#商品-国联公司-脉搏血氧测量仪
 "payload6": {"companyCode":"00102","orderProductList":[{"agreementPriceId":null,"activityUseSgin":1,"buyerCartId":"%s","productId":9036,"productCode":"10357517","productPrice":15000,"purchaseQuantity":1}],"couponUseSgin":1}
-#商品-103公司-百能速干手消毒凝胶
+#商品-北京公司-百能速干手消毒凝胶
 "payload7": {"companyCode":"00103","orderProductList":[{"agreementPriceId":null,"activityUseSgin":1,"buyerCartId":"%s","productId":1190,"productCode":"13768100","productPrice":30,"purchaseQuantity":1}],"couponUseSgin":1}