优化

air_case/cmdc_demand_creation/需求草稿订单创建.air/需求草稿订单创建.py

@@ -37,8 +37,17 @@ result = requests.post(url, json=request_body, headers=headers)
 api_time = result.elapsed.total_seconds()
 result = json.loads(result.content)
 result["api_time"] = api_time
-# 获取预期结果
-check_dict = commonFuc().get_business_data(module, "checkDict2")
-print(check_dict)
-# 断言实际结果中是否包含预期结果的内容
-commonFuc().check_result(check_dict, result)
+
+# 判断登录是否成功
+if result["success"]:
+    # 获取预期结果
+    check_dict = commonFuc().get_business_data(module, "checkDict2")
+    # print(check_dict)
+    # 断言实际结果中是否包含预期结果的内容
+    commonFuc().check_result(check_dict, result)
+else:
+    # 获取预期结果
+    check_dict = commonFuc().get_business_data(module, "checkDict_fail")
+    # print(check_dict)
+    # 断言实际结果中是否包含预期结果的内容
+    commonFuc().check_result(check_dict, result)

data/cmdc_demand_creation/data

@@ -24,4 +24,7 @@ checkDict1: {"success":true,"code":"200","message":"ok","data":null,"freshToken"
 
 "payload2": {"productMap":{"orderStatus":102,"demandItems":[{"maxProductNum":999999,"minProductNum":1,"addMinProductNum":1,"minProductNumSign":false,"isMultiple":false,"quantityTip":"","productId":8192,"productCode":"10086272","materialCode":"C1048042","productName":"可吸收外科带针缝线","specifications":"C1048042,紫色结福 2/0线 (3) 70厘米 1/2弧 圆针 26","manufacturer":"B.Braun Surgical SA","productLineName":"蛇牌","productLineCode":"3046","zonePriceVOList":null,"price":915,"storageType":"999","optionStr":"C1048042,紫色结福 2/0线 (3) 70厘米 1/2弧 圆针 26","measuringUnit":"BX","ippMiniPurchaseNum":null,"ippMultipleSign":null,"ippPurchaseMultiple":null,"ippStatus":null,"quantity":1,"isGift":0,"measuringUnit1":"盒","imageUrl":"https://pro-cmdc.oss-cn-beijing.aliyuncs.com/productFile/2021/04/14/1e3727ab-49cc-46b9-afa1-2606b283553b.jpg","companyCode":"00111","areaName":null,"areaPrice":915,"agreementPriceId":null,"hidden":null,"description":"","taxRate":"0.13","allMaterialSign":null,"materialCodeExact":null,"specificationsExact":null,"hospitalOrderType":null,"hospitalHopeDate":null,"siteCompanyCode":null,"propertyName":null,"propertyVal":null,"propertyNote":null,"mustInstallDate":false,"showDemandAuditLineLabel":false,"editProductCode":false,"quantityErr":false,"fresenuis":false,"singleFresenuis":null,"zeroSign":false,"purchaseZeroProductList":[],"activityBasicId":null,"giftList":[],"selectGiftArr":[],"selectZeroGiftObj":{"mainProductList":[],"giftProductList":[]},"giftGroupQuantity":1,"giftSign":0,"customerCode":"1071246","realPay":"915.00"}],"paymentAmount":915,"productAmount":915,"userId":18,"userNo":"1071246","customerCode":"1071246","userName":"上海勘泽贸易商行","companyId":"6","paymentType":1,"receiveBankName":"国药集团上海医疗器械有限公司","receiveBankAccount":"36830188000041806","accountId":3,"receiverName":"刘海涛","receiverContact":"18940124666","receiverAddress":"金山区朱泾镇鸿安路599号2幢北2楼210、211室","addressNumber":76216,"remark":"","receiverNote":"刘海涛","receiverPhoneNote":"18940124666","receiverAddressNote":"金山区朱泾镇鸿安路599号2幢北2楼210、211室","addressNoNote":76216,"fileList":[],"sellerCompanyCode":"00111","sellerCompanyName":"国药集团上海医疗器械有限公司","orderSource":2,"replaceCustomerOrder":{"orderStatus":102,"demandItems":[{"maxProductNum":999999,"minProductNum":1,"addMinProductNum":1,"minProductNumSign":false,"isMultiple":false,"quantityTip":"","productId":8192,"productCode":"10086272","materialCode":"C1048042","productName":"可吸收外科带针缝线","specifications":"C1048042,紫色结福 2/0线 (3) 70厘米 1/2弧 圆针 26","manufacturer":"B.Braun Surgical SA","productLineName":"蛇牌","productLineCode":"3046","zonePriceVOList":null,"price":915,"storageType":"999","optionStr":"C1048042,紫色结福 2/0线 (3) 70厘米 1/2弧 圆针 26","measuringUnit":"BX","ippMiniPurchaseNum":null,"ippMultipleSign":null,"ippPurchaseMultiple":null,"ippStatus":null,"quantity":1,"isGift":0,"measuringUnit1":"盒","imageUrl":"https://pro-cmdc.oss-cn-beijing.aliyuncs.com/productFile/2021/04/14/1e3727ab-49cc-46b9-afa1-2606b283553b.jpg","companyCode":"00111","areaName":null,"areaPrice":915,"agreementPriceId":null,"hidden":null,"description":"","taxRate":"0.13","allMaterialSign":null,"materialCodeExact":null,"specificationsExact":null,"hospitalOrderType":null,"hospitalHopeDate":null,"siteCompanyCode":null,"propertyName":null,"propertyVal":null,"propertyNote":null,"mustInstallDate":false,"showDemandAuditLineLabel":false,"editProductCode":false,"quantityErr":false,"fresenuis":false,"singleFresenuis":null,"zeroSign":false,"purchaseZeroProductList":[],"activityBasicId":null,"giftList":[],"selectGiftArr":[],"selectZeroGiftObj":{"mainProductList":[],"giftProductList":[]},"giftGroupQuantity":1}],"paymentAmount":915,"productAmount":915,"userId":18,"userNo":"1071246","customerCode":"1071246","userName":"上海勘泽贸易商行","companyId":"6","paymentType":1,"receiveBankName":"国药集团上海医疗器械有限公司","receiveBankAccount":"36830188000041806","accountId":3,"receiverName":"刘海涛","receiverContact":"18940124666","receiverAddress":"金山区朱泾镇鸿安路599号2幢北2楼210、211室","addressNumber":76216,"remark":"","receiverNote":"刘海涛","receiverPhoneNote":"18940124666","receiverAddressNote":"金山区朱泾镇鸿安路599号2幢北2楼210、211室","addressNoNote":76216,"fileList":[],"sellerCompanyCode":"00111","sellerCompanyName":"国药集团上海医疗器械有限公司","orderSource":2,"customerInfo":{"userId":18,"userName":"BJ0500","rejectUserName":null,"password":null,"realName":"赵林","userNo":"1071246","telephone":"15640336952","rejectTelephone":null,"registerAddress":"[{\\\"province\\\":810,\\\"city\\\":849,\\\"area\\\":850}]","detailAddress":"金山区朱泾镇鸿安路599号2幢北2楼210、211室","businessScope":"[{\\\"province\\\":\\\"\\\",\\\"city\\\":2237,\\\"area\\\":\\\"\\\"}]","companyProperty":101,"companyId":null,"companyCode":null,"companyName":"国药集团上海医疗器械有限公司","companyNameList":null,"customerCompanyName":"上海勘泽贸易商行","lienceNo":"91310116MA1JAFLT2B","userType":2,"companyType":null,"status":3,"disableSign":0,"deleteSign":null,"createBy":null,"updateBy":null,"createTime":null,"updateTime":null,"licenceSketchUrl":null,"licenceUrl":null,"openId":null,"referrer":null,"gift":null,"identity":null,"department":null,"platformStatus":1,"rejectionReason":null,"registerType":null,"siteType":null,"departmentCode":null,"personName":null,"registration":null,"realPassword":null,"recommend":null,"taxRate":0.13,"roleNames":null,"subCompanyName":"国药集团上海医疗器械有限公司","roleIds":null,"addressList":null,"licenseList":null,"labelList":null,"managerList":null,"createTimeStr":null,"categoriesList":null,"merchantsAddress":null,"merchantStatus":null,"refuseReason":null,"merchantsId":null,"userTransactionAmount":"0","gray":null,"bindingTime":null,"bindSign":1,"jdeStatus":0,"jdePhone":"","recommender":null,"coopeSgin":null,"bindflowList":null,"userJDEInfo":null}},"draftId":null,"demands":[{"demandId":null,"demandParentId":null,"demandParentCode":null,"demandCode":null,"customerId":null,"customerName":null,"customerCode":1071246,"loginName":null,"realName":null,"addressNumber":null,"mobile":null,"productName":null,"productCode":null,"sellerCompanyName":null,"sellerCompanyCode":null,"paymentType":null,"receiveBankName":null,"receiveBankAccount":null,"paymentAmount":"915.00","productAmount":915,"payableAmount":915,"refundAmount":null,"cancelAmount":null,"discountAmount":0,"orderStatus":null,"refundStatus":null,"receiverName":null,"receiverContact":null,"receiverAddress":null,"remark":null,"revokedReason":null,"auditById":null,"auditByName":null,"auditTime":null,"auditRemark":null,"flhsStatus":null,"pushJdeStatus":null,"createTime":null,"updateTime":null,"submitTime":null,"pushJdeTime":null,"successTime":null,"auditStatus":null,"deleteSign":null,"firstOrderFlag":null,"demandItems":[{"demandSkuId":null,"demandId":null,"distributionId":null,"companyCode":"00111","demandCode":null,"demandParentId":null,"sellerCompanyId":null,"sellerCompanyName":null,"sellerCompanyCode":null,"customerCode":1071246,"productLineCode":"3046","productLineName":"蛇牌","propertyStr":null,"storageType":"999","suppDist":null,"productId":8192,"productName":"可吸收外科带针缝线","productCode":"10086272","productNature":null,"brandName":null,"optionStr":"C1048042,紫色结福 2/0线 (3) 70厘米 1/2弧 圆针 26","imageUrl":"https://pro-cmdc.oss-cn-beijing.aliyuncs.com/productFile/2021/04/14/1e3727ab-49cc-46b9-afa1-2606b283553b.jpg","lineNumber":null,"price":915,"rebateId":null,"originalPrice":null,"biddingDiscountTax":null,"salesDiscountTax":null,"quantity":1,"sumQuantity":null,"sendQuantity":null,"lackQuantity":null,"cancelQuantity":null,"cancelAmount":null,"refundQuantity":null,"refundAmount":null,"discountQuantity":null,"discountAmount":null,"subtotal":915,"measuringUnit":"盒","auxiliaryMeasuringUnit":null,"procurementMeasuringUnit":null,"pricingMeasuringUnit":null,"materialCode":"C1048042","manufacturer":"B.Braun Surgical SA","produceRegisterNum":null,"riskRank":null,"productClassify":null,"createTime":null,"updateTime":null,"deleteSign":null,"calCancelFlag":null,"refundFlag":null,"discountRate":0,"realPay":915,"promotionPrice":null,"promotionTotalPrice":0,"demandParentCode":null,"regionId":null,"regionName":null,"spitSign":null,"activityAmount":null,"couponAmount":null,"activityUnitAmount":0,"couponUnitAmount":null,"activityBasicId":null,"couponSgin":null,"couponSgin2":null,"returnQuantity":null,"returnAmount":null,"customerId":null,"prescription":null,"specifications":"C1048042,紫色结福 2/0线 (3) 70厘米 1/2弧 圆针 26","lineCodeDelete":null,"sdOutStorage":null,"licenseNo":null,"demandCodes":null,"areaName":null,"agreementPriceId":null,"offerPrice":null,"orderMark":null,"totalPrice":null,"productLimitBuyList":null,"giftSign":0,"giftProductCode":null,"activityCarDataVoList":null,"orderSource":null,"receiverName":null,"receiverContact":null,"receiverAddress":null,"rebateTripId":null,"allSign":null,"salesReturn":null,"nowAmount":null,"taxSign":0,"plusMinuKey":null,"rebateRule":null,"lockType":null,"lineNumberOrg":null,"changeSgin":null,"addSgin":null,"ptbfa1":null,"ptbfa2":null,"ptbfa3":null,"ptbfa4":null,"ptbfa5":null,"yapeiPriceId":null,"ypLinePromotion":null,"yapeiPrice":null,"companyId":null,"buyerCartId":0,"userReceiveIdx":null,"userReceiveIdx2":null,"limitNum":null,"productLimitBuyId":null,"alreadyBuyNum":null,"limitBuySign":0,"proposeNum":null,"takeEffectRange":null,"takeEffectTime":null,"endTime1":null,"groupId":null,"fsGroupId":null,"proposalQuantity":null,"proposalSign":0,"manufacturerUserNo":null,"manufacturerUserDesc":null,"manufacturerProductNo":null,"manufacturerProductDesc":null,"manufacturerUserId":null,"manufacturerProductId":null,"busProductCode":null,"paidTime":null,"customerName":null,"paymentAmount":null,"specQuantity":null,"disQuantity":null,"fulfilledQuantity":null,"fulCancelQuantity":null,"couponId":null,"couponId2":null,"limitS":null,"starts":null,"ends":null,"userId":null,"productTax":"","taxRate":0.13,"demandSplitSign":"1","hospitalHopeDate":null,"uniqueKey":null,"productType":null,"activityRuleId":null,"allowanceBeginTime":null,"allowanceEndTime":null,"sign":null,"differenceActivityUserId":null,"groupNumber":1,"groupName":null,"skuGroup":null,"subList":null,"dataJson":null,"skuMergeSign":null,"freseniusPriceId":null,"quantityAndGroupAll":null,"booleaTime":null,"spitSgin":0,"groupSpitSign":0,"sort":0,"circleArea":null,"purchaseEntryId":null,"mustInstallDate":false,"installedDate":null,"installedDateStr":null,"demandLines":null,"subLineNumber":null,"demandSubCode":null,"propertyName":null,"propertyVal":null,"propertyNote":null,"sendManualSign":0,"activityType":0,"giftSettlementMethod":null,"giftInitQuantity":null,"packageCode":null,"giftGroupQuantity":1,"siteCompanyCode":null,"hospitalOrderType":null,"isCollectionAllocation":null,"orderStatus":null,"distributionType":null,"groupCode":null,"groupProductType":null,"pSign":0,"backSign":0,"description":"","stockNumber":null,"rebate":false,"userBalance":null,"purchaseQuantity":1,"purchaseZeroProductList":[]}],"demandSubItems":null,"rebateDetail":null,"rebateAmountList":null,"productLineCode":"3046","productLineName":"蛇牌","auditLoginName":null,"showPurchaseNo":false,"isRebate":null,"isShowReate":null,"taxRate":0.13,"rebateType":0,"paymentAmountWholeLine":915,"discountAmountWholeLine":0,"payableAmountWholeLine":915,"discountRate":0,"singleRebateAmount":null,"isRebateEdit":null,"payCertUrl":null,"rebateAmount":null,"demandCance":null,"soAdd":null,"soCance":null,"orderReturn":null,"needCustomerConfirm":false,"measuringUnit":null,"productId":null,"version":null,"mainVersion":null,"agencyConfigId":null,"confirmSign":null,"replySign":null,"agencySign":null,"editIng":null,"editIngStr":null,"jdeType":null,"isElectronicSeal":null,"contractAgreementNo":null,"alesDepartmentNo":null,"alesDepartmentName":null,"salesPersonNo":null,"salesPersonName":null,"customerNote":null,"otherNote":null,"contractAgreementCode":null,"projectName":null,"projectCode":null,"regionId":null,"regionName":null,"productLineBindSign":null,"shipVia":null,"orderSource":null,"userBalance":null,"liquidCode":null,"shipmentTypeStr":null,"specifications":"C1048042,紫色结福 2/0线 (3) 70厘米 1/2弧 圆针 26","pageStart":null,"pageSize":null,"changeSgin":null,"yapei":2,"companyId":null,"userReceiveId2":null,"preemptConfig":null,"productSpec":null,"secondAuditSign":null,"secondAuditById":null,"secondAuditByName":null,"secondAuditTime":null,"secondAuditRemark":null,"secondAuditStatus":null,"rebateRule":"0","rebateControlSign":0,"rebateId":null,"preferenceType":null,"preferenceName":null,"disPrice":null,"lineNum":0,"auditStaySign":0,"fileList":null,"imageUrls":null,"total":null,"submitTimeStr":null,"updateTimeStr":null,"auditTimeStr":null,"acceptTime":null,"acceptTimeStr":null,"paidTime":null,"paidTimeStr":null,"erpHandingTime":null,"erpHandingTimeStr":null,"partShippingTime":null,"partShippingTimeStr":null,"allShippingTime":null,"allShippingTimeStr":null,"pushJdeTimeStr":null,"successTimeStr":null,"onlinePaySuccessTime":null,"onlinePaySuccessTimeStr":null,"bankTransactionSerial":null,"newIsTax":null,"countFormula":null,"countNumber":null,"noTaxRebateAmount":0,"isCollectionAllocation":0,"siteCompanyCode":null,"hospitalOrderType":null,"proofTime":null,"proofURL":null,"proofRemark":null,"proofSign":0,"customerCancelSign":null,"cancelRecords":null,"cancelCount":0,"updateNewTime":null,"updateNewTimeStr":null,"fsDedUseSign":null,"notice":null,"shareType":null,"singleRebateSign":null,"cf":false,"isPre":null,"showDemandAuditLineLabel":false,"orderType":null,"newDiscountRate":null,"oldOrderType":null,"oldNewDiscountRate":null,"pendding":null,"pushJdeStatusDemandSub":null,"circleGiftSign":0,"delay":null,"limitS":null,"starts":null,"ends":null,"completedS":null,"confirmDays":null,"remindS":null,"skuGroupList":null,"groupProductType":0,"purchaseId":null,"purchaseCode":null,"sdCancelTime":null,"sdTipSign":0,"receiverNote":null,"receiverPhoneNote":null,"receiverAddressNote":null,"flag":null,"sourceStr":null,"addressNoNote":null,"detailIsSpit":false,"spitSgin":null,"distributionType":null,"rebateValidity":null,"orderChangeType":null,"logoIcon":null,"detail":null,"changeBigType":null,"promotionType":null,"activityTotalAmount":null,"couponTotalAmount":null,"userReceiveId":null,"editSgin":null,"snSgin":null,"jdeOutAmount":null,"totalAllPaAmount":null,"diffShowSgin":0,"lineCodeDelete":null,"startTime":null,"endTime":null,"changeSign":null,"distributionId":null,"limitBuySign":0,"companyType":null,"afterSale":null,"csId":null,"sdStatusNodeParamList":null,"ypPromotionTotal":null,"acrossMainCode":null,"forceApprovedSign":0,"circleGiftContinueSgin":0,"customerCharge":null,"onlinePaySign":0,"recodeDemandSkuList":null,"mergeDemandSkuList":null,"inventoryNode":null,"customCode":null,"terminalSource":null,"potentialClientsId":null,"settlementStatus":null,"firstOrderAuditStatus":null,"confirmReceiptSign":null,"confirmReceiptTime":null,"afterSaleDays":null,"deliveryCompletedTime":null,"taxSign":0,"orderSplitSign":0,"demandRebateSkuList":null,"confirmTime":null,"customerPurchaseNo":null,"mustInstallDate":false,"secondAddressList":null,"splitOrMerge":null,"spitOrderSign":null,"productAmountWholeLine":915,"auditCompanyName":null,"auditCompanyNameCode":null,"edit":false,"showMoreAttribute":false,"ratio":null,"ratioFlag":false,"rebateFlags":false,"userBalancePrice":0,"allQuantity":1,"totalPriceNum":0,"maxTotalLimitPrice":0,"lastNoTaxDiscountAmount":0,"lastDiscountAmount":0}]},"id":null,"type":2,"userNo":"1071246","userName":"上海勘泽贸易商行"}
 #预期结果
-checkDict2: {"success":true,"code":"200","message":"OK"}
\ No newline at end of file
+checkDict2: {"success":true,"code":"200","message":"OK"}
+
+#登录失败
+checkDict_fail: {"success":false,"code":"login_empty","message":"获取登录信息失败","data":null,"freshToken":null,"api_time":0.143888}
\ No newline at end of file