python-qdairlines-helper 0.0.6__py3-none-any.whl → 0.2.6__py3-none-any.whl

qdairlines_helper/controller/nhlms_cashdesk.py

@@ -10,17 +10,21 @@
 # ---------------------------------------------------------------------------------------------------------
 """
 import inspect
-from typing import Tuple, Callable
+from logging import Logger
+from typing import Callable
 from playwright.async_api import BrowserContext
-from qdairlines_helper.utils.log_utils import logger
 import qdairlines_helper.config.url_const as url_const
 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
 
 
-async def load_nhlms_cash_desk_po(*, context: BrowserContext, timeout: float = 60.0) -> NhlmsCashDeskPage:
-    nhlms_cashdesk_url = url_const.nhlms_cashdesk_domain + url_const.nhlms_cashdesk_url
+async def load_nhlms_cash_desk_po(
+        *, context: BrowserContext, logger: Logger, domain: str, protocol: str, timeout: float = 60.0
+) -> NhlmsCashDeskPage:
+    url_prefix = f"{protocol}://{domain}"
+    nhlms_cashdesk_url = url_prefix + url_const.nhlms_cashdesk_url
 
     current_page = await switch_for_table_window(
         browser=context, url_keyword=url_const.nhlms_cashdesk_url, wait_time=int(timeout)
@@ -32,10 +36,10 @@ async def load_nhlms_cash_desk_po(*, context: BrowserContext, timeout: float = 6
     return nhlms_cashdesk_po
 
 
-async def pay_account_payment(
-        *, page: NhlmsCashDeskPage, operator_account: str, pay_password: str, order_id: int,
-        is_pay_completed_callback: Callable, payment_type: str = "付款账户支付", timeout: float = 60.0
-) -> Tuple[str, float]:
+async def hf_paid_account_payment(
+        *, page: NhlmsCashDeskPage, logger: Logger, order_no: str, is_pay_completed_callback: Callable,
+        hf_paid_account_payment_dto: HFPaidAccountPaymentInputDTO, timeout: float = 60.0
+) -> PaymentResultDTO:
     # 1. 获取收银台支付流水
     pay_transaction = await page.get_order_transaction(timeout=timeout)
     logger.info(f"汇付天下收银台页面，支付流水<{pay_transaction}>获取完成")
@@ -45,30 +49,40 @@ async def pay_account_payment(
     logger.info(f"汇付天下收银台页面，支付金额<{actual_payment_amount}>获取完成")
 
     # 3. 获取付款方式tab
-    payment_type_tab = await page.get_payment_type_tab(payment_type=payment_type, timeout=timeout)
+    payment_type_tab = await page.get_payment_type_tab(
+        payment_type=hf_paid_account_payment_dto.payment_type, timeout=timeout
+    )
     await payment_type_tab.click(button="left")
-    logger.info(f"汇付天下收银台页面，【{payment_type}】Tab点击完成")
+    logger.info(f"汇付天下收银台页面，【{hf_paid_account_payment_dto.payment_type}】Tab点击完成")
 
     # 4. 输入操作员号
     username_input = await page.get_username_input(timeout=timeout)
-    await username_input.fill(value=operator_account)
-    logger.info(f"汇付天下收银台页面，操作员号<{operator_account}>输入完成")
+    await username_input.fill(value=hf_paid_account_payment_dto.account)
+    logger.info(f"汇付天下收银台页面，操作员号<{hf_paid_account_payment_dto.account}>输入完成")
 
     # 5. 输入交易密码
     password_input = await page.get_password_input(timeout=timeout)
-    await password_input.fill(value=pay_password)
-    logger.info(f"汇付天下收银台页面，交易密码<{pay_password}>输入完成")
+    await password_input.fill(value=hf_paid_account_payment_dto.password)
+    logger.info(f"汇付天下收银台页面，交易密码<{hf_paid_account_payment_dto.password}>输入完成")
 
     # 6. 校验订单是否已经被支付
     if inspect.iscoroutinefunction(is_pay_completed_callback):
-        is_pay: bool = await is_pay_completed_callback(order_id=order_id)
+        is_pay: bool = await is_pay_completed_callback(order_id=order_no)
     else:
-        is_pay: bool = is_pay_completed_callback(order_id=order_id)
+        is_pay: bool = is_pay_completed_callback(order_id=order_no)
     if is_pay is True:
-        raise DuplicatePaymentError(order_id=order_id)
+        raise DuplicatePaymentError(order_no=order_no)
 
     # 6. 点击【确认支付】
     confirm_payment_btn = await page.get_confirm_payment_btn(timeout=timeout)
     await confirm_payment_btn.click(button="left")
     logger.info("汇付天下收银台页面，【确认支付】按钮点击完成")
-    return pay_transaction, actual_payment_amount
+    return PaymentResultDTO(
+        channel_name=hf_paid_account_payment_dto.channel_name,
+        payment_type=hf_paid_account_payment_dto.payment_type,
+        account=hf_paid_account_payment_dto.account,
+        password=hf_paid_account_payment_dto.password,
+        order_no=order_no,
+        pay_amount=actual_payment_amount,
+        pay_transaction=pay_transaction
+    )

qdairlines_helper/controller/order_detail.py

@@ -9,45 +9,54 @@
 # 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.utils.log_utils import logger
 from qdairlines_helper.http.flight_order import FlightOrder
+from flight_helper.models.dto.itinerary import QueryItineraryResponseDTO, QueryItineraryRequestDTO
 
 
-async def get_order_itinerary(
-        *, playwright_state: Dict[str, Any], token: Optional[str], pre_order_no: str, user_id: str,
-        proxy: Dict[str, Any], 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, headers: Dict[str, str] = None
+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=playwright_state, token=token, domain=domain, protocol=protocol, timeout=timeout, retry=retry,
-        enable_log=enable_log, cookie_jar=cookie_jar
+        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: Dict[str, Any] = dict(pre_order_no=pre_order_no)
-    try:
-        order_info = await flight_order.get_order_details(
-            pre_order_no=pre_order_no, user_id=user_id, is_end=True, proxy=proxy, headers=headers
-        )
-        if isinstance(order_info, dict) and order_info.get("result"):
-            result = order_info.get("result") or dict()
-            _order_info["cash_unit"] = result.get("cashUnit")
-            _order_info["order_status"] = result.get("orderStatus")
-            _order_info["actual_payment_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")
-                order_itineraries.append(dict(
-                    passenger=passenger, id_no=id_no, order_itinerary=order_itinerary, pre_order_no=pre_order_no
-                ))
-            if order_itineraries:
-                _order_info["order_itineraries"] = order_itineraries
-        else:
-            raise RuntimeError(f"订单<{pre_order_no}>，获取订单详情数据异常，返回值：{order_info}")
-    except Exception as e:
-        logger.error(e)
-    return _order_info
+    _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)

qdairlines_helper/controller/order_query.py

@@ -10,14 +10,17 @@
 # ---------------------------------------------------------------------------------------------------------
 """
 from typing import Any
+from logging import Logger
 from playwright.async_api import Page
-from qdairlines_helper.utils.log_utils import logger
 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 qdairlines_helper.utils.po_utils import get_ip_access_blocked_msg
 
 
-async def open_air_page(*, page: Page, protocol: str, domain: str, timeout: float = 60.0) -> AirOrderPage:
+async def open_air_order_page(
+        *, page: Page, logger: Logger, protocol: str, domain: str, timeout: float = 60.0
+) -> AirOrderPage:
     url_prefix = f"{protocol}://{domain}"
     air_order_url = url_prefix + url_const.air_order_url
     await page.goto(air_order_url)
@@ -27,15 +30,15 @@ async def open_air_page(*, page: Page, protocol: str, domain: str, timeout: floa
     logger.info(f"即将进入青岛航空官网航班查询页面，页面URL<{air_order_url}>")
     ip_access_blocked_msg = await get_ip_access_blocked_msg(page=page, timeout=3)
     if ip_access_blocked_msg:
-        raise EnvironmentError(ip_access_blocked_msg)
+        raise IPBlockError(ip_access_blocked_msg)
     return air_order_po
 
 
-async def is_open_air_page_callback(
-        *, page: Page, protocol: str, domain: str, timeout: float = 60.0, **kwargs: Any
+async def is_open_air_order_page_callback(
+        *, page: Page, protocol: str, logger: Logger, domain: str, timeout: float = 60.0, **kwargs: Any
 ) -> bool:
     try:
-        await open_air_page(page=page, protocol=protocol, domain=domain, timeout=timeout)
+        await open_air_order_page(page=page, logger=logger, protocol=protocol, domain=domain, timeout=timeout)
         return True
     except (Exception,):
         return False

qdairlines_helper/controller/order_verify.py

@@ -9,14 +9,17 @@
 # Copyright ©2011-2026. Hunan xxxxxxx Company limited. All rights reserved.
 # ---------------------------------------------------------------------------------------------------------
 """
+from logging import Logger
 from playwright.async_api import Page
-from qdairlines_helper.utils.log_utils import logger
 import qdairlines_helper.config.url_const as url_const
+from qdairlines_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
 
 
-async def load_order_verify_po(*, page: Page, protocol: str, domain: str, timeout: float = 60.0) -> OrderVerifyPage:
+async def load_order_verify_po(
+        *, page: Page, logger: Logger, protocol: str, domain: str, timeout: float = 60.0
+) -> OrderVerifyPage:
     url_prefix = f"{protocol}://{domain}"
     order_verify_url = url_prefix + url_const.order_verify_url
     order_verify_po = OrderVerifyPage(page=page, url=order_verify_url)
@@ -24,11 +27,13 @@ async def load_order_verify_po(*, page: Page, protocol: str, domain: str, timeou
     logger.info(f"即将进入青岛航空官网订单校验页面，页面URL<{order_verify_url}>")
     ip_access_blocked_msg = await get_ip_access_blocked_msg(page=page, timeout=3)
     if ip_access_blocked_msg:
-        raise EnvironmentError(ip_access_blocked_msg)
+        raise IPBlockError(ip_access_blocked_msg)
     return order_verify_po
 
 
-async def order_verify(*, page: OrderVerifyPage, refresh_attempt: int = 3, timeout: float = 60.0) -> None:
+async def order_verify(
+        *, page: OrderVerifyPage, logger: Logger, refresh_attempt: int = 3, timeout: float = 60.0
+) -> None:
     # 1. 先确认订单数据是否加载出来
     await page.get_order_info_plane(timeout=timeout, refresh_attempt=refresh_attempt)
 

qdairlines_helper/controller/pay_success.py

@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+"""
+# ---------------------------------------------------------------------------------------------------------
+# ProjectName:  python-qdairlines-helper
+# FileName:     pay_success.py
+# Description:  支付成功控制器
+# Author:       ASUS
+# CreateDate:   2026/01/09
+# 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.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
+
+
+async def load_pay_success_page(
+        *, page: Page, logger: Logger, protocol: str, domain: str, timeout: float = 60.0
+) -> PaySuccessPage:
+    url_prefix = f"{protocol}://{domain}"
+    pay_success_url = url_prefix + url_const.pay_success_url
+    pay_success_po = PaySuccessPage(page=page, url=pay_success_url)
+    await pay_success_po.url_wait_for(url=pay_success_url, timeout=timeout)
+    logger.info(f"即将进入青岛航空官网支付成功页面，页面URL<{pay_success_url}>")
+    ip_access_blocked_msg = await get_ip_access_blocked_msg(page=page, timeout=3)
+    if ip_access_blocked_msg:
+        raise IPBlockError(ip_access_blocked_msg)
+    return pay_success_po
+
+
+async def two_check_pay_success(
+        *, page: Page, logger: Logger, query_dto: QueryItineraryRequestDTO, callback_get_proxy: Callable,
+        cookie_jar: Optional[CookieJar] = None, timeout: float = 60.0, retry: int = 0, enable_log: bool = True
+) -> bool:
+    try:
+        # 1. 看支付成功页面是否加载完成
+        pay_success_po = await load_pay_success_page(
+            page=page, logger=logger, protocol=query_dto.payment_protocol, domain=query_dto.payment_domain,
+            timeout=timeout
+        )
+        # 2. 检测页面的支付成功image是否存在
+        await pay_success_po.get_pay_success_image(timeout=timeout)
+        return True
+    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,
+    )
+    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)

qdairlines_helper/controller/user_login.py

@@ -9,17 +9,20 @@
 # Copyright ©2011-2026. Hunan xxxxxxx Company limited. All rights reserved.
 # ---------------------------------------------------------------------------------------------------------
 """
+from logging import Logger
 from typing import Dict, Any
-from qdairlines_helper.utils.log_utils import logger
 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.controller.home import load_home_po
+from qdairlines_helper.utils.exception_utils import IPBlockError
 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
 
 
-async def open_login_page(*, page: Page, protocol: str, domain: str, timeout: float = 60.0) -> LoginPage:
+async def open_login_page(
+        *, page: Page, logger: Logger, protocol: str, domain: str, timeout: float = 60.0
+) -> LoginPage:
     url_prefix = f"{protocol}://{domain}"
     login_url = url_prefix + url_const.login_url
     await page.goto(login_url)
@@ -29,12 +32,13 @@ async def open_login_page(*, page: Page, protocol: str, domain: str, timeout: fl
     logger.info(f"即将进入青岛航空官网登录页面，页面URL<{login_url}>")
     ip_access_blocked_msg = await get_ip_access_blocked_msg(page=page, timeout=3)
     if ip_access_blocked_msg:
-        raise EnvironmentError(ip_access_blocked_msg)
+        raise IPBlockError(ip_access_blocked_msg)
     return login_po
 
 
 async def _user_login(
-        *, page: LoginPage, protocol: str, domain: str, username: str, password: str, timeout: float = 60.0
+        *, page: LoginPage, logger: Logger, protocol: str, domain: str, username: str, password: str,
+        timeout: float = 60.0
 ) -> None:
     # 1. 输入用户名
     username_input = await page.get_login_username_input(timeout=timeout)
@@ -62,18 +66,18 @@ async def _user_login(
 
     # 5. 加载首页页面对象，加载成功说明进入了首页，登录成功
     try:
-        await load_home_po(page=page.get_page(), protocol=protocol, domain=domain, timeout=timeout)
+        await load_home_po(page=page.get_page(), logger=logger, protocol=protocol, domain=domain, timeout=timeout)
         logger.info(f"青岛航空官网登录页面，用户：{username}, 密码：{password}登录成功")
     except (PlaywrightError, PlaywrightTimeoutError, EnvironmentError, RuntimeError, Exception) as e:
         raise RuntimeError(f"青岛航空官网登录页面，用户：{username}, 密码：{password}登录失败，原因：{e}")
 
 
 async def user_login_callback(
-        *, page: Page, context: BrowserContext, protocol: str, domain: str, username: str, password: str,
-        timeout: float = 60.0, **kwargs: Any
+        *, page: Page, context: BrowserContext, logger: Logger, protocol: str, domain: str, username: str,
+        password: str, timeout: float = 60.0, **kwargs: Any
 ) -> Dict[str, Any]:
     # 1. 打开登录页面
-    login_po = await open_login_page(page=page, protocol=protocol, domain=domain, timeout=timeout)
+    login_po = await open_login_page(page=page, logger=logger, protocol=protocol, domain=domain, timeout=timeout)
 
     # 2. 开启网络监听
     keywords = [url_const.auth_form_api_url, url_const.login_after_api_url]
@@ -84,7 +88,8 @@ async def user_login_callback(
 
     # 2. 执行登录操作
     await _user_login(
-        page=login_po, protocol=protocol, domain=domain, username=username, password=password, timeout=timeout
+        page=login_po, protocol=protocol, logger=logger, domain=domain, username=username, password=password,
+        timeout=timeout
     )
     user_info = parse_user_info_from_page_response(network_logs=network_logs)
     user_info.update(dict(storage_state=await context.storage_state()))

qdairlines_helper/po/add_passenger_page.py

@@ -13,6 +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
 
 
 class AddPassengerPage(BasePo):
@@ -37,7 +38,7 @@ class AddPassengerPage(BasePo):
         elif passenger_type == "婴儿":
             btn_text = "添加婴儿"
         else:
-            raise EnvironmentError(f"乘客类型<{passenger_type}>暂不支持")
+            raise PassengerTypeError(passenger_type=passenger_type)
         selector: str = f'//div[@class="el-row"]//button[@class="search_btn" and contains(text(), "{btn_text}")]'
         return await self.get_locator(selector=selector, timeout=timeout)
 
@@ -68,7 +69,7 @@ class AddPassengerPage(BasePo):
         elif passenger_type == "婴儿":
             passenger_class = f"passengerBaby{position_index}"
         else:
-            raise EnvironmentError(f"乘客类型<{passenger_type}>暂不支持")
+            raise PassengerTypeError(passenger_type=passenger_type)
         selector: str = f'//label[@for="{passenger_class}"]/span[@class="checkbox"]'
         return await self.get_locator(selector=selector, timeout=timeout)
 

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
-from qdairlines_helper.utils.log_utils import logger
 import qdairlines_helper.config.url_const as url_const
+from qdairlines_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
 
@@ -27,6 +28,15 @@ class BookSearchPage(BasePo):
         super().__init__(page, url or url_const.book_search_url)
         self.__page = page
 
+    async def get_empyt_data_page(self, timeout: float = 5.0) -> Locator:
+        """
+        打开搜索页后，看看当前默认状态是不是空数据页，非空数据页，会有弹框
+        :param timeout: 超时时间（秒）
+        :return: (是否存在, 错误信息 | 元素对象)
+        """
+        selector: str = '//strong[contains(text(), "没有在飞航班")]'
+        return await self.get_locator(selector=selector, timeout=timeout)
+
     async def get_reminder_dialog_continue_book_btn(self, timeout: float = 5.0) -> Locator:
         """
         获取预订搜索页的温馨提醒弹框中的【继续购票】按钮
@@ -72,25 +82,18 @@ class BookSearchPage(BasePo):
         selector: str = '//div[contains(@class, "flight_search_form")]//button[@class="search_btn"]'
         return await self.get_locator(selector=selector, timeout=timeout)
 
-    async def get_flight_info_plane(self, timeout: float = 5.0) -> Locator:
+    async def get_flight_info_plane(self, flight_no: str, timeout: float = 5.0) -> Locator:
         """
         获取预订搜索页航班内容栏航班基本信息
+        :param flight_no: 航班编号
         :param timeout: 超时时间（秒）
         :return: (是否存在, 错误信息|元素对象)
         """
-        selector: str = '//div[@class="airlines_cont"]//div[@class="text-center el-row"]'
-        return await self.get_locator(selector=selector, timeout=timeout)
-
-    async def get_flight_no(self, locator: Locator, timeout: float = 5.0) -> str:
-        """
-        获取预订搜索页航班编号
-        :param timeout: 超时时间（秒）
-        :param locator: flight_info_plane Locator 对象
-        :return: (是否存在, 错误信息|元素对象)
-        """
-        selector: str = 'xpath=(.//div[contains(@class, "flight_qda")]/span)[2]'
-        sub_locator: Locator = await self.get_sub_locator(locator=locator, selector=selector, timeout=timeout)
-        return (await sub_locator.inner_text(timeout=timeout)).strip()
+        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,):
+            raise RuntimeError(f"航班预订查询页面，没有搜索到航班<{flight_no}>数据")
 
     async def get_flight_product_nav(self, locator: Locator, product_type: str, timeout: float = 5.0) -> Locator:
         """
@@ -107,31 +110,45 @@ class BookSearchPage(BasePo):
         elif product_type == "公务舱":
             index = 3
         else:
-            raise EnvironmentError(f"产品类型参数值<{product_type}>无效，目前仅支持<经济舱，超级经济舱，公务舱>")
+            raise ProductTypeError(product_type=product_type)
         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.warning(e)
+                logger.error(e)
                 continue
         return flight_products
 
@@ -157,7 +174,7 @@ 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()
         return convert_order_amount_text(amount_text=amount_text)
@@ -169,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:
@@ -179,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()
         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

qdairlines_helper/po/cash_pax_info_page.py

@@ -13,8 +13,8 @@ from typing import Optional
 from urllib.parse import urlparse, parse_qs
 from playwright.async_api import Page, Locator
 from playwright_helper.libs.base_po import BasePo
-from qdairlines_helper.utils.log_utils import logger
 import qdairlines_helper.config.url_const as url_const
+from qdairlines_helper.utils.exception_utils import PaymentChannelError
 
 
 class CashPaxInfoPage(BasePo):
@@ -25,23 +25,23 @@ class CashPaxInfoPage(BasePo):
         super().__init__(page, url or url_const.cash_pax_info_url)
         self.__page = page
 
-    async def get_payment_type_checkbox(self, payment_type: str, timeout: float = 5.0) -> Locator:
+    async def get_payment_channel_checkbox(self, channel_name: str, timeout: float = 5.0) -> Locator:
         """
-        获取支付方式页面中的支付类型【支付宝|微信|汇付天下|易宝支付】单选框
-        :param payment_type: 支付类型，支付宝|微信|汇付天下|易宝支付
+        获取支付方式页面中的支付渠道【支付宝|微信|汇付天下|易宝支付】单选框
+        :param channel_name: 支付渠道，支付宝|微信|汇付天下|易宝支付
         :param timeout: 超时时间（秒）
         :return: (是否存在, 错误信息|元素对象)
         """
-        if payment_type == '支付宝':
+        if channel_name == '支付宝':
             for_class = 0
-        elif payment_type == "微信":
+        elif channel_name == "微信":
             for_class = 1
-        elif payment_type == "汇付天下":
+        elif channel_name == "汇付天下":
             for_class = 2
-        elif payment_type == "易宝支付":
+        elif channel_name == "易宝支付":
             for_class = 3
         else:
-            raise EnvironmentError(f"支付类型<{payment_type}>暂不支持")
+            raise PaymentChannelError(channel_name=channel_name)
         selector: str = f'xpath=//label[@for="passengerAdult{for_class}"]//span[@class="checkbox"]'
         return await self.get_locator(selector=selector, timeout=timeout)
 
@@ -68,7 +68,7 @@ class CashPaxInfoPage(BasePo):
             if pre_order_no and len(pre_order_no) == 18 and pre_order_no.startswith("OW") is True:
                 return pre_order_no
         except (Exception,):
-            logger.error(f"支付方式页面获取到的url={self.__page.url}，信息异常")
+            pass
         selector: str = '//div[@class="order-form"]//span[contains(text(), "订单编号")]/../span[@class="font_red"]'
         locator = await self.get_locator(selector=selector, timeout=timeout)
         return (await locator.inner_text()).strip()

qdairlines_helper/po/nhlms_cash_desk_page.py

@@ -14,6 +14,7 @@ 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
 
 
 class NhlmsCashDeskPage(BasePo):
@@ -62,7 +63,7 @@ class NhlmsCashDeskPage(BasePo):
         elif payment_type == "快捷支付":
             value = "fp"
         else:
-            raise EnvironmentError(f"汇付天下收银台暂不支持<{payment_type}>的付款方式")
+            raise HFPaymentTypeError(payment_type=payment_type)
         selector: str = f'//div[@class="content-bottom network-recharge"]//li[@value="{value}"]'
         return await self.get_locator(selector=selector, timeout=timeout)