python-qdairlines-helper 0.2.1__tar.gz → 0.4.2__tar.gz

{python_qdairlines_helper-0.2.1 → python_qdairlines_helper-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python_qdairlines_helper
-Version: 0.2.1
+Version: 0.4.2
 Summary: qdairlines helper python package
 Author-email: ckf10000 <ckf10000@sina.com>
 License:                                  Apache License
@@ -210,9 +210,9 @@ Project-URL: Issues, https://github.com/ckf10000/python-qdairlines-helper/issues
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: python_playwright_helper>=0.3.7
+Requires-Dist: python_playwright_helper>=0.4.0
 Requires-Dist: python_http_helper>=0.2.1
-Requires-Dist: flight_helper>=0.1.3
+Requires-Dist: flight_helper>=0.3.3
 Dynamic: license-file
 
 # python-qdairlines-helper

{python_qdairlines_helper-0.2.1 → python_qdairlines_helper-0.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python_qdairlines_helper"                  # pip包名（不要大写）
-version = "0.2.1"                                  # 版本号
+version = "0.4.2"                                  # 版本号
 description = "qdairlines helper python package"
 readme = "README.md"
 requires-python = ">=3.12"                         # Python 版本要求
@@ -16,9 +16,9 @@ authors = [
 
 # 运行时依赖
 dependencies = [
-    "python_playwright_helper>=0.3.7",
+    "python_playwright_helper>=0.4.0",
     "python_http_helper>=0.2.1",
-    "flight_helper>=0.1.3"
+    "flight_helper>=0.3.3"
 ]
 
 [project.urls]

{python_qdairlines_helper-0.2.1 → python_qdairlines_helper-0.4.2}/python_qdairlines_helper.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python_qdairlines_helper
-Version: 0.2.1
+Version: 0.4.2
 Summary: qdairlines helper python package
 Author-email: ckf10000 <ckf10000@sina.com>
 License:                                  Apache License
@@ -210,9 +210,9 @@ Project-URL: Issues, https://github.com/ckf10000/python-qdairlines-helper/issues
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: python_playwright_helper>=0.3.7
+Requires-Dist: python_playwright_helper>=0.4.0
 Requires-Dist: python_http_helper>=0.2.1
-Requires-Dist: flight_helper>=0.1.3
+Requires-Dist: flight_helper>=0.3.3
 Dynamic: license-file
 
 # python-qdairlines-helper

{python_qdairlines_helper-0.2.1 → python_qdairlines_helper-0.4.2}/python_qdairlines_helper.egg-info/SOURCES.txt

@@ -23,6 +23,8 @@ qdairlines_helper/controller/pay_success.py
 qdairlines_helper/controller/user_login.py
 qdairlines_helper/http/__init__.py
 qdairlines_helper/http/flight_order.py
+qdairlines_helper/http/http_base.py
+qdairlines_helper/http/user_login.py
 qdairlines_helper/po/__init__.py
 qdairlines_helper/po/add_passenger_page.py
 qdairlines_helper/po/air_order_page.py
@@ -34,5 +36,4 @@ qdairlines_helper/po/nhlms_cash_desk_page.py
 qdairlines_helper/po/order_verify_page.py
 qdairlines_helper/po/pay_success_page.py
 qdairlines_helper/utils/__init__.py
-qdairlines_helper/utils/exception_utils.py
 qdairlines_helper/utils/po_utils.py

python_qdairlines_helper-0.4.2/python_qdairlines_helper.egg-info/requires.txt

@@ -0,0 +1,3 @@
+python_playwright_helper>=0.4.0
+python_http_helper>=0.2.1
+flight_helper>=0.3.3

{python_qdairlines_helper-0.2.1 → python_qdairlines_helper-0.4.2}/qdairlines_helper/config/url_const.py

@@ -26,6 +26,10 @@ order_verify_url: str = "/book/orderVerify"
 cash_pax_info_url: str = "/book/cashPaxInfoInput"
 # https://nhlms.cloudpnr.com/nobel/WebEntry.do  汇付天下收银台
 nhlms_cashdesk_url: str = "/nobel/WebEntry.do"
+# https://nhlms.cloudpnr.com/nobel/n1026/error?RegionId=P
+nhlms_error_url: str = "/nobel/n1026/error"
+
+
 # https://excashier.alipay.com/standard/auth.htm?payOrderId=4e3606b1c842414c88f631c35952a88e.85  支付宝收银台
 alipay_url: str = "/standard/auth.htm"
 # https://www.qdairlines.com/book/payPreCash?orderNo=OW20260105B1154687  微信支付收银台

{python_qdairlines_helper-0.2.1 → python_qdairlines_helper-0.4.2}/qdairlines_helper/controller/add_passenger.py

@@ -14,8 +14,8 @@ from logging import Logger
 from playwright.async_api import Page
 import qdairlines_helper.config.url_const as url_const
 from flight_helper.models.dto.passenger import PassengerDTO
+from flight_helper.utils.exception_utils import IPBlockError
 from flight_helper.models.dto.booking import BookingInputDTO
-from qdairlines_helper.utils.exception_utils import IPBlockError
 from qdairlines_helper.po.add_passenger_page import AddPassengerPage
 from qdairlines_helper.utils.po_utils import get_ip_access_blocked_msg
 

{python_qdairlines_helper-0.2.1 → python_qdairlines_helper-0.4.2}/qdairlines_helper/controller/book_payment.py

@@ -15,15 +15,15 @@ from playwright.async_api import Page
 from typing import Any, List, Callable, Optional, Dict
 from flight_helper.models.dto.passenger import PassengerDTO
 from flight_helper.models.dto.itinerary import QueryItineraryRequestDTO
-from qdairlines_helper.controller.pay_success import two_check_pay_success
-from qdairlines_helper.utils.exception_utils import PaymentChannelMissError
 from flight_helper.models.dto.booking import BookingInputDTO, OneWayBookingDTO
 from qdairlines_helper.controller.book_search import open_book_search_page, book_search
 from qdairlines_helper.controller.order_verify import load_order_verify_po, order_verify
+from flight_helper.utils.exception_utils import PaymentChannelMissError, PaymentTypeError
 from flight_helper.models.dto.payment import HFPaidAccountPaymentInputDTO, PaymentResultDTO
 from qdairlines_helper.controller.add_passenger import add_passenger, load_add_passenger_po
 from qdairlines_helper.controller.cash_pax_info import load_cash_pax_info_po, select_payment_channel
 from qdairlines_helper.controller.nhlms_cashdesk import load_nhlms_cash_desk_po, hf_paid_account_payment
+from qdairlines_helper.controller.pay_success import two_check_pay_success, check_hf_payment_is_success
 
 
 async def book_payment_callback(
@@ -88,28 +88,31 @@ async def book_payment_callback(
             domain=hf_paid_account_payment_dto.pay_domain, protocol=hf_paid_account_payment_dto.pay_protocol
         )
 
+        if hf_paid_account_payment_dto.payment_type != "付款账户支付":
+            raise PaymentTypeError(payment_type=hf_paid_account_payment_dto.payment_type)
+
         # 10. 汇付天下操作支付
-        if hf_paid_account_payment_dto.payment_type == "付款账户支付":
-            # 10. 汇付天下操作支付
-            payment_result_dto = await hf_paid_account_payment(
-                page=nhlms_cash_desk_po, logger=logger, order_no=pre_order_no, timeout=timeout,
-                is_pay_completed_callback=is_pay_completed_callback,
-                hf_paid_account_payment_dto=hf_paid_account_payment_dto
-            )
-            logger.info(f"订单<{one_way_booking_dto.order_no}>，汇付天下操作支付结束")
-            payment_result_dto.pre_order_no = pre_order_no
+        payment_result_dto = await hf_paid_account_payment(
+            page=nhlms_cash_desk_po, logger=logger, order_no=one_way_booking_dto.order_no, timeout=timeout,
+            is_pay_completed_callback=is_pay_completed_callback,
+            hf_paid_account_payment_dto=hf_paid_account_payment_dto
+        )
+        logger.info(f"订单<{one_way_booking_dto.order_no}>，汇付天下操作支付结束")
+        payment_result_dto.pre_order_no = pre_order_no
 
-            query_dto = QueryItineraryRequestDTO(
-                payment_domain=book_input_dto.book_domain, payment_protocol=book_input_dto.book_protocol,
-                storage_state=qdair_cookie.get("storage_state"), token=qdair_cookie.get("token"),
-                pre_order_no=pre_order_no, user_id=qdair_cookie.get("user_id"), headers=qdair_cookie.get("headers")
-            )
+        query_dto = QueryItineraryRequestDTO(
+            payment_domain=book_input_dto.book_domain, payment_protocol=book_input_dto.book_protocol,
+            storage_state=qdair_cookie.get("storage_state"), token=qdair_cookie.get("token"),
+            pre_order_no=pre_order_no, user_id=qdair_cookie.get("user_id"), headers=qdair_cookie.get("headers")
+        )
 
-            # 11. 检查是否支付成功
+        # 11. 检查是否支付成功
+        if kwargs.get("暂时不走这个逻辑，改用轻逻辑验证"):
             await two_check_pay_success(
                 page=page, logger=logger, timeout=timeout, query_dto=query_dto, retry=retry, enable_log=enable_log,
                 callback_get_proxy=callback_get_proxy, cookie_jar=cookie_jar
             )
-            return payment_result_dto
+        await check_hf_payment_is_success(page=nhlms_cash_desk_po, logger=logger)
+        return payment_result_dto
     else:
         raise PaymentChannelMissError()

{python_qdairlines_helper-0.2.1 → python_qdairlines_helper-0.4.2}/qdairlines_helper/controller/book_search.py

@@ -9,16 +9,18 @@
 # Copyright ©2011-2026. Hunan xxxxxxx Company limited. All rights reserved.
 # ---------------------------------------------------------------------------------------------------------
 """
+import time
 import asyncio
 from logging import Logger
-from typing import Dict, Any
+from typing import Dict, Any, List, Optional
 from playwright.async_api import Page, Locator
 import qdairlines_helper.config.url_const as url_const
-from qdairlines_helper.utils.exception_utils import IPBlockError
 from qdairlines_helper.po.book_search_page import BookSearchPage
 from qdairlines_helper.utils.po_utils import get_ip_access_blocked_msg
+from playwright.async_api import TimeoutError as PlaywrightTimeoutError
 from flight_helper.models.dto.booking import OneWayBookingDTO, BookingInputDTO
-from qdairlines_helper.utils.exception_utils import NotEnoughTicketsError, ExcessiveProfitdError, ExcessiveLossesError
+from flight_helper.utils.exception_utils import NotEnoughTicketsError, ExcessiveProfitdError, ExcessiveLossesError, \
+    IPBlockError
 
 
 async def open_book_search_page(
@@ -37,58 +39,72 @@ async def open_book_search_page(
     return book_search_po
 
 
-async def _book_search_dialog_handle(*, logger: Logger, page: BookSearchPage, timeout: float = 60.0):
-    try:
-        # 1. 获取页面的空数据状态, 看看当前默认状态是不是空数据页，非空数据页，要处理弹框
-        await page.get_empyt_data_page(timeout=timeout)
-        continue_book_btn = await page.get_reminder_dialog_continue_book_btn(timeout=timeout)
-        await continue_book_btn.click(button="left")
-        logger.info("航班预订查询页面，出现温馨提醒弹框，【继续购票】按钮点击完成")
-    except (Exception,):
-        pass
+async def _book_search_dialog_handle(
+        *, logger: Logger, page: BookSearchPage, flight_no: str, timeout: float = 60.0
+) -> Locator:
+    end_time = time.time() + timeout
+    last_exception: Optional[Exception] = None
+    while time.time() < end_time:
+        try:
+            # 2. 点击继续购票按钮
+            continue_book_btn = await page.get_reminder_dialog_continue_book_btn(timeout=1)
+            await continue_book_btn.click(button="left")
+            logger.info("航班预订查询页面，出现温馨提醒弹框，【继续购票】按钮点击完成")
+        except (Exception,):
+            pass
+        try:
+            # 1.获取航班基本信息plane locator
+            flight_info_plane: Locator = await page.get_flight_info_plane(flight_no=flight_no, timeout=1)
+            return flight_info_plane
+        except (PlaywrightTimeoutError,) as e:
+            last_exception = e
+        except (Exception,):
+            raise
+    raise last_exception
 
 
 async def book_search(
         *, book_search_page: BookSearchPage, logger: Logger, passengers: int, book_input_dto: BookingInputDTO,
         one_way_booking_dto: OneWayBookingDTO, timeout: float = 60.0
 ) -> None:
-    # 1. 处理是否有弹框（默认打开，不会有弹框，肯定会没数据）
-    # await _book_search_dialog_handle(logger=logger, page=book_search_page, timeout=timeout)
-
-    # 2.搜索栏输入起飞城市
+    # 1.搜索栏输入起飞城市
     depart_city_input = await book_search_page.get_depart_city_input(timeout=timeout)
     await depart_city_input.fill(value=one_way_booking_dto.dep_code)
-    await asyncio.sleep(delay=1)
+    await asyncio.sleep(delay=2)
     await depart_city_input.press("Enter")
-    logger.info(f"航班预订查询页面，搜索栏-起飞城市<{one_way_booking_dto.dep_code}>输入完成")
+    logger.info(
+        f"航班预订查询页面，搜索栏-起飞城市<{one_way_booking_dto.dep_city} {one_way_booking_dto.dep_code}>输入完成")
 
-    # 3.搜索栏输入抵达城市
+    # 2.搜索栏输入抵达城市
     arrive_city_input = await book_search_page.get_arrive_city_input(timeout=timeout)
     await arrive_city_input.fill(value=one_way_booking_dto.arr_code)
-    await asyncio.sleep(delay=1)
+    await asyncio.sleep(delay=2)
     await arrive_city_input.press("Enter")
-    logger.info(f"航班预订查询页面，搜索栏-抵达城市<{one_way_booking_dto.arr_code}>输入完成")
+    logger.info(
+        f"航班预订查询页面，搜索栏-抵达城市<{one_way_booking_dto.arr_city} {one_way_booking_dto.arr_code}>输入完成")
 
-    # 4.搜索栏输入起飞时间
+    # 3.搜索栏输入起飞时间
     depart_date_input = await book_search_page.get_depart_date_input(timeout=timeout)
     await depart_date_input.fill(value=one_way_booking_dto.dep_date)
     await asyncio.sleep(delay=1)
     await depart_date_input.press("Enter")
     logger.info(f"航班预订查询页面，搜索栏-起飞日期<{one_way_booking_dto.dep_date}>输入完成")
 
-    # 5.点击【查询机票】按钮
+    # 4.点击【查询机票】按钮
     flight_query_btn = await book_search_page.get_flight_query_btn(timeout=timeout)
     await flight_query_btn.click(button="left")
     logger.info(f"航班预订查询页面，【查询机票】按钮点击完成")
 
-    # 6. 点击查询后，再次处理是否有弹框
-    await _book_search_dialog_handle(logger=logger, page=book_search_page, timeout=timeout)
-
-    # 7. 获取航班基本信息plane locator
-    flight_info_plane: Locator = await book_search_page.get_flight_info_plane(
-        flight_no=one_way_booking_dto.flight_no, timeout=timeout
+    # 5.点击查询后，再次处理是否有弹框，并航班基本信息plane locator
+    flight_info_plane: Locator = await _book_search_dialog_handle(
+        logger=logger, page=book_search_page, timeout=timeout, flight_no=one_way_booking_dto.flight_no
     )
 
+    # 6.获取航班基本信息plane locator
+    # flight_info_plane: Locator = await book_search_page.get_flight_info_plane(
+    #     flight_no=one_way_booking_dto.flight_no, timeout=timeout
+    # )
+
     # 8. 获取产品类型
     flight_product_nav: Locator = await book_search_page.get_flight_product_nav(
         locator=flight_info_plane, product_type=book_input_dto.product_type, timeout=timeout
@@ -96,13 +112,24 @@ async def book_search(
     await flight_product_nav.click(button="left")
     logger.info(f"航班预订查询页面，产品类型【{book_input_dto.product_type}】选择完成")
 
+    # 9. 点击获取更多产品和价格的按钮
+    more_product_btn = await book_search_page.get_more_product_btn(locator=flight_info_plane, timeout=timeout)
+    await more_product_btn.click(button="left")
+    logger.info(f"航班预订查询页面，航班<{one_way_booking_dto.flight_no}>产品列表，【更多舱位及价格】按钮点击完成")
+
     # 9. 获取所有的产品
-    products: Dict[str, Any] = await book_search_page.get_flight_products(timeout=timeout)
-    cabin_product: Dict[str, Any] = products.get(one_way_booking_dto.cabin)
+    products: List[Dict[str, Any]] = await book_search_page.get_flight_products(
+        locator=flight_info_plane, flight_no=one_way_booking_dto.flight_no, logger=logger
+    )
+    # 取出需要预订的舱位产品
+    products = [x for x in products if x.get("cabin")]
+    # 根据价格升序排序（默认）
+    products = sorted(products, key=lambda x: x["amounts"]["amount"])
     # 9.1 判断是否存在该舱位
-    if not cabin_product:
+    if len(products) == 0:
         raise RuntimeError(
             f"航班预订查询页面，没有搜索到航班<{one_way_booking_dto.flight_no}>的{one_way_booking_dto.cabin}舱数据")
+    cabin_product = products[0]
     # 9.2 判断余座
     seats_status = cabin_product.get("seats_status")
     logger.info(

{python_qdairlines_helper-0.2.1 → python_qdairlines_helper-0.4.2}/qdairlines_helper/controller/cash_pax_info.py

@@ -12,7 +12,7 @@
 from logging import Logger
 from playwright.async_api import Page
 import qdairlines_helper.config.url_const as url_const
-from qdairlines_helper.utils.exception_utils import IPBlockError
+from flight_helper.utils.exception_utils import IPBlockError
 from qdairlines_helper.po.cash_pax_info_page import CashPaxInfoPage
 from qdairlines_helper.utils.po_utils import get_ip_access_blocked_msg
 

{python_qdairlines_helper-0.2.1 → python_qdairlines_helper-0.4.2}/qdairlines_helper/controller/home.py

@@ -13,7 +13,7 @@ from logging import Logger
 from playwright.async_api import Page
 from qdairlines_helper.po.home_page import HomePage
 import qdairlines_helper.config.url_const as url_const
-from qdairlines_helper.utils.exception_utils import IPBlockError
+from flight_helper.utils.exception_utils import IPBlockError
 from qdairlines_helper.utils.po_utils import get_ip_access_blocked_msg
 
 

{python_qdairlines_helper-0.2.1 → python_qdairlines_helper-0.4.2}/qdairlines_helper/controller/nhlms_cashdesk.py

@@ -14,9 +14,9 @@ from logging import Logger
 from typing import Callable
 from playwright.async_api import BrowserContext
 import qdairlines_helper.config.url_const as url_const
+from flight_helper.utils.exception_utils import DuplicatePaymentError
 from qdairlines_helper.po.nhlms_cash_desk_page import NhlmsCashDeskPage
 from playwright_helper.utils.browser_utils import switch_for_table_window
-from qdairlines_helper.utils.exception_utils import DuplicatePaymentError
 from flight_helper.models.dto.payment import HFPaidAccountPaymentInputDTO, PaymentResultDTO
 
 
@@ -37,7 +37,7 @@ async def load_nhlms_cash_desk_po(
 
 
 async def hf_paid_account_payment(
-        *, page: NhlmsCashDeskPage, logger: Logger, order_no: str, is_pay_completed_callback: Callable,
+        *, page: NhlmsCashDeskPage, logger: Logger, order_no: int, is_pay_completed_callback: Callable,
         hf_paid_account_payment_dto: HFPaidAccountPaymentInputDTO, timeout: float = 60.0
 ) -> PaymentResultDTO:
     # 1. 获取收银台支付流水

python_qdairlines_helper-0.4.2/qdairlines_helper/controller/order_detail.py

@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+"""
+# ---------------------------------------------------------------------------------------------------------
+# ProjectName:  python-qdairlines-helper
+# FileName:     order_detail.py
+# Description:  订单详情控制器
+# Author:       ASUS
+# CreateDate:   2026/01/06
+# Copyright ©2011-2026. Hunan xxxxxxx Company limited. All rights reserved.
+# ---------------------------------------------------------------------------------------------------------
+"""
+import re
+import inspect
+from logging import Logger
+from aiohttp import CookieJar
+from typing import Dict, Any, Optional, List, Callable
+from qdairlines_helper.http.flight_order import FlightOrder
+from flight_helper.models.dto.http_schema import HTTPRequestDTO
+from flight_helper.models.dto.itinerary import QueryItineraryResponseDTO, QueryItineraryRequestDTO
+
+
+async def get_order_detail(
+        *, query_dto: QueryItineraryRequestDTO, logger: Logger, callback_get_proxy: Callable,
+        timeout: Optional[int] = None, retry: Optional[int] = None, cookie_jar: Optional[CookieJar] = None,
+        enable_log: Optional[bool] = None
+) -> Dict[str, Any]:
+    http_request_dto = HTTPRequestDTO(
+        http_domain=query_dto.payment_domain, http_protocol=query_dto.payment_protocol,
+        storage_state=query_dto.storage_state, timeout=timeout, retry=retry, enable_log=enable_log,
+        token=query_dto.token
+    )
+    flight_order = FlightOrder(http_request_dto=http_request_dto, cookie_jar=cookie_jar)
+    last_order_info: Dict[str, Any] = dict()
+    for index in range(5):
+        proxy = None
+        is_end: bool = True if index + 1 == 5 else False
+        if index != 0:
+            if inspect.iscoroutinefunction(callback_get_proxy):
+                proxy = await callback_get_proxy(logger=logger)
+            else:
+                proxy = callback_get_proxy(logger=logger)
+        try:
+            last_order_info = await flight_order.get_order_details(
+                pre_order_no=query_dto.pre_order_no, user_id=query_dto.user_id, is_end=is_end, proxy=proxy,
+                headers=query_dto.headers,
+            )
+            await flight_order.http_client.close()
+            logger.info("查询青岛航空官网的订单详情数据成功")
+            break
+        except (Exception,):
+            pass
+    if isinstance(last_order_info, dict) and last_order_info.get("result") and last_order_info.get("code") == 1:
+        return last_order_info.get("result")
+    else:
+        raise RuntimeError(f"订单<{query_dto.pre_order_no}>，获取详情数据异常，返回值：{last_order_info}")
+
+
+async def get_order_itinerary(
+        *, query_dto: QueryItineraryRequestDTO, logger: Logger, callback_get_proxy: Callable,
+        timeout: Optional[int] = None, retry: Optional[int] = None, cookie_jar: Optional[CookieJar] = None,
+        enable_log: Optional[bool] = None
+) -> Optional[QueryItineraryResponseDTO]:
+    _order_info: Dict[str, Any] = dict(pre_order_no=query_dto.pre_order_no)
+    result = await get_order_detail(
+        query_dto=query_dto, timeout=timeout, retry=retry, cookie_jar=cookie_jar, enable_log=enable_log,
+        callback_get_proxy=callback_get_proxy, logger=logger
+    )
+    _order_info["cash_unit"] = result.get("cashUnit")
+    _order_info["order_status"] = result.get("orderStatus")
+    _order_info["order_amount"] = result.get("totalPrice")
+    passenger_infos: List[Dict[str, Any]] = result.get("passengerInfoVoList")
+    order_itineraries = list()
+    for passenger_info in passenger_infos:
+        id_no = passenger_info.get("idNo")
+        order_itinerary = passenger_info.get("tktNo")
+        passenger = passenger_info.get("passName")
+        if bool(re.fullmatch(r'\d+-\d+', order_itinerary)):
+            order_itineraries.append(dict(
+                passenger_name=passenger, id_no=id_no, order_itinerary=order_itinerary,
+                pre_order_no=query_dto.pre_order_no
+            ))
+    if order_itineraries:
+        _order_info["itinerary_info"] = order_itineraries
+        return QueryItineraryResponseDTO(**_order_info)
+    else:
+        logger.warning(
+            f'青岛航空官网订单<{query_dto.pre_order_no}>，当前状态：{result.get("orderStatus")}，没有生成行程单信息')

{python_qdairlines_helper-0.2.1 → python_qdairlines_helper-0.4.2}/qdairlines_helper/controller/order_query.py

@@ -14,7 +14,7 @@ from logging import Logger
 from playwright.async_api import Page
 import qdairlines_helper.config.url_const as url_const
 from qdairlines_helper.po.air_order_page import AirOrderPage
-from qdairlines_helper.utils.exception_utils import IPBlockError
+from flight_helper.utils.exception_utils import IPBlockError
 from qdairlines_helper.utils.po_utils import get_ip_access_blocked_msg
 
 

{python_qdairlines_helper-0.2.1 → python_qdairlines_helper-0.4.2}/qdairlines_helper/controller/order_verify.py

@@ -12,7 +12,7 @@
 from logging import Logger
 from playwright.async_api import Page
 import qdairlines_helper.config.url_const as url_const
-from qdairlines_helper.utils.exception_utils import IPBlockError
+from flight_helper.utils.exception_utils import IPBlockError
 from qdairlines_helper.po.order_verify_page import OrderVerifyPage
 from qdairlines_helper.utils.po_utils import get_ip_access_blocked_msg
 

{python_qdairlines_helper-0.2.1 → python_qdairlines_helper-0.4.2}/qdairlines_helper/controller/pay_success.py

@@ -9,17 +9,17 @@
 # Copyright ©2011-2026. Hunan xxxxxxx Company limited. All rights reserved.
 # ---------------------------------------------------------------------------------------------------------
 """
-import inspect
 from logging import Logger
 from aiohttp import CookieJar
 from playwright.async_api import Page
 from typing import Dict, Any, Optional, Callable
 import qdairlines_helper.config.url_const as url_const
 from qdairlines_helper.po.pay_success_page import PaySuccessPage
+from qdairlines_helper.po.nhlms_cash_desk_page import NhlmsCashDeskPage
 from qdairlines_helper.utils.po_utils import get_ip_access_blocked_msg
 from qdairlines_helper.controller.order_detail import get_order_detail
 from flight_helper.models.dto.itinerary import QueryItineraryRequestDTO
-from qdairlines_helper.utils.exception_utils import IPBlockError, PaymentFailedError
+from flight_helper.utils.exception_utils import IPBlockError, PaymentFailedError
 
 
 async def load_pay_success_page(
@@ -52,15 +52,16 @@ async def two_check_pay_success(
     except Exception as e:
         logger.error(e)
 
-    if inspect.iscoroutinefunction(callback_get_proxy):
-        query_dto.proxy = await callback_get_proxy(logger=logger)
-    else:
-        query_dto.proxy = callback_get_proxy(logger=logger)
-
     # 2. 尝试取查询票号，看订单状态，是 BOOKED，还是 TICKETED
     order_detail: Dict[str, Any] = await get_order_detail(
         query_dto=query_dto, timeout=int(timeout), retry=retry, enable_log=enable_log, cookie_jar=cookie_jar,
+        callback_get_proxy=callback_get_proxy, logger=logger
     )
     order_status = (order_detail.get("orderStatus", "")).upper()
     if order_status not in ("TICKED",):
         raise PaymentFailedError(pre_order_no=query_dto.pre_order_no, order_status=order_status)
+
+
+async def check_hf_payment_is_success(*, page: NhlmsCashDeskPage, logger: Logger) -> None:
+    # 1. 看支付成功页面是否加载完成
+    await page.check_is_pay_success(logger=logger)

{python_qdairlines_helper-0.2.1 → python_qdairlines_helper-0.4.2}/qdairlines_helper/controller/user_login.py

@@ -9,13 +9,17 @@
 # Copyright ©2011-2026. Hunan xxxxxxx Company limited. All rights reserved.
 # ---------------------------------------------------------------------------------------------------------
 """
+import inspect
 from logging import Logger
-from typing import Dict, Any
+from aiohttp import CookieJar
+from typing import Dict, Any, Optional, Callable
 from playwright.async_api import Page, BrowserContext
 from qdairlines_helper.po.login_page import LoginPage
 import qdairlines_helper.config.url_const as url_const
+from qdairlines_helper.http.user_login import UserLogin
 from qdairlines_helper.controller.home import load_home_po
-from qdairlines_helper.utils.exception_utils import IPBlockError
+from flight_helper.utils.exception_utils import IPBlockError
+from flight_helper.models.dto.http_schema import HTTPRequestDTO
 from playwright.async_api import Error as PlaywrightError, TimeoutError as PlaywrightTimeoutError
 from qdairlines_helper.utils.po_utils import get_ip_access_blocked_msg, parse_user_info_from_page_response
 
@@ -94,3 +98,32 @@ async def user_login_callback(
     user_info = parse_user_info_from_page_response(network_logs=network_logs)
     user_info.update(dict(storage_state=await context.storage_state()))
     return user_info
+
+
+async def get_user_info(
+        *, logger: Logger, http_request_dto: HTTPRequestDTO, callback_get_proxy: Callable,
+        cookie_jar: Optional[CookieJar] = None
+) -> Dict[str, Any]:
+    user_login = UserLogin(http_request_dto=http_request_dto, cookie_jar=cookie_jar)
+    last_user_info: Dict[str, Any] = dict()
+    for index in range(5):
+        proxy = None
+        is_end: bool = True if index + 1 == 5 else False
+        if index != 0:
+            if inspect.iscoroutinefunction(callback_get_proxy):
+                proxy = await callback_get_proxy(logger=logger)
+            else:
+                proxy = callback_get_proxy(logger=logger)
+        try:
+            last_user_info = await user_login.get_user_info(
+                is_end=is_end, proxy=proxy, headers=http_request_dto.headers
+            )
+            await user_login.http_client.close()
+            logger.info("获取青岛航空官网的用户详情数据成功")
+            break
+        except (Exception,):
+            pass
+    if isinstance(last_user_info, dict) and last_user_info.get("result") and last_user_info.get("code") == 1:
+        return last_user_info.get("result")
+    else:
+        raise RuntimeError(f"获取用户详情数据异常，返回值：{last_user_info}")

python_qdairlines_helper-0.4.2/qdairlines_helper/http/flight_order.py

@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+"""
+# ---------------------------------------------------------------------------------------------------------
+# ProjectName:  python-qdairlines-helper
+# FileName:     flight_order.py
+# Description:  航班订单模块
+# Author:       ASUS
+# CreateDate:   2026/01/06
+# Copyright ©2011-2026. Hunan xxxxxxx Company limited. All rights reserved.
+# ---------------------------------------------------------------------------------------------------------
+"""
+from aiohttp import CookieJar
+from typing import Optional, Dict, Any
+from qdairlines_helper.http.http_base import HttpBase
+import qdairlines_helper.config.url_const as url_const
+from flight_helper.models.dto.http_schema import HTTPRequestDTO
+
+
+class FlightOrder(HttpBase):
+
+    def __init__(self, *, http_request_dto: HTTPRequestDTO, cookie_jar: Optional[CookieJar] = None):
+        super().__init__(http_request_dto=http_request_dto, cookie_jar=cookie_jar)
+
+    async def get_order_details(
+            self, *, pre_order_no: str, user_id: str, proxy: Optional[Dict[str, Any]] = None,
+            headers: Dict[str, str] = None, is_end: Optional[bool] = None
+    ) -> Dict[str, Any]:
+        json_data = {
+            "orderNo": pre_order_no,
+            "plat": "NB2C",
+            "userId": user_id
+        }
+        _headers = self._get_headers()
+        if headers is not None:
+            _headers.update(headers)
+        _headers["referer"] = f"{self._origin}{url_const.order_detail_url}?orderNo={pre_order_no}&orderType=2"
+        if is_end is None:
+            is_end = True
+        if proxy:
+            self._proxy = proxy
+        exception_keywords = [r'<h3[^>]*class="font-bold"[^>]*>([^<]+)</h3>']
+        return await self._get_http_client().request(
+            method="POST",
+            url=url_const.order_info_api_url,
+            headers=_headers,
+            is_end=is_end,
+            json_data=json_data,
+            proxy_config=self._proxy or None,
+            exception_keywords=exception_keywords
+        )

python_qdairlines_helper-0.4.2/qdairlines_helper/http/http_base.py

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+"""
+# ---------------------------------------------------------------------------------------------------------
+# ProjectName:  python-qdairlines-helper
+# FileName:     http_base.py
+# Description:  http基础模块
+# Author:       ASUS
+# CreateDate:   2026/01/13
+# Copyright ©2011-2026. Hunan xxxxxxx Company limited. All rights reserved.
+# ---------------------------------------------------------------------------------------------------------
+"""
+from aiohttp import CookieJar
+from typing import Optional, Dict, Any
+from flight_helper.models.dto.http_schema import HTTPRequestDTO
+from http_helper.client.async_proxy import HttpClientFactory as _HttpClientFactory
+
+
+class HttpBase(object):
+
+    def __init__(self, *, http_request_dto: HTTPRequestDTO, cookie_jar: Optional[CookieJar] = None):
+        self._domain = http_request_dto.http_domain or "127.0.0.1:18070"
+        self._protocol = http_request_dto.http_protocol or "http"
+        self._timeout = http_request_dto.timeout or 60
+        self._retry = http_request_dto.retry or 0
+        self._token = http_request_dto.token
+        self._origin = f"{self._protocol}://{self._domain}"
+        self._enable_log = http_request_dto.enable_log if http_request_dto.enable_log is not None else True
+        self._cookie_jar = cookie_jar or CookieJar()
+        self._proxy = http_request_dto.proxy
+        self._playwright_state: Dict[str, Any] = http_request_dto.storage_state
+        self.http_client: Optional[_HttpClientFactory] = None
+
+    def _get_http_client(self) -> _HttpClientFactory:
+        """延迟获取 HTTP 客户端"""
+        if self.http_client is None:
+            self.http_client = _HttpClientFactory(
+                protocol=self._protocol,
+                domain=self._domain,
+                timeout=self._timeout,
+                retry=self._retry,
+                enable_log=self._enable_log,
+                cookie_jar=self._cookie_jar,
+                playwright_state=self._playwright_state
+            )
+        return self.http_client
+
+    def _get_headers(self) -> Dict[str, str]:
+        headers = {
+            "content-type": "application/json;charset=utf-8",
+            "origin": self._domain,
+            "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/143.0.0.0 Safari/537.36",
+            "authorization": f"Bearer {self._token}"
+        }
+        return headers

python_qdairlines_helper-0.4.2/qdairlines_helper/http/user_login.py

@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+"""
+# ---------------------------------------------------------------------------------------------------------
+# ProjectName:  python-qdairlines-helper
+# FileName:     user_login.py
+# Description:  用户登录模块
+# Author:       ASUS
+# CreateDate:   2026/01/13
+# Copyright ©2011-2026. Hunan xxxxxxx Company limited. All rights reserved.
+# ---------------------------------------------------------------------------------------------------------
+"""
+from aiohttp import CookieJar
+from typing import Optional, Dict, Any
+from qdairlines_helper.http.http_base import HttpBase
+import qdairlines_helper.config.url_const as url_const
+from flight_helper.models.dto.http_schema import HTTPRequestDTO
+
+
+class UserLogin(HttpBase):
+    def __init__(self, *, http_request_dto: HTTPRequestDTO, cookie_jar: Optional[CookieJar] = None):
+        super().__init__(http_request_dto=http_request_dto, cookie_jar=cookie_jar)
+
+    async def get_user_info(
+            self, *, proxy: Optional[Dict[str, Any]] = None, headers: Dict[str, str] = None,
+            is_end: Optional[bool] = None
+    ) -> Dict[str, Any]:
+        _headers = self._get_headers()
+        if headers is not None:
+            _headers.update(headers)
+        _headers["referer"] = f"{self._origin}{url_const.login_url}"
+        if is_end is None:
+            is_end = True
+        if proxy:
+            self._proxy = proxy
+        exception_keywords = [r'<h3[^>]*class="font-bold"[^>]*>([^<]+)</h3>']
+        return await self._get_http_client().request(
+            method="GET",
+            url=url_const.login_after_api_url,
+            headers=_headers,
+            is_end=is_end,
+            proxy_config=self._proxy or None,
+            exception_keywords=exception_keywords
+        )

{python_qdairlines_helper-0.2.1 → python_qdairlines_helper-0.4.2}/qdairlines_helper/po/add_passenger_page.py

@@ -13,7 +13,7 @@ from typing import Optional
 from playwright.async_api import Page, Locator
 from playwright_helper.libs.base_po import BasePo
 import qdairlines_helper.config.url_const as url_const
-from qdairlines_helper.utils.exception_utils import PassengerTypeError
+from flight_helper.utils.exception_utils import PassengerTypeError
 
 
 class AddPassengerPage(BasePo):

{python_qdairlines_helper-0.2.1 → python_qdairlines_helper-0.4.2}/qdairlines_helper/po/book_search_page.py

@@ -10,11 +10,12 @@
 # ---------------------------------------------------------------------------------------------------------
 """
 import re
+from logging import Logger
 from typing import Optional, Dict, Any, List
 from playwright.async_api import Page, Locator
 from playwright_helper.libs.base_po import BasePo
 import qdairlines_helper.config.url_const as url_const
-from qdairlines_helper.utils.exception_utils import ProductTypeError
+from flight_helper.utils.exception_utils import ProductTypeError
 from playwright_helper.utils.type_utils import convert_order_amount_text, safe_convert_advanced
 from playwright.async_api import Error as PlaywrightError, TimeoutError as PlaywrightTimeoutError
 
@@ -91,7 +92,7 @@ class BookSearchPage(BasePo):
         try:
             selector: str = f'//div[contains(@class, "flight_qda")]/span[contains(text(), "{flight_no}")]/../../../..'
             return await self.get_locator(selector=selector, timeout=timeout)
-        except (Exception, ):
+        except (Exception,):
             raise RuntimeError(f"航班预订查询页面，没有搜索到航班<{flight_no}>数据")
 
     async def get_flight_product_nav(self, locator: Locator, product_type: str, timeout: float = 5.0) -> Locator:
@@ -113,26 +114,41 @@ class BookSearchPage(BasePo):
         selector: str = f'xpath=(.//div[contains(@class, "nav_item el-col el-col-24")])[{index}]'
         return await self.get_sub_locator(locator=locator, selector=selector, timeout=timeout)
 
-    async def get_flight_products(self, timeout: float = 5.0) -> Dict[str, Any]:
+    async def get_more_product_btn(self, locator: Locator, timeout: float = 5.0) -> Locator:
         """
-        获取预订搜索页航班内容栏所有航班产品
+        获取预订搜索页航班列表更多产品
         :param timeout: 超时时间（秒）
+        :param locator: flight_info_plane Locator 对象
+        :return: (是否存在, 错误信息|元素对象)
+        """
+        selector: str = f'xpath=.//span[@class="fa el-icon-caret-bottom"]'
+        return await self.get_sub_locator(locator=locator, selector=selector, timeout=timeout)
+
+    async def get_flight_products(self, locator: Locator, logger: Logger, flight_no: str) -> List[Dict[str, Any]]:
+        """
+        获取预订搜索页航班内容栏所有航班产品
+        :param locator: flight_info_plane Locator 对象
+        :param logger: Logger 对象，日志记录
+        :param flight_no: 航班编号
         :return: (是否存在, 错误信息|元素对象)
         """
-        selector: str = '//div[@class="airlines_cont"]//div[@class="text-center cabinClasses_info el-row" and not(@style="display: none;")]/table/tbody/tr'
-        products_locator: Locator = await self.get_locator(selector=selector, timeout=timeout)
+        timeout: float = 1.0
+        selector: str = 'xpath=.//div[@class="text-center cabinClasses_info el-row" and not(@style="display: none;")]//table/tbody/tr[not(@class)]/td[@class]/..'
+        products_locator: Locator = await self.get_sub_locator(locator=locator, selector=selector, timeout=timeout)
         locators: List[Locator] = await products_locator.all()
-        flight_products = dict()
+        flight_products = list()
+        logger.info(f"当前找到了关于航班<{flight_no}>的<{len(locators)}>条产品数据")
         for locator in locators:
             try:
                 booking_btn: Locator = await self._get_flight_product_booking_btn(locator=locator, timeout=timeout)
                 amounts: Dict[str, Any] = await self._get_flight_product_price(locator=locator, timeout=timeout)
                 seats_status: int = await self._get_flight_product_seats_status(locator=locator, timeout=timeout)
                 cabin = await self._get_flight_product_cabin(locator=locator, timeout=timeout)
-                flight_products[cabin] = dict(
+                flight_products.append(dict(
                     amounts=amounts, cabin=cabin, seats_status=seats_status, booking_btn=booking_btn
-                )
+                ))
             except (PlaywrightError, PlaywrightTimeoutError, EnvironmentError, RuntimeError, Exception) as e:
+                logger.error(e)
                 continue
         return flight_products
 
@@ -145,7 +161,7 @@ class BookSearchPage(BasePo):
         """
         selector: str = 'xpath=.//div[@class="ticket_clazz"]/div/span'
         locator: Locator = await self.get_sub_locator(locator=locator, selector=selector, timeout=timeout)
-        text: str = (await locator.inner_text(timeout=timeout)).strip()
+        text: str = (await locator.inner_text(timeout=timeout * 1000)).strip()
         match = re.search(r'\((.*?)舱\)', text)
         if match:
             return match.group(1).strip()
@@ -158,9 +174,9 @@ class BookSearchPage(BasePo):
         :param locator: flight_product Locator 对象
         :return: (是否存在, 错误信息|元素对象)
         """
-        selector: str = 'xpath=.//div[@class="price_flex_top"]/span'
+        selector: str = 'xpath=.//div[@class="price_flex_top"]'
         locator: Locator = await self.get_sub_locator(locator=locator, selector=selector, timeout=timeout)
-        amount_text: str = (await locator.inner_text(timeout=timeout)).strip()
+        amount_text: str = (await locator.inner_text(timeout=timeout * 1000)).strip()
         return convert_order_amount_text(amount_text=amount_text)
 
     async def _get_flight_product_booking_btn(self, locator: Locator, timeout: float = 5.0) -> Locator:
@@ -170,7 +186,7 @@ class BookSearchPage(BasePo):
         :param locator: flight_product Locator 对象
         :return: (是否存在, 错误信息|元素对象)
         """
-        selector: str = 'xpath=（.//td[@class="ticket_num"]/div/span)[1]'
+        selector: str = 'xpath=(.//td[@class="ticket_num"]/div/span)[1]'
         return await self.get_sub_locator(locator=locator, selector=selector, timeout=timeout)
 
     async def _get_flight_product_seats_status(self, locator: Locator, timeout: float = 5.0) -> int:
@@ -180,11 +196,12 @@ class BookSearchPage(BasePo):
         :param locator: flight_product Locator 对象
         :return: (是否存在, 错误信息|元素对象)
         """
-        selector: str = 'xpath=（.//td[@class="ticket_num"]/div/span)[2]'
+        selector: str = 'xpath=(.//td[@class="ticket_num"]/div/span)[2]'
         locator: Locator = await self.get_sub_locator(locator=locator, selector=selector, timeout=timeout)
-        more_seats_text: str = (await locator.inner_text(timeout=timeout)).strip()
+        more_seats_text: str = (await locator.inner_text(timeout=timeout * 1000)).strip()
         match = re.search(r'\d+', more_seats_text)
         if match:
-            return safe_convert_advanced(value=match.group(1).strip())
+            # ⚠️ 正则 \d+ 没有捕获组，只能用 group(0) 或 group()
+            return safe_convert_advanced(value=match.group().strip())
         else:
             return 999999

{python_qdairlines_helper-0.2.1 → python_qdairlines_helper-0.4.2}/qdairlines_helper/po/cash_pax_info_page.py

@@ -14,7 +14,7 @@ from urllib.parse import urlparse, parse_qs
 from playwright.async_api import Page, Locator
 from playwright_helper.libs.base_po import BasePo
 import qdairlines_helper.config.url_const as url_const
-from qdairlines_helper.utils.exception_utils import PaymentChannelError
+from flight_helper.utils.exception_utils import PaymentChannelError
 
 
 class CashPaxInfoPage(BasePo):

{python_qdairlines_helper-0.2.1 → python_qdairlines_helper-0.4.2}/qdairlines_helper/po/nhlms_cash_desk_page.py

@@ -9,12 +9,17 @@
 # Copyright ©2011-2026. Hunan xxxxxxx Company limited. All rights reserved.
 # ---------------------------------------------------------------------------------------------------------
 """
+import asyncio
+from logging import Logger
 from typing import Optional, Any
+from collections import OrderedDict
+from datetime import datetime, timedelta
 from playwright.async_api import Page, Locator
 from playwright_helper.libs.base_po import BasePo
 import qdairlines_helper.config.url_const as url_const
 from playwright_helper.utils.type_utils import safe_convert_advanced
-from qdairlines_helper.utils.exception_utils import HFPaymentTypeError
+from flight_helper.utils.exception_utils import HFPaymentTypeError, PaymentFailError
+from playwright.async_api import Error as PlaywrightError, TimeoutError as PlaywrightTimeoutError
 
 
 class NhlmsCashDeskPage(BasePo):
@@ -93,3 +98,39 @@ class NhlmsCashDeskPage(BasePo):
         """
         selector: str = 'xpath=//div[@class="content-bottom network-recharge"]//button[@id="submitBtn"]'
         return await self.get_locator(selector=selector, timeout=timeout)
+
+    async def check_is_pay_success(self, logger: Logger) -> None:
+        """检查支付是否成功"""
+        data = OrderedDict([
+            ("支付成功", 'xpath=//img[@alt="支付成功"]'),
+            (PaymentFailError("账户余额不足"), 'xpath=//span[contains(text(), "账户余额不足")]'),
+            (
+                PaymentFailError(
+                    "尊敬的旅客:您的IP由于频繁访问已受限，客票预定可前往青岛航空微信公众号预定。如您需要办理其他客票业务，请联系官方客服热线：0532-96630。"
+                ),
+                '//h3[contains(text(), "您的IP")]'
+            )
+        ])
+        timeout = 120
+        end_time = datetime.now() + timedelta(seconds=timeout)
+
+        while datetime.now() < end_time:
+            for index, (outcome, selector) in enumerate(data.items()):
+                try:
+                    await self.get_locator(selector=selector, timeout=1)
+                    if index == 0:
+                        logger.info(f"支付结果检测：{outcome}")
+                        return  # 成功
+                    else:
+                        # 一旦匹配失败，立即抛出！
+                        raise outcome
+                except (PlaywrightTimeoutError, PlaywrightError, RuntimeError):
+                    # 只捕获“未找到元素”的异常，其他异常往上抛
+                    continue
+                except Exception:
+                    # 可选：记录未知异常，但不吞掉
+                    raise  # 或 log 后 re-raise
+
+            await asyncio.sleep(0.5)  # 避免 CPU 占用过高
+        logger.error(f"支付结果检测：超时，当前页面url: {self.__page.url}")
+        raise PlaywrightTimeoutError(f"支付结果检测超时，{timeout}秒内未出现成功或已知失败状态")

{python_qdairlines_helper-0.2.1 → python_qdairlines_helper-0.4.2}/qdairlines_helper/po/order_verify_page.py

@@ -35,7 +35,7 @@ class OrderVerifyPage(BasePo):
         selector: str = 'xpath=//div[@class="order_info"]'
         while attempt <= refresh_attempt:
             try:
-                await self.__page.reload(timeout=timeout)
+                await self.__page.reload(timeout=timeout * 1000)
                 return await self.get_locator(selector=selector, timeout=timeout)
             except (PlaywrightError, PlaywrightTimeoutError, EnvironmentError, RuntimeError, Exception) as e:
                 attempt += 1

python_qdairlines_helper-0.2.1/python_qdairlines_helper.egg-info/requires.txt

@@ -1,3 +0,0 @@
-python_playwright_helper>=0.3.7
-python_http_helper>=0.2.1
-flight_helper>=0.1.3

python_qdairlines_helper-0.2.1/qdairlines_helper/controller/order_detail.py

@@ -1,62 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-# ---------------------------------------------------------------------------------------------------------
-# ProjectName:  python-qdairlines-helper
-# FileName:     order_detail.py
-# Description:  订单详情控制器
-# Author:       ASUS
-# CreateDate:   2026/01/06
-# Copyright ©2011-2026. Hunan xxxxxxx Company limited. All rights reserved.
-# ---------------------------------------------------------------------------------------------------------
-"""
-import re
-from aiohttp import CookieJar
-from typing import Dict, Any, Optional, List
-from qdairlines_helper.http.flight_order import FlightOrder
-from flight_helper.models.dto.itinerary import QueryItineraryResponseDTO, QueryItineraryRequestDTO
-
-
-async def get_order_detail(
-        *, query_dto: QueryItineraryRequestDTO, timeout: Optional[int] = None, retry: Optional[int] = None,
-        cookie_jar: Optional[CookieJar] = None, enable_log: Optional[bool] = None
-) -> Dict[str, Any]:
-    flight_order = FlightOrder(
-        playwright_state=query_dto.storage_state, token=query_dto.token, domain=query_dto.payment_domain,
-        protocol=query_dto.payment_protocol, timeout=timeout, retry=retry, enable_log=enable_log,
-        cookie_jar=cookie_jar, proxy=query_dto.proxy
-    )
-    order_info = await flight_order.get_order_details(
-        pre_order_no=query_dto.pre_order_no, user_id=query_dto.user_id, is_end=True, proxy=query_dto.proxy,
-        headers=query_dto.headers
-    )
-    if isinstance(order_info, dict) and order_info.get("result") and order_info.get("code") == 1:
-        return order_info.get("result")
-    else:
-        raise RuntimeError(f"订单<{query_dto.pre_order_no}>，获取详情数据异常，返回值：{order_info}")
-
-
-async def get_order_itinerary(
-        *, query_dto: QueryItineraryRequestDTO, timeout: Optional[int] = None, retry: Optional[int] = None,
-        cookie_jar: Optional[CookieJar] = None, enable_log: Optional[bool] = None
-) -> Optional[QueryItineraryResponseDTO]:
-    _order_info: Dict[str, Any] = dict(pre_order_no=query_dto.pre_order_no)
-    result = await get_order_detail(
-        query_dto=query_dto, timeout=timeout, retry=retry, cookie_jar=cookie_jar, enable_log=enable_log
-    )
-    _order_info["cash_unit"] = result.get("cashUnit")
-    _order_info["order_status"] = result.get("orderStatus")
-    _order_info["order_amount"] = result.get("totalPrice")
-    passenger_infos: List[Dict[str, Any]] = result.get("passengerInfoVoList")
-    order_itineraries = list()
-    for passenger_info in passenger_infos:
-        id_no = passenger_info.get("idNo")
-        order_itinerary = passenger_info.get("tktNo")
-        passenger = passenger_info.get("passName")
-        if bool(re.fullmatch(r'\d+-\d+', order_itinerary)):
-            order_itineraries.append(dict(
-                passenger_name=passenger, id_no=id_no, order_itinerary=order_itinerary,
-                pre_order_no=query_dto.pre_order_no
-            ))
-    if order_itineraries:
-        _order_info["itinerary_info"] = order_itineraries
-        return QueryItineraryResponseDTO(**_order_info)

python_qdairlines_helper-0.2.1/qdairlines_helper/http/flight_order.py

@@ -1,86 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-# ---------------------------------------------------------------------------------------------------------
-# ProjectName:  python-qdairlines-helper
-# FileName:     flight_order.py
-# Description:  航班订单模块
-# Author:       ASUS
-# CreateDate:   2026/01/06
-# Copyright ©2011-2026. Hunan xxxxxxx Company limited. All rights reserved.
-# ---------------------------------------------------------------------------------------------------------
-"""
-from aiohttp import CookieJar
-from typing import Optional, Dict, Any
-import qdairlines_helper.config.url_const as url_const
-from http_helper.client.async_proxy import HttpClientFactory as _HttpClientFactory
-
-
-class FlightOrder:
-
-    def __init__(
-            self, *, playwright_state: Dict[str, Any], token: Optional[str], proxy: Optional[Dict[str, Any]] = None,
-            domain: Optional[str] = None, protocol: Optional[str] = None, timeout: Optional[int] = None,
-            retry: Optional[int] = None, enable_log: Optional[bool] = None, cookie_jar: Optional[CookieJar] = None
-    ):
-        self._domain = domain or "127.0.0.1:18070"
-        self._protocol = protocol or "http"
-        self._timeout = timeout or 60
-        self._retry = retry or 0
-        self._token = token
-        self._origin = f"{self._protocol}://{self._domain}"
-        self._enable_log = enable_log or True
-        self._cookie_jar = cookie_jar or CookieJar()
-        self._proxy = proxy
-        self._playwright_state: Dict[str, Any] = playwright_state
-        self.http_client: Optional[_HttpClientFactory] = None
-
-    def _get_http_client(self) -> _HttpClientFactory:
-        """延迟获取 HTTP 客户端"""
-        if self.http_client is None:
-            self.http_client = _HttpClientFactory(
-                protocol=self._protocol,
-                domain=self._domain,
-                timeout=self._timeout,
-                retry=self._retry,
-                enable_log=self._enable_log,
-                cookie_jar=self._cookie_jar,
-                playwright_state=self._playwright_state
-            )
-        return self.http_client
-
-    def _get_headers(self) -> Dict[str, str]:
-        headers = {
-            "content-type": "application/json;charset=utf-8",
-            "origin": self._domain,
-            "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/143.0.0.0 Safari/537.36",
-            "authorization": f"Bearer {self._token}"
-        }
-        return headers
-
-    async def get_order_details(
-            self, *, pre_order_no: str, user_id: str, proxy: Optional[Dict[str, Any]] = None,
-            headers: Dict[str, str] = None, is_end: Optional[bool] = None
-    ) -> Dict[str, Any]:
-        json_data = {
-            "orderNo": pre_order_no,
-            "plat": "NB2C",
-            "userId": user_id
-        }
-        _headers = self._get_headers()
-        if headers is not None:
-            _headers.update(headers)
-        _headers["referer"] = f"{self._origin}{url_const.order_detail_url}?orderNo={pre_order_no}&orderType=2"
-        if is_end is None:
-            is_end = True
-        if proxy:
-            self._proxy = proxy
-        exception_keywords = [r'<h3[^>]*class="font-bold"[^>]*>([^<]+)</h3>']
-        return await self._get_http_client().request(
-            method="POST",
-            url=url_const.order_info_api_url,
-            headers=_headers,
-            is_end=is_end,
-            json_data=json_data,
-            proxy_config=self._proxy or None,
-            exception_keywords=exception_keywords
-        )

python_qdairlines_helper-0.2.1/qdairlines_helper/utils/exception_utils.py

@@ -1,105 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-# ---------------------------------------------------------------------------------------------------------
-# ProjectName:  python-qdairlines-helper
-# FileName:     exception_utils.py
-# Description:  异常工具模块
-# Author:       ASUS
-# CreateDate:   2026/01/07
-# Copyright ©2011-2026. Hunan xxxxxxx Company limited. All rights reserved.
-# ---------------------------------------------------------------------------------------------------------
-"""
-from typing import Literal
-
-
-class DuplicatePaymentError(Exception):
-    def __init__(self, order_no: str):
-        self.order_no = order_no
-        super().__init__(f"订单<{order_no}>重复支付")
-
-
-class NotEnoughTicketsError(Exception):
-    def __init__(self, flight_no: str, seats_status: int, passengers: int):
-        self.flight_no = flight_no
-        self.seats_status = seats_status
-        self.passengers = passengers
-        super().__init__(f"青岛航空官网显示航班<{flight_no}>的余票<{seats_status}>少于乘客人数<{passengers}>")
-
-
-class ExcessiveProfitdError(Exception):
-    def __init__(
-            self, flight_no: str, query_price: float, order_price: float, reduction_threshold: float,
-            asset: Literal["票面价", "销售价"] = "票面价"
-    ):
-        self.flight_no = flight_no
-        self.query_price = query_price
-        self.order_price = order_price
-        self.reduction_threshold = reduction_threshold
-        self.asset = asset
-        super().__init__(
-            f"航班<{flight_no}>官网价：{query_price} 低于：订单{asset}[{order_price}] - 下降阈值[{reduction_threshold}]，收益过高"
-        )
-
-
-class ExcessiveLossesError(Exception):
-    def __init__(
-            self, flight_no: str, query_price: float, order_price: float, increase_threshold: float,
-            asset: Literal["票面价", "销售价"] = "票面价"
-    ):
-        self.flight_no = flight_no
-        self.query_price = query_price
-        self.order_price = order_price
-        self.increase_threshold = increase_threshold
-        self.asset = asset
-        super().__init__(
-            f"航班<{flight_no}>官网价：{query_price} 高于：订单{asset}[{order_price}] + 上浮阈值[{increase_threshold}]，亏损太多"
-        )
-
-
-class PaymentChannelError(Exception):
-    def __init__(self, channel_name: str):
-        self.channel_name = channel_name
-        super().__init__(f"支付渠道<{channel_name}>暂不支持")
-
-
-class PaymentChannelMissError(Exception):
-    def __init__(self):
-        super().__init__(f"支付渠道参数丢失")
-
-
-class PaymentTypeError(Exception):
-    def __init__(self, payment_type: str):
-        self.payment_type = payment_type
-        super().__init__(f"付款方式<{payment_type}>暂不支持")
-
-
-class PassengerTypeError(Exception):
-    def __init__(self, passenger_type: str):
-        self.passenger_type = passenger_type
-        super().__init__(f"乘客类型<{passenger_type}>暂不支持")
-
-
-class ProductTypeError(Exception):
-    def __init__(self, product_type: str):
-        self.product_type = product_type
-        super().__init__(f"产品类型<{product_type}>暂不支持")
-
-
-class HFPaymentTypeError(Exception):
-    def __init__(self, payment_type: str):
-        self.payment_type = payment_type
-        super().__init__(f"汇付天下的付款方式<{payment_type}>暂不支持")
-
-
-class PaymentFailedError(Exception):
-    def __init__(self, pre_order_no: str, order_status: str):
-        self.pre_order_no = pre_order_no
-        self.order_status = order_status
-        super().__init__(f"青岛航空官网订单<{pre_order_no}>支付失败，支付结束后的状态<{order_status}>")
-
-
-class IPBlockError(Exception):
-
-    def __init__(self, message: str):
-        self.message = message
-        super().__init__(message)