diff --git a/YiMao/ZeroLib/test_CAnon019_.py b/YiMao/ZeroLib/CAnon019_.py similarity index 100% rename from YiMao/ZeroLib/test_CAnon019_.py rename to YiMao/ZeroLib/CAnon019_.py diff --git a/YiMao/ZeroLib/test_CVip019_.py b/YiMao/ZeroLib/CVip019_.py similarity index 100% rename from YiMao/ZeroLib/test_CVip019_.py rename to YiMao/ZeroLib/CVip019_.py diff --git a/YiMao/ZeroLib/demo1024.py b/YiMao/ZeroLib/demo1024.py deleted file mode 100644 index 6709dda..0000000 --- a/YiMao/ZeroLib/demo1024.py +++ /dev/null @@ -1,155 +0,0 @@ -# ZeroLib -# 2021/10/24 14:50:49 -'''debug demo''' - - -''' 获取商品信息接口返回数据 -v2/shopping/{inputCode} -''' -get_goods_info = { - 'code': 0, - 'msg': '成功', - 'data': { - 'flowId': None, - 'goodsDetailList': None, - 'barcode': '6925303796426', - 'inputCode': '6925303796426', # 提取 - 'categoryCode': '1203010107', - 'goodsName': '统一茄皇蕃茄牛肉面', - 'goodsCode': '714479', - 'goodsSpec': '90020', - 'goodsPic': 'https://ieemoo-storage.obs.cn-east-3.myhuaweicloud.com/lhpic/6925303796426.jpg', - 'measureProperty': 0, - 'measureUnit': '桶', - 'minWeight': 132, - 'maxWeight': 198, - 'weight': 165.0, # 提取 - 'price': '0.0', - 'promotePrice': '5.0', - 'shoppingBag': False, - 'promotion': True, - 'qty': '1', - 'pkgFlag': False, - 'goodsBrand': None - } -} - -''' 加购商品到购物车接口返回数据 -shopping/add/retire/purchase -''' -add_goods_info = { - 'code': 0, - 'msg': '成功', - 'data': { - 'remainAmount': '13.8', - 'totalDisc': '0.0', - 'orderItemList': [ - { - 'uuid': ['C186D05F375E4E2F99078456CA809C59'], - 'qty': 1, - 'marketPrice': '8.8', - 'salePrice': '8.80', - 'totalSalePrice': '8.8', - 'minWeight': 0, - 'weight': 0, - 'maxWeight': 0, - 'goodsPic': 'https://ieemoo-storage.obs.cn-east-3.myhuaweicloud.com/lhpic/6924743915848.jpg', - 'barcode': '6924743915848', - 'inputCode': '6924743915848', - 'goodsName': '乐事无限翡翠黄瓜味薯片', - 'goodsPromotionTags': None, - 'measureProperty': 0, - 'shoppingBagFlag': False, - 'activityId': None, - 'activityDescription': None, - 'totalPromotionPrice': 0, - 'categoryCode': None, - 'isOneBarcodeMore': False, - 'pkgFlag': False - }, { - 'uuid': ['D7D17C541D7D4006B675D97B9D2B1C99'], - 'qty': 1, - 'marketPrice': '5', - 'salePrice': '5.00', - 'totalSalePrice': '5', - 'minWeight': 0, - 'weight': 0, - 'maxWeight': 0, - 'goodsPic': 'https://ieemoo-storage.obs.cn-east-3.myhuaweicloud.com/lhpic/6925303796426.jpg', - 'barcode': '6925303796426', - 'inputCode': '6925303796426', - 'goodsName': '统一茄皇蕃茄牛肉面', - 'goodsPromotionTags': None, - 'measureProperty': 0, - 'shoppingBagFlag': False, - 'activityId': None, - 'activityDescription': None, - 'totalPromotionPrice': 0, - 'categoryCode': None, - 'isOneBarcodeMore': False, - 'pkgFlag': False - }], - 'bagInfoList': None, - 'couponMap': None, - 'activityGoodsList': None - } -} - -# 加购购物嗲 -add_shoppingbag_info = { - 'code': 0, - 'msg': '成功', - 'data': { - 'remainAmount': '4.0', - 'totalDisc': '0.0', - 'orderItemList': None, - 'bagInfoList': [ - { - 'uuid': ['9C05055A6CD941ECAB377E3E84DA9AE0'], - 'qty': 2, - 'marketPrice': '0.8', - 'salePrice': '0.80', - 'totalSalePrice': '1.6', - 'minWeight': 0, - 'weight': 0, - 'maxWeight': 0, - 'goodsPic': 'https://ieemoo-storage.obs.cn-east-3.myhuaweicloud.com/lhpic/6971648922990.jpg', - 'barcode': '6971648922990', - 'inputCode': '6971648922990', - 'goodsName': '武商优家可降解购物袋中号', - 'goodsPromotionTags': None, - 'measureProperty': 0, - 'shoppingBagFlag': True, - 'activityId': None, - 'activityDescription': None, - 'totalPromotionPrice': 0, - 'categoryCode': None, - 'isOneBarcodeMore': False, - 'pkgFlag': False - }, { - 'uuid': ['9B5E7B5CD322490DB318B4FD899E6906'], - 'qty': 2, - 'marketPrice': '1.2', - 'salePrice': '1.20', - 'totalSalePrice': '2.4', - 'minWeight': 0, - 'weight': 0, - 'maxWeight': 0, - 'goodsPic': 'https://ieemoo-storage.obs.cn-east-3.myhuaweicloud.com/lhpic/6971648922983.jpg', - 'barcode': '6971648922983', - 'inputCode': '6971648922983', - 'goodsName': '武商优家可降解购物袋大号', - 'goodsPromotionTags': None, - 'measureProperty': 0, - 'shoppingBagFlag': True, - 'activityId': None, - 'activityDescription': None, - 'totalPromotionPrice': 0, - 'categoryCode': None, - 'isOneBarcodeMore': False, - 'pkgFlag': False - }], - 'couponMap': None, - 'activityGoodsList': None - } -} \ No newline at end of file diff --git a/YiMao/scripts/BusiScenarios/test_CAnon011_ReturnOneItemFromMultiplePurchases.py b/YiMao/ZeroLib/test_CAnon011_ReturnOneItemFromMultiplePurchases.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CAnon011_ReturnOneItemFromMultiplePurchases.py rename to YiMao/ZeroLib/test_CAnon011_ReturnOneItemFromMultiplePurchases.py diff --git a/YiMao/scripts/BusiScenarios/test_CAnon012_ReturnOfDiscountedProducts.py b/YiMao/ZeroLib/test_CAnon012_ReturnOfDiscountedProducts.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CAnon012_ReturnOfDiscountedProducts.py rename to YiMao/ZeroLib/test_CAnon012_ReturnOfDiscountedProducts.py diff --git a/YiMao/scripts/BusiScenarios/test_CAnon013_ReturnPromotionWhitelistProducts.py b/YiMao/ZeroLib/test_CAnon013_ReturnPromotionWhitelistProducts.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CAnon013_ReturnPromotionWhitelistProducts.py rename to YiMao/ZeroLib/test_CAnon013_ReturnPromotionWhitelistProducts.py diff --git a/YiMao/scripts/BusiScenarios/test_CAnon014_ReturnWeightOfTheProducte.py b/YiMao/ZeroLib/test_CAnon014_ReturnWeightOfTheProducte.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CAnon014_ReturnWeightOfTheProducte.py rename to YiMao/ZeroLib/test_CAnon014_ReturnWeightOfTheProducte.py diff --git a/YiMao/scripts/BusiScenarios/test_CAnon015_AddPieceRateProductsForPurchase.py b/YiMao/ZeroLib/test_CAnon015_AddPieceRateProductsForPurchase.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CAnon015_AddPieceRateProductsForPurchase.py rename to YiMao/ZeroLib/test_CAnon015_AddPieceRateProductsForPurchase.py diff --git a/YiMao/scripts/BusiScenarios/test_CAnon016_AddPieceRateProductsAndReturnThem.py b/YiMao/ZeroLib/test_CAnon016_AddPieceRateProductsAndReturnThem.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CAnon016_AddPieceRateProductsAndReturnThem.py rename to YiMao/ZeroLib/test_CAnon016_AddPieceRateProductsAndReturnThem.py diff --git a/YiMao/scripts/BusiScenarios/test_CAnon017_AddWeightBasedProductsForPurchase.py b/YiMao/ZeroLib/test_CAnon017_AddWeightBasedProductsForPurchase.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CAnon017_AddWeightBasedProductsForPurchase.py rename to YiMao/ZeroLib/test_CAnon017_AddWeightBasedProductsForPurchase.py diff --git a/YiMao/scripts/BusiScenarios/test_CAnon018_PurchaseWeightedGoodsAndReturnThem.py b/YiMao/ZeroLib/test_CAnon018_PurchaseWeightedGoodsAndReturnThem.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CAnon018_PurchaseWeightedGoodsAndReturnThem.py rename to YiMao/ZeroLib/test_CAnon018_PurchaseWeightedGoodsAndReturnThem.py diff --git a/YiMao/scripts/BusiScenarios/test_CNoLogin001_CheckADs.py b/YiMao/ZeroLib/test_CNoLogin001_CheckADs.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CNoLogin001_CheckADs.py rename to YiMao/ZeroLib/test_CNoLogin001_CheckADs.py diff --git a/YiMao/scripts/BusiScenarios/test_CVip001_AddShoppingBagAndSettlePayment.py b/YiMao/ZeroLib/test_CVip001_AddShoppingBagAndSettlePayment.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CVip001_AddShoppingBagAndSettlePayment.py rename to YiMao/ZeroLib/test_CVip001_AddShoppingBagAndSettlePayment.py diff --git a/YiMao/scripts/BusiScenarios/test_CVip002_AddNonDiscountedProductsForPurchase.py b/YiMao/ZeroLib/test_CVip002_AddNonDiscountedProductsForPurchase.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CVip002_AddNonDiscountedProductsForPurchase.py rename to YiMao/ZeroLib/test_CVip002_AddNonDiscountedProductsForPurchase.py diff --git a/YiMao/scripts/BusiScenarios/test_CVip003_AddMemberProductsForPurchase.py b/YiMao/ZeroLib/test_CVip003_AddMemberProductsForPurchase.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CVip003_AddMemberProductsForPurchase.py rename to YiMao/ZeroLib/test_CVip003_AddMemberProductsForPurchase.py diff --git a/YiMao/scripts/BusiScenarios/test_CVip004_AddMultipleItemsForPurchase.py b/YiMao/ZeroLib/test_CVip004_AddMultipleItemsForPurchase.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CVip004_AddMultipleItemsForPurchase.py rename to YiMao/ZeroLib/test_CVip004_AddMultipleItemsForPurchase.py diff --git a/YiMao/scripts/BusiScenarios/test_CVip005_AddDiscountedProductsForPurchase.py b/YiMao/ZeroLib/test_CVip005_AddDiscountedProductsForPurchase.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CVip005_AddDiscountedProductsForPurchase.py rename to YiMao/ZeroLib/test_CVip005_AddDiscountedProductsForPurchase.py diff --git a/YiMao/scripts/BusiScenarios/test_CVip006_AddPromotionalWhitelistProducts.py b/YiMao/ZeroLib/test_CVip006_AddPromotionalWhitelistProducts.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CVip006_AddPromotionalWhitelistProducts.py rename to YiMao/ZeroLib/test_CVip006_AddPromotionalWhitelistProducts.py diff --git a/YiMao/scripts/BusiScenarios/test_CVip007_AddWeightToTheProduct.py b/YiMao/ZeroLib/test_CVip007_AddWeightToTheProduct.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CVip007_AddWeightToTheProduct.py rename to YiMao/ZeroLib/test_CVip007_AddWeightToTheProduct.py diff --git a/YiMao/scripts/BusiScenarios/test_CVip008_ReturnShoppingBag.py b/YiMao/ZeroLib/test_CVip008_ReturnShoppingBag.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CVip008_ReturnShoppingBag.py rename to YiMao/ZeroLib/test_CVip008_ReturnShoppingBag.py diff --git a/YiMao/scripts/BusiScenarios/test_CVip009_ReturnPurchaseOfOrdinaryGoods.py b/YiMao/ZeroLib/test_CVip009_ReturnPurchaseOfOrdinaryGoods.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CVip009_ReturnPurchaseOfOrdinaryGoods.py rename to YiMao/ZeroLib/test_CVip009_ReturnPurchaseOfOrdinaryGoods.py diff --git a/YiMao/scripts/BusiScenarios/test_CVip010_ReturnOfMemberProducts.py b/YiMao/ZeroLib/test_CVip010_ReturnOfMemberProducts.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CVip010_ReturnOfMemberProducts.py rename to YiMao/ZeroLib/test_CVip010_ReturnOfMemberProducts.py diff --git a/YiMao/scripts/BusiScenarios/test_CVip011_ReturnOneItemFromMultiplePurchases.py b/YiMao/ZeroLib/test_CVip011_ReturnOneItemFromMultiplePurchases.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CVip011_ReturnOneItemFromMultiplePurchases.py rename to YiMao/ZeroLib/test_CVip011_ReturnOneItemFromMultiplePurchases.py diff --git a/YiMao/scripts/BusiScenarios/test_CVip012_ReturnOfDiscountedProducts.py b/YiMao/ZeroLib/test_CVip012_ReturnOfDiscountedProducts.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CVip012_ReturnOfDiscountedProducts.py rename to YiMao/ZeroLib/test_CVip012_ReturnOfDiscountedProducts.py diff --git a/YiMao/scripts/BusiScenarios/test_CVip013_ReturnPromotionWhitelistProducts.py b/YiMao/ZeroLib/test_CVip013_ReturnPromotionWhitelistProducts.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CVip013_ReturnPromotionWhitelistProducts.py rename to YiMao/ZeroLib/test_CVip013_ReturnPromotionWhitelistProducts.py diff --git a/YiMao/scripts/BusiScenarios/test_CVip014_ReturnWeightOfTheProducte.py b/YiMao/ZeroLib/test_CVip014_ReturnWeightOfTheProducte.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CVip014_ReturnWeightOfTheProducte.py rename to YiMao/ZeroLib/test_CVip014_ReturnWeightOfTheProducte.py diff --git a/YiMao/scripts/BusiScenarios/test_CVip015_AddPieceRateProductsForPurchase.py b/YiMao/ZeroLib/test_CVip015_AddPieceRateProductsForPurchase.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CVip015_AddPieceRateProductsForPurchase.py rename to YiMao/ZeroLib/test_CVip015_AddPieceRateProductsForPurchase.py diff --git a/YiMao/scripts/BusiScenarios/test_CVip016_AddPieceRateProductsAndReturnThem.py b/YiMao/ZeroLib/test_CVip016_AddPieceRateProductsAndReturnThem.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CVip016_AddPieceRateProductsAndReturnThem.py rename to YiMao/ZeroLib/test_CVip016_AddPieceRateProductsAndReturnThem.py diff --git a/YiMao/scripts/BusiScenarios/test_CVip017_AddWeightBasedProductsForPurchase.py b/YiMao/ZeroLib/test_CVip017_AddWeightBasedProductsForPurchase.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CVip017_AddWeightBasedProductsForPurchase.py rename to YiMao/ZeroLib/test_CVip017_AddWeightBasedProductsForPurchase.py diff --git a/YiMao/scripts/BusiScenarios/test_CVip018_PurchaseWeightedGoodsAndReturnThem.py b/YiMao/ZeroLib/test_CVip018_PurchaseWeightedGoodsAndReturnThem.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CVip018_PurchaseWeightedGoodsAndReturnThem.py rename to YiMao/ZeroLib/test_CVip018_PurchaseWeightedGoodsAndReturnThem.py diff --git a/YiMao/scripts/BusiScenarios/test_CVip019_ReceiveCoupon.py b/YiMao/ZeroLib/test_CVip019_ReceiveCoupon.py similarity index 100% rename from YiMao/scripts/BusiScenarios/test_CVip019_ReceiveCoupon.py rename to YiMao/ZeroLib/test_CVip019_ReceiveCoupon.py diff --git a/YiMao/ZeroLib/test_C_.py b/YiMao/ZeroLib/test_C_.py deleted file mode 100644 index 2df47a5..0000000 --- a/YiMao/ZeroLib/test_C_.py +++ /dev/null @@ -1,5 +0,0 @@ -# !/usr/bin/python -# -*- coding: utf-8 -*- -# @Author:: Arthur Wu -# @Description:: 会员登录，领取优惠券 -# @Date:: 2024/11/21 diff --git a/YiMao/scripts/BusiScenarios/test_CAnon010_ReturnOfMemberProducts.py b/YiMao/scripts/BusiScenarios/test_CAnon010_ReturnOfMemberProducts.py index c251a86..71d1dd7 100644 --- a/YiMao/scripts/BusiScenarios/test_CAnon010_ReturnOfMemberProducts.py +++ b/YiMao/scripts/BusiScenarios/test_CAnon010_ReturnOfMemberProducts.py @@ -64,13 +64,17 @@ class Test_CAnon010(unittest.TestCase): AddGoodsInfoAfterDel[k] = v - v2 LOGGER.info(f"---退购商品后，剩余商品及其数量为：{AddGoodsInfoAfterDel}\n") + last_cart_goods_info = [] cart_goods_info = [GetGoodsInfoResp_01, GetGoodsInfoResp_02] for goods_info in cart_goods_info: if goods_info['data']['inputCode'] in AddGoodsInfoAfterDel.keys(): goods_info['data']['qty'] = AddGoodsInfoAfterDel[goods_info['data']['inputCode']] - + if goods_info['data']['qty'] != 0: + last_cart_goods_info.append(goods_info) + else: + last_cart_goods_info.append(goods_info) allure.step("步骤8：获取购物车商品信息") - ymc.get_cart_goods_info(cart_goods_info) + ymc.get_cart_goods_info(last_cart_goods_info) allure.step("步骤9：请求订单结算") ymc.request_order_settlement(LoginData) else: