From b7694003ad1c6872b5dcb719283e7ede30a1c361 Mon Sep 17 00:00:00 2001 From: ieemoo Date: Thu, 21 Nov 2024 17:47:54 +0800 Subject: [PATCH] Arthur-Wu committed this file on 2024-11-21 --- MAIN_YM.py | 16 ++++++++ YiMao/ZeroLib/test_CAnon015_.py | 50 +++++++++++++++++++++++++ YiMao/ZeroLib/test_CAnon016_.py | 5 +++ YiMao/ZeroLib/test_CAnon017_.py | 5 +++ YiMao/ZeroLib/test_CAnon018_.py | 5 +++ YiMao/ZeroLib/test_CAnon019_.py | 5 +++ YiMao/ZeroLib/test_CVip015_.py | 5 +++ YiMao/ZeroLib/test_CVip016_.py | 5 +++ YiMao/ZeroLib/test_CVip017_.py | 5 +++ YiMao/ZeroLib/test_CVip018_.py | 5 +++ YiMao/ZeroLib/test_CVip019_.py | 5 +++ YiMao/ZeroLib/test_C_.py | 5 +++ YiMao/data/前后端联测业务场景梳理.xlsx | Bin 12777 -> 12900 bytes commons/Common.py | 6 +++ commons/EngineX.py | 5 ++- 15 files changed, 125 insertions(+), 2 deletions(-) create mode 100644 YiMao/ZeroLib/test_CAnon015_.py create mode 100644 YiMao/ZeroLib/test_CAnon016_.py create mode 100644 YiMao/ZeroLib/test_CAnon017_.py create mode 100644 YiMao/ZeroLib/test_CAnon018_.py create mode 100644 YiMao/ZeroLib/test_CAnon019_.py create mode 100644 YiMao/ZeroLib/test_CVip015_.py create mode 100644 YiMao/ZeroLib/test_CVip016_.py create mode 100644 YiMao/ZeroLib/test_CVip017_.py create mode 100644 YiMao/ZeroLib/test_CVip018_.py create mode 100644 YiMao/ZeroLib/test_CVip019_.py create mode 100644 YiMao/ZeroLib/test_C_.py diff --git a/MAIN_YM.py b/MAIN_YM.py index 6bc08ce..4f16a40 100644 --- a/MAIN_YM.py +++ b/MAIN_YM.py @@ -32,7 +32,23 @@ import time # if __name__ == "__main__": # main() +''' 加购重量待核验商品 +1、修改商品信息，将重量全改为0，制造成加购时重量待核验物品 +https://api.test.yimaogo.com/admin/goods/8690 +{ + "id": 8690, + "barcode": "6925303796426", + "name": "统一茄皇蕃茄牛肉面", + "goodsBrand": "统一", + "measureProperty": 0, + "standardWeight": 0, # 165 + "minWeight": 0, # 155 + "maxWeight": 0, # 175 + "weightSource": 1, + "pic": "https://ieemoo-storage.obs.cn-east-3.myhuaweicloud.com/lhpic/6925303796426.jpg" +} +''' def print_hi(name): diff --git a/YiMao/ZeroLib/test_CAnon015_.py b/YiMao/ZeroLib/test_CAnon015_.py new file mode 100644 index 0000000..c2f6cd3 --- /dev/null +++ b/YiMao/ZeroLib/test_CAnon015_.py @@ -0,0 +1,50 @@ +# !/usr/bin/python +# -*- coding: utf-8 -*- +# @Author:: Arthur Wu +# @Description:: 匿名加购计件商品，并结算 +# @Date:: 2024/11/21 +import unittest,allure,time +from configs.globalObj import LOGGER +from YiMao.businessFunc.ClientApiLib import YMClientApi +from YiMao.data.WuShangSceneTestData import * + + +DescName = "Anon015-匿名加购计件商品，并结算" +@allure.story(f'[场景测试] {DescName}验证') +class Test_CAnon003(unittest.TestCase): + f'''@Date:: 2024/11/15 + @Author:: Arthur Wu + @Desc:: + [购物车客户端] {DescName} + 1、武商测试环境，计件商品inputcode为： + + ''' + def setUp(self) -> None: + self.timestamp = int(time.time()) + self.ymc = YMClientApi(ShoppingCartMac) + # 会员有优惠商品暂未提供 + self.vip_goods_inputcode = VipGoodsInputcode # 统一番茄牛肉面 + + def test_CAnon003_AddMemberProductsForPurchase(self): + allure.dynamic.description(f"描述：{DescName}") + allure.step("步骤1：session开始") + self.ymc.session_start() + allure.step("步骤2：匿名登录") + Payload01 = {"action": 0, "isAnon": True} + LoginData = self.ymc.login_app_v2(Payload01) + allure.step("步骤3：获取商品信息") + GoodsInfoData = self.ymc.get_goods_info(self.vip_goods_inputcode) + if GoodsInfoData['msg'] != '加购商品不存在': + allure.step("步骤4：添加会员有优惠商品") + self.ymc.add_cart_goods(GoodsInfoData, 1, LoginData) + allure.step("步骤5：获取购物车商品信息") + self.ymc.get_cart_goods_info([GoodsInfoData]) + allure.step("步骤6：请求订单结算") + self.ymc.request_order_settlement(LoginData) + else: + LOGGER.info(f"---商品 {self.vip_goods_inputcode} 不存在") + raise AssertionError(f"商品 {self.vip_goods_inputcode} 不存在") + + +if __name__ == '__main__': + unittest.main(verbosity=2) \ No newline at end of file diff --git a/YiMao/ZeroLib/test_CAnon016_.py b/YiMao/ZeroLib/test_CAnon016_.py new file mode 100644 index 0000000..985eed3 --- /dev/null +++ b/YiMao/ZeroLib/test_CAnon016_.py @@ -0,0 +1,5 @@ +# !/usr/bin/python +# -*- coding: utf-8 -*- +# @Author:: Arthur Wu +# @Description:: 加购计件商品，并退购 +# @Date:: 2024/11/21 diff --git a/YiMao/ZeroLib/test_CAnon017_.py b/YiMao/ZeroLib/test_CAnon017_.py new file mode 100644 index 0000000..04436de --- /dev/null +++ b/YiMao/ZeroLib/test_CAnon017_.py @@ -0,0 +1,5 @@ +# !/usr/bin/python +# -*- coding: utf-8 -*- +# @Author:: Arthur Wu +# @Description:: 加购计重商品，并结算 +# @Date:: 2024/11/21 diff --git a/YiMao/ZeroLib/test_CAnon018_.py b/YiMao/ZeroLib/test_CAnon018_.py new file mode 100644 index 0000000..e18a3ce --- /dev/null +++ b/YiMao/ZeroLib/test_CAnon018_.py @@ -0,0 +1,5 @@ +# !/usr/bin/python +# -*- coding: utf-8 -*- +# @Author:: Arthur Wu +# @Description:: 加购计重商品，并退购 +# @Date:: 2024/11/21 diff --git a/YiMao/ZeroLib/test_CAnon019_.py b/YiMao/ZeroLib/test_CAnon019_.py new file mode 100644 index 0000000..6326b67 --- /dev/null +++ b/YiMao/ZeroLib/test_CAnon019_.py @@ -0,0 +1,5 @@ +# !/usr/bin/python +# -*- coding: utf-8 -*- +# @Author:: Arthur Wu +# @Description:: 加购1件重量待核验商品，无法结算 +# @Date:: 2024/11/21 diff --git a/YiMao/ZeroLib/test_CVip015_.py b/YiMao/ZeroLib/test_CVip015_.py new file mode 100644 index 0000000..1632c67 --- /dev/null +++ b/YiMao/ZeroLib/test_CVip015_.py @@ -0,0 +1,5 @@ +# !/usr/bin/python +# -*- coding: utf-8 -*- +# @Author:: Arthur Wu +# @Description:: 加购计件商品，并结算 +# @Date:: 2024/11/21 diff --git a/YiMao/ZeroLib/test_CVip016_.py b/YiMao/ZeroLib/test_CVip016_.py new file mode 100644 index 0000000..985eed3 --- /dev/null +++ b/YiMao/ZeroLib/test_CVip016_.py @@ -0,0 +1,5 @@ +# !/usr/bin/python +# -*- coding: utf-8 -*- +# @Author:: Arthur Wu +# @Description:: 加购计件商品，并退购 +# @Date:: 2024/11/21 diff --git a/YiMao/ZeroLib/test_CVip017_.py b/YiMao/ZeroLib/test_CVip017_.py new file mode 100644 index 0000000..04436de --- /dev/null +++ b/YiMao/ZeroLib/test_CVip017_.py @@ -0,0 +1,5 @@ +# !/usr/bin/python +# -*- coding: utf-8 -*- +# @Author:: Arthur Wu +# @Description:: 加购计重商品，并结算 +# @Date:: 2024/11/21 diff --git a/YiMao/ZeroLib/test_CVip018_.py b/YiMao/ZeroLib/test_CVip018_.py new file mode 100644 index 0000000..e18a3ce --- /dev/null +++ b/YiMao/ZeroLib/test_CVip018_.py @@ -0,0 +1,5 @@ +# !/usr/bin/python +# -*- coding: utf-8 -*- +# @Author:: Arthur Wu +# @Description:: 加购计重商品，并退购 +# @Date:: 2024/11/21 diff --git a/YiMao/ZeroLib/test_CVip019_.py b/YiMao/ZeroLib/test_CVip019_.py new file mode 100644 index 0000000..6326b67 --- /dev/null +++ b/YiMao/ZeroLib/test_CVip019_.py @@ -0,0 +1,5 @@ +# !/usr/bin/python +# -*- coding: utf-8 -*- +# @Author:: Arthur Wu +# @Description:: 加购1件重量待核验商品，无法结算 +# @Date:: 2024/11/21 diff --git a/YiMao/ZeroLib/test_C_.py b/YiMao/ZeroLib/test_C_.py new file mode 100644 index 0000000..2df47a5 --- /dev/null +++ b/YiMao/ZeroLib/test_C_.py @@ -0,0 +1,5 @@ +# !/usr/bin/python +# -*- coding: utf-8 -*- +# @Author:: Arthur Wu +# @Description:: 会员登录，领取优惠券 +# @Date:: 2024/11/21 diff --git a/YiMao/data/前后端联测业务场景梳理.xlsx b/YiMao/data/前后端联测业务场景梳理.xlsx index 4b9319771c4e67a2d6d792dc1eaf49d4435e443f..822c6480060bb5c2ce6250d38605ea1c736c0a27 100644 GIT binary patch delta 6855 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 Rq9|_;6dnjv&-eH0zW~;I1F8T3 delta 6751 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 diff --git a/commons/Common.py b/commons/Common.py index 4edee42..86dc12f 100644 --- a/commons/Common.py +++ b/commons/Common.py @@ -38,3 +38,9 @@ class Common(): random_integer = generate_24_digit_random_integer() return random_integer + def return_timestamp(self): + timestamp_seconds = time.time() + timestamp_milliseconds = int(timestamp_seconds * 1000) + return str(timestamp_milliseconds) + + diff --git a/commons/EngineX.py b/commons/EngineX.py index 5c98b39..cfe6162 100644 --- a/commons/EngineX.py +++ b/commons/EngineX.py @@ -94,11 +94,12 @@ class NotificationModule(): def __init__(self): self.__headers = {'Content-Type': 'application/json;charset=utf-8'} datainfo = { + "Domain": "https://oapi.dingtalk.com/robot/send?access_token=", "Debug": "7aedbee7239870e3e653748a2889d8bf063c61efa9213c7099bd57476066dc86", "Formal": "80b026022a28166cfc9eebaf8f6a880cc06f56a14b8803e8d67e7fb3cb05844e" } - self.urlInfo = f'https://oapi.dingtalk.com/robot/send?access_token={datainfo["Debug"]}' - # self.urlInfo = f'https://oapi.dingtalk.com/robot/send?access_token={datainfo["Formal"]}' + # self.urlInfo = datainfo["Domain"] + datainfo["Debug"] + self.urlInfo = datainfo["Domain"] + datainfo["Formal"] self.ReportUrl = ProCfgData["ReportsURL"] self.ExecutionEnvironment = ProCfgData["ExecutionEnv"]