优化

air_case/cmdc_special_fresenius_group/套包停用_套包商品管理.air/套包停用_套包商品管理.py

@@ -55,7 +55,6 @@ host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
 sql = "SELECT t.status FROM `cmdc-order`.tc_fresenius_group t WHERE groupId = {}".format(group_id)
 result = {"status": mysql_handle.selectSql(host, port, user, pwd, "cmdc-order", sql)[0][0]}
 
-# 获取
 # 获取预期结果
 check_dict = commonFuc().get_business_data(module, "checkDict7")
 # 断言实际结果中是否包含预期结果的内容

air_case/cmdc_special_fresenius_group/特价单品新增验证.air/特价单品新增验证.py

@@ -84,20 +84,26 @@ request_body = {"manufacturerGroupName": "", "manufacturerGroupCode": "", "group
 # 发送请求
 result = requests.post(url, json=request_body, headers=headers)
 result = json.loads(result.content)
-print(result)
-# 数据库操作
-mysql_handle = mySql()
-# 获取conf.ini文件中配置的数据库信息
-host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
-
-# 数据库查询新增特价单品
-sql = "SELECT t.groupId FROM `cmdc-order`.tc_fresenius_agreement_price t " \
-      "WHERE customerCode = {} and documentNo = '{}';".format(customer_code, ref_random)
-print(sql)
-total = len(mysql_handle.selectSql(host, port, user, pwd, "cmdc-order", sql))
-result = {"total": total}
-
-# 获取预期结果
-check_dict = commonFuc().get_business_data(module, "checkDict17")
-# 断言实际结果中是否包含预期结果的内容
-commonFuc().check_result(check_dict, result)
+# print(result)
+if result["success"]:
+    # 数据库操作
+    mysql_handle = mySql()
+    # 获取conf.ini文件中配置的数据库信息
+    host, port, user, pwd = mysql_handle.getConf(db="cmdc_db")
+
+    # 数据库查询新增特价单品
+    sql = "SELECT t.groupId FROM `cmdc-order`.tc_fresenius_agreement_price t " \
+          "WHERE customerCode = {} and documentNo = '{}';".format(customer_code, ref_random)
+    print(sql)
+    total = len(mysql_handle.selectSql(host, port, user, pwd, "cmdc-order", sql))
+    result = {"total": total}
+
+    # 获取预期结果
+    check_dict = commonFuc().get_business_data(module, "checkDict17")
+    # 断言实际结果中是否包含预期结果的内容
+    commonFuc().check_result(check_dict, result)
+else:
+    # 获取预期结果
+    check_dict = commonFuc().get_business_data(module, "checkDict17_1")
+    # 断言实际结果中是否包含预期结果的内容
+    commonFuc().check_result(check_dict, result)
\ No newline at end of file

data/cmdc_special_fresenius_group/data

@@ -148,6 +148,8 @@ checkDict16: {"customerCode":"%s"}
 "url17": "/order/public/saveSingleProductPrice"
 #预期结果
 checkDict17: {"total": 1}
+# 添加冲突
+checkDict17_1: {"success":False,"code":"fresenius_agreement_price","message":"与已有同商品同客户数据效期冲突"}