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

{python_qdairlines_helper-0.2.6.dist-info → python_qdairlines_helper-0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python_qdairlines_helper
-Version: 0.2.6
+Version: 0.6.0
 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_http_helper>=0.2.1
-Requires-Dist: flight_helper>=0.1.3
+Requires-Dist: python_playwright_helper>=0.4.3
+Requires-Dist: python_http_helper>=0.2.2
+Requires-Dist: flight_helper>=0.3.7
 Dynamic: license-file
 
 # python-qdairlines-helper

python_qdairlines_helper-0.6.0.dist-info/RECORD

@@ -0,0 +1,36 @@
+python_qdairlines_helper-0.6.0.dist-info/licenses/LICENSE,sha256=WtjCEwlcVzkh1ziO35P2qfVEkLjr87Flro7xlHz3CEY,11556
+qdairlines_helper/__init__.py,sha256=bN1FqEK_jvefO_HU_8HFJpjuOzHTsuhmRe5KAzmraR4,479
+qdairlines_helper/config/__init__.py,sha256=JjIRocePx3gwFNpdauuiwBU6B2Ug565xaHLEMu5Oo0I,479
+qdairlines_helper/config/url_const.py,sha256=KpvvZEPOsJ7FQdJLp79VfUdUSRuItR4OYYCzl8wfKZI,2194
+qdairlines_helper/controller/__init__.py,sha256=oyeciEBlDLNpqHblB0R-nXQG3HsI8L5mmlWulQ7Y38Q,482
+qdairlines_helper/controller/add_passenger.py,sha256=qixajF_MRzmMZ9htAFeGCP3L27iV1Xk-jnfPQEP48s8,5155
+qdairlines_helper/controller/book_payment.py,sha256=yk1A99yHAjVcnXGBSzGanA6Cle4NXwjt6e8Qx4W2Xi0,6184
+qdairlines_helper/controller/book_search.py,sha256=qSsjyn6BgJc5yP-mf2mNIDkEPsG_PTUffH4cEAZFsl8,9267
+qdairlines_helper/controller/cash_pax_info.py,sha256=AZ09ekt-zaYYs3uUSclul014mbCZEF5BVIghOeIGT5s,2507
+qdairlines_helper/controller/home.py,sha256=2r75pe7d16kZ6tkJZ3zM5ycV-DE5iy3njhpE0xf1EZw,1390
+qdairlines_helper/controller/nhlms_cashdesk.py,sha256=Z5ApNGAzYWgBn43zcTqt42h1cFABLtfEDKWTIWSXsAA,4421
+qdairlines_helper/controller/order_detail.py,sha256=hhL37PiozS1jALMk_eB0vg0eigW_Rcl_mf0l-QrW21o,4337
+qdairlines_helper/controller/order_query.py,sha256=7U6S5xlT89UJHFslDbUT5VRgGlAoPQSOi4NRtEKK9xQ,1903
+qdairlines_helper/controller/order_verify.py,sha256=lx2YpDUoooCkU596IEz4kwyJsev-dHskBLHJ4v3d1Rg,2670
+qdairlines_helper/controller/pay_success.py,sha256=J0yWSarIlce4cVXdqZyURWm-DwujTqg32al5JTe5flA,2837
+qdairlines_helper/controller/user_login.py,sha256=CNuPIpGlkk5uU9ltL3DtTgC2SK6K32yA-K0Q-Kxe3MM,6267
+qdairlines_helper/http/__init__.py,sha256=96AJPf2zgw_rm3Wv-boIBltWFgZH3Yo-fn5M9SRK280,489
+qdairlines_helper/http/flight_order.py,sha256=7NTUA8xt6gwPBH7gdU3VjUoBa9LpPAvAEzkWguLPrNk,2066
+qdairlines_helper/http/http_base.py,sha256=zWSgJfyMaekHyvV4lJD-KHiCX9BN3GGb8DperyVpRGQ,2492
+qdairlines_helper/http/user_login.py,sha256=S_thG1RLXv5x5MQJmEG-oo38ReIF3_p17hVwGqs61A8,1815
+qdairlines_helper/po/__init__.py,sha256=HoouLJGLu_dI6IAKTVjBRraGHMcAUgntayTph-BUBAE,481
+qdairlines_helper/po/add_passenger_page.py,sha256=no_QC4hwO7xuZXKLzakNlcWj2R06oVZdzKHvFHsBG5Y,7996
+qdairlines_helper/po/air_order_page.py,sha256=0Ux0B2hUGKCoFLRpJqGHS2w690o0A2PDnvRf9-UKfJE,930
+qdairlines_helper/po/book_search_page.py,sha256=Id4sqpmIQvgxTcESh-3dpCG5ccigkL6VrNLbZPf1gq0,14547
+qdairlines_helper/po/cash_pax_info_page.py,sha256=yH-ZedYweby1x3Sw3JZX6a57-8PdtQHmNKqym7cn-Xo,3397
+qdairlines_helper/po/home_page.py,sha256=KvoOZOYwKjlJjZOT522K_8ic3_2zaYOPWkuklUHVSlM,907
+qdairlines_helper/po/login_page.py,sha256=SdWmkP_47GeosbFRcfvXLeQxxdM7b9UESvmajWq4-nA,2975
+qdairlines_helper/po/nhlms_cash_desk_page.py,sha256=I2FdZvEfEiN9pbD6nZ7VquO1ZMg9zUJjVkStx9eat0M,6670
+qdairlines_helper/po/order_verify_page.py,sha256=PlDZ-WbZBwV7pjjuQjXuMrYXAvys0Uas2FncXitsBLs,4978
+qdairlines_helper/po/pay_success_page.py,sha256=XGddo8as8wf1kCCdvemqHIRWOPIPv1JG8iXEmpH4zck,1329
+qdairlines_helper/utils/__init__.py,sha256=sti2S709puM2mQbQisk0KGq_YNjW6T4zz2vyYXonNB0,479
+qdairlines_helper/utils/po_utils.py,sha256=74ZVyyxPmPk1tcGQoMauXhBE3qsZJej8urni1ch27io,2417
+python_qdairlines_helper-0.6.0.dist-info/METADATA,sha256=WtDdd9E0T432X1X5uzk-HRnEt6U2s5OBVrVcV1nXEeE,14424
+python_qdairlines_helper-0.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+python_qdairlines_helper-0.6.0.dist-info/top_level.txt,sha256=MRbQkBMdSG4f5mx2RWfu6aXoDSyM-2KwL-YFqNBdbng,18
+python_qdairlines_helper-0.6.0.dist-info/RECORD,,

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  微信支付收银台

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
 

qdairlines_helper/controller/book_payment.py

@@ -16,10 +16,10 @@ 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
@@ -27,10 +27,10 @@ from qdairlines_helper.controller.nhlms_cashdesk import load_nhlms_cash_desk_po,
 
 
 async def book_payment_callback(
-        *, page: Page, logger: Logger, is_pay_completed_callback: Callable, book_input_dto: BookingInputDTO,
+        *, page: Page, logger: Logger, pre_check_of_payment: Callable, book_input_dto: BookingInputDTO,
         one_way_booking_dto: OneWayBookingDTO, passengers_dto: List[PassengerDTO], qdair_cookie: Dict[str, Any],
-        callback_get_proxy: Callable, cookie_jar: Optional[CookieJar] = None, timeout: float = 60.0,
-        refresh_attempt: int = 3, retry: int = 0, enable_log: bool = True,
+        callback_get_proxy: Callable, qlv_cookie: Dict[str, Any], cookie_jar: Optional[CookieJar] = None,
+        timeout: float = 60.0, refresh_attempt: int = 3, retry: int = 0, enable_log: bool = True,
         hf_paid_account_payment_dto: Optional[HFPaidAccountPaymentInputDTO] = None, **kwargs: Any
 ) -> PaymentResultDTO:
     # 1. 打开预订搜索页面
@@ -66,7 +66,10 @@ async def book_payment_callback(
     )
 
     # 6. 校验订单
-    await order_verify(page=order_verify_po, logger=logger, refresh_attempt=refresh_attempt, timeout=timeout)
+    await order_verify(
+        page=order_verify_po, logger=logger, refresh_attempt=refresh_attempt, timeout=timeout,
+        qdair_user_id=book_input_dto.book_login_user
+    )
     logger.info(f"订单<{one_way_booking_dto.order_no}>，校验订单结束")
 
     # 7. 加载支付类型页面对象
@@ -88,28 +91,27 @@ async def book_payment_callback(
             domain=hf_paid_account_payment_dto.pay_domain, protocol=hf_paid_account_payment_dto.pay_protocol
         )
 
-        # 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
+        if hf_paid_account_payment_dto.payment_type != "付款账户支付":
+            raise PaymentTypeError(payment_type=hf_paid_account_payment_dto.payment_type)
 
-            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")
-            )
+        # 10. 汇付天下操作支付
+        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,
+            hf_paid_account_payment_dto=hf_paid_account_payment_dto, pre_check_of_payment=pre_check_of_payment,
+            order_id=one_way_booking_dto.order_no, qlv_cookie=qlv_cookie
+        )
+        logger.info(f"订单<{one_way_booking_dto.order_no}>，汇付天下操作支付结束")
+        payment_result_dto.pre_order_no = pre_order_no
 
-            # 11. 检查是否支付成功
-            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
+        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")
+        )
+        await two_check_pay_success(
+            page=nhlms_cash_desk_po, 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
     else:
         raise PaymentChannelMissError()

qdairlines_helper/controller/book_search.py

@@ -10,16 +10,16 @@
 # ---------------------------------------------------------------------------------------------------------
 """
 import asyncio
+from time import time
 from logging import Logger
 from typing import Dict, Any, List
 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 flight_helper.models.dto.booking import OneWayBookingDTO, BookingInputDTO
-from playwright.async_api import Error as PlaywrightError, TimeoutError as PlaywrightTimeoutError
-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(
@@ -38,26 +38,18 @@ async def open_book_search_page(
     return book_search_po
 
 
-async def _book_search_dialog_handle(
-        *, logger: Logger, page: BookSearchPage, flight_query_btn: Locator, timeout: float = 60.0
-):
-    try:
-        for _ in range(3):
-            # 1. 获取页面的空数据状态, 看看当前默认状态是不是空数据页
-            await page.get_empyt_data_page(timeout=timeout)
-            logger.warning(f"航班预订查询页面，【查询机票】按钮点击完成后，没有加出来数据，尝试再次点击机票查询")
-            # 2. 页面数据没有加载出来，尝试点击 查询按钮，重新再来
-            await flight_query_btn.click(button="left")
-            await asyncio.sleep(3)
-            logger.warning(f"航班预订查询页面，【查询机票】按钮再次点击完成")
-    except (PlaywrightError, PlaywrightTimeoutError, RuntimeError, EnvironmentError, Exception,):
+async def _book_search_dialog_handle(*, logger: Logger, page: BookSearchPage, timeout: float = 20.0) -> None:
+    end_time = time() + timeout
+    while time() < end_time:
+        await page.handle_yidun_icon(logger=logger, timeout=1)
         try:
-            # 2. 点击继续购票按钮
-            continue_book_btn = await page.get_reminder_dialog_continue_book_btn(timeout=timeout)
+            continue_book_btn = await page.get_reminder_dialog_continue_book_btn(timeout=1)
             await continue_book_btn.click(button="left")
             logger.info("航班预订查询页面，出现温馨提醒弹框，【继续购票】按钮点击完成")
-        except (PlaywrightTimeoutError, RuntimeError, EnvironmentError, Exception,):
+            return
+        except (Exception,):
             pass
+        await asyncio.sleep(0.1)  # 快速轮询
 
 
 async def book_search(
@@ -66,17 +58,31 @@ async def book_search(
 ) -> None:
     # 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 depart_city_input.fill(value=one_way_booking_dto.dep_code)
+    await book_search_page.simulation_input_element(
+        locator=depart_city_input, text=one_way_booking_dto.dep_code, delay=200
+    )
     await asyncio.sleep(delay=1)
-    await depart_city_input.press("Enter")
+    # await depart_city_input.press("Enter")
+    depart_city_result = await book_search_page.get_depart_city_search_result(
+        depart_city=one_way_booking_dto.dep_city, timeout=timeout
+    )
+    await depart_city_result.click(button="left")
     logger.info(
         f"航班预订查询页面，搜索栏-起飞城市<{one_way_booking_dto.dep_city} {one_way_booking_dto.dep_code}>输入完成")
 
     # 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 arrive_city_input.fill(value=one_way_booking_dto.arr_code)
+    await book_search_page.simulation_input_element(
+        locator=arrive_city_input, text=one_way_booking_dto.arr_code, delay=200
+    )
     await asyncio.sleep(delay=1)
-    await arrive_city_input.press("Enter")
+    # await arrive_city_input.press("Enter")
+    arrive_city_result = await book_search_page.get_arrive_city_search_result(
+        arrive_city=one_way_booking_dto.arr_city, timeout=timeout
+    )
+    await arrive_city_result.click(button="left")
     logger.info(
         f"航班预订查询页面，搜索栏-抵达城市<{one_way_booking_dto.arr_city} {one_way_booking_dto.arr_code}>输入完成")
 
@@ -92,10 +98,8 @@ async def book_search(
     await flight_query_btn.click(button="left")
     logger.info(f"航班预订查询页面，【查询机票】按钮点击完成")
 
-    # 5.点击查询后，再次处理是否有弹框
-    await _book_search_dialog_handle(
-        logger=logger, page=book_search_page, flight_query_btn=flight_query_btn, timeout=timeout
-    )
+    # 5.点击查询后，再次处理是否有弹框，并航班基本信息plane locator
+    await _book_search_dialog_handle(logger=logger, page=book_search_page, timeout=timeout)
 
     # 6.获取航班基本信息plane locator
     flight_info_plane: Locator = await book_search_page.get_flight_info_plane(
@@ -118,11 +122,15 @@ async def book_search(
     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
     )
-    cabin_product: Dict[str, Any] = products.get(one_way_booking_dto.cabin)
+    # 取出需要预订的舱位产品
+    products = [x for x in products if x.get("cabin") == one_way_booking_dto.cabin and not x.get("ticket_info")]
+    # 根据价格升序排序（默认）
+    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(

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
 

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
 
 

qdairlines_helper/controller/nhlms_cashdesk.py

@@ -11,12 +11,11 @@
 """
 import inspect
 from logging import Logger
-from typing import Callable
+from typing import Callable, Dict, Any
 from playwright.async_api import BrowserContext
 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
 
 
@@ -37,8 +36,8 @@ 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,
-        hf_paid_account_payment_dto: HFPaidAccountPaymentInputDTO, timeout: float = 60.0
+        *, page: NhlmsCashDeskPage, logger: Logger, order_no: int, order_id: int, pre_check_of_payment: Callable,
+        qlv_cookie: Dict[str, Any], hf_paid_account_payment_dto: HFPaidAccountPaymentInputDTO, timeout: float = 60.0
 ) -> PaymentResultDTO:
     # 1. 获取收银台支付流水
     pay_transaction = await page.get_order_transaction(timeout=timeout)
@@ -65,13 +64,17 @@ async def hf_paid_account_payment(
     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_no)
+    # 5.1. 前置检查，为何放在此处
+    if inspect.iscoroutinefunction(pre_check_of_payment):
+        await pre_check_of_payment(
+            order_id=order_id, logger=logger, cookie=qlv_cookie,
+            payment_channel=hf_paid_account_payment_dto.payment_type
+        )
     else:
-        is_pay: bool = is_pay_completed_callback(order_id=order_no)
-    if is_pay is True:
-        raise DuplicatePaymentError(order_no=order_no)
+        pre_check_of_payment(
+            order_id=order_id, logger=logger, cookie=qlv_cookie,
+            payment_channel=hf_paid_account_payment_dto.payment_type
+        )
 
     # 6. 点击【确认支付】
     confirm_payment_btn = await page.get_confirm_payment_btn(timeout=timeout)

qdairlines_helper/controller/order_detail.py

@@ -10,38 +10,60 @@
 # ---------------------------------------------------------------------------------------------------------
 """
 import re
+import inspect
+from logging import Logger
 from aiohttp import CookieJar
-from typing import Dict, Any, Optional, List
+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, timeout: Optional[int] = None, retry: Optional[int] = None,
-        cookie_jar: Optional[CookieJar] = None, enable_log: Optional[bool] = None
+        *, 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]:
-    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
+    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
     )
-    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")
+    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}>，获取详情数据异常，返回值：{order_info}")
+        raise RuntimeError(f"订单<{query_dto.pre_order_no}>，获取详情数据异常，返回值：{last_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
+        *, 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
+        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")
@@ -60,3 +82,6 @@ async def get_order_itinerary(
     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")}，没有生成行程单信息')

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
 
 

qdairlines_helper/controller/order_verify.py

@@ -12,7 +12,8 @@
 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 flight_helper.utils.exception_utils import OrderLimitError
 from qdairlines_helper.po.order_verify_page import OrderVerifyPage
 from qdairlines_helper.utils.po_utils import get_ip_access_blocked_msg
 
@@ -32,7 +33,7 @@ async def load_order_verify_po(
 
 
 async def order_verify(
-        *, page: OrderVerifyPage, logger: Logger, refresh_attempt: int = 3, timeout: float = 60.0
+        *, page: OrderVerifyPage, logger: Logger, qdair_user_id: str, refresh_attempt: int = 3, timeout: float = 60.0
 ) -> None:
     # 1. 先确认订单数据是否加载出来
     await page.get_order_info_plane(timeout=timeout, refresh_attempt=refresh_attempt)
@@ -46,3 +47,11 @@ async def order_verify(
     next_btn = await page.get_next_btn(timeout=timeout)
     await next_btn.click(button="left")
     logger.info("订单校验页面，【下一步】按钮点击完成")
+
+    # 4. 判断是否存在消息提示弹框
+    message: str = await page.get_message_box(logger=logger, timeout=5)
+    if message:
+        raise OrderLimitError(user_id=qdair_user_id, message=message)
+
+    # 5. 看看是否出现易盾校验码
+    await page.handle_yidun_icon(logger=logger, timeout=5)

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(
@@ -37,30 +37,21 @@ async def load_pay_success_page(
 
 
 async def two_check_pay_success(
-        *, page: Page, logger: Logger, query_dto: QueryItineraryRequestDTO, callback_get_proxy: Callable,
+        *, page: NhlmsCashDeskPage, 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:
+) -> None:
     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
+        await page.check_is_pay_success(logger=logger)
+        return
     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",):
+    if order_status not in ("TICKED", "PAYED"):
         raise PaymentFailedError(pre_order_no=query_dto.pre_order_no, order_status=order_status)

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,34 @@ 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()
+    count = 2
+    for index in range(count):
+        proxy = None
+        is_end: bool = True if index + 1 == count 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,) as e:
+            logger.error(e)
+            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}")

qdairlines_helper/http/flight_order.py

@@ -11,51 +11,15 @@
 """
 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 http_helper.client.async_proxy import HttpClientFactory as _HttpClientFactory
+from flight_helper.models.dto.http_schema import HTTPRequestDTO
 
 
-class FlightOrder:
+class FlightOrder(HttpBase):
 
-    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
+    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,

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

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
+        )

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):

qdairlines_helper/po/book_search_page.py

@@ -11,11 +11,11 @@
 """
 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 typing import Optional, Dict, Any, List, Literal
 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
 
@@ -37,14 +37,21 @@ class BookSearchPage(BasePo):
         selector: str = '//strong[contains(text(), "没有在飞航班")]'
         return await self.get_locator(selector=selector, timeout=timeout)
 
+    @staticmethod
+    def _get_reminder_dialog_selector() -> str:
+        return '//div[@class="el-dialog__body"]//button[contains(@class, "search_btn")]'
+
+    async def is_exist_reminder_dialog(self) -> bool:
+        # 使用 count() 快速判断是否存在（不会因找不到而抛异常）
+        return await self.__page.locator(selector=self._get_reminder_dialog_selector()).count() > 0
+
     async def get_reminder_dialog_continue_book_btn(self, timeout: float = 5.0) -> Locator:
         """
         获取预订搜索页的温馨提醒弹框中的【继续购票】按钮
         :param timeout: 超时时间（秒）
         :return: (是否存在, 错误信息|元素对象)
         """
-        selector: str = '//div[@class="el-dialog__body"]//button[contains(@class, "search_btn")]'
-        return await self.get_locator(selector=selector, timeout=timeout)
+        return await self.get_locator(selector=self._get_reminder_dialog_selector(), timeout=timeout)
 
     async def get_depart_city_input(self, timeout: float = 5.0) -> Locator:
         """
@@ -55,6 +62,22 @@ class BookSearchPage(BasePo):
         selector: str = '//div[contains(@class, "flight_search_form")]//input[@id="orig"]'
         return await self.get_locator(selector=selector, timeout=timeout)
 
+    @staticmethod
+    def _get_city_search_result_selector(city_name: str, endpoint: Literal["orig", "dest"]) -> str:
+        return f'xpath=//div[@name="{endpoint}" and @class="vcp-select"]//span[contains(text(), "{city_name}")]/..'
+
+    async def get_depart_city_search_result(self, depart_city: str, timeout: float = 5.0) -> Locator:
+        """
+        获取预订搜索页搜索栏的起飞城市搜索结果
+        :param depart_city: 起飞城市
+        :param timeout: 超时时间（秒）
+        :return: (是否存在, 错误信息|元素对象)
+        """
+        if depart_city == "晋江":
+            depart_city = "泉州"
+        selector = self._get_city_search_result_selector(city_name=depart_city, endpoint="orig")
+        return await self.get_locator(selector=selector, timeout=timeout, strict=False)
+
     async def get_arrive_city_input(self, timeout: float = 5.0) -> Locator:
         """
         获取预订搜索页搜索栏的抵达城市输入框
@@ -64,6 +87,18 @@ class BookSearchPage(BasePo):
         selector: str = '//div[contains(@class, "flight_search_form")]//input[@id="dest"]'
         return await self.get_locator(selector=selector, timeout=timeout)
 
+    async def get_arrive_city_search_result(self, arrive_city: str, timeout: float = 5.0) -> Locator:
+        """
+        获取预订搜索页搜索栏的抵达城市搜索结果
+        :param arrive_city: 抵达城市
+        :param timeout: 超时时间（秒）
+        :return: (是否存在, 错误信息|元素对象)
+        """
+        if arrive_city == "晋江":
+            arrive_city = "泉州"
+        selector = self._get_city_search_result_selector(city_name=arrive_city, endpoint="dest")
+        return await self.get_locator(selector=selector, timeout=timeout, strict=False)
+
     async def get_depart_date_input(self, timeout: float = 5.0) -> Locator:
         """
         获取预订搜索页搜索栏的起飞日期输入框
@@ -144,8 +179,10 @@ class BookSearchPage(BasePo):
                 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)
+                ticket_info: str = await self._get_flight_product_ticket_info(locator=locator, timeout=timeout)
                 flight_products.append(dict(
-                    amounts=amounts, cabin=cabin, seats_status=seats_status, booking_btn=booking_btn
+                    amounts=amounts, cabin=cabin, seats_status=seats_status, booking_btn=booking_btn,
+                    ticket_info=ticket_info
                 ))
             except (PlaywrightError, PlaywrightTimeoutError, EnvironmentError, RuntimeError, Exception) as e:
                 logger.error(e)
@@ -161,7 +198,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()
@@ -176,7 +213,7 @@ class BookSearchPage(BasePo):
         """
         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:
@@ -189,6 +226,20 @@ class BookSearchPage(BasePo):
         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_ticket_info(self, locator: Locator, timeout: float = 5.0) -> Optional[str]:
+        """
+        获取预订搜索页航班内容栏航班产品下的单据信息
+        :param timeout: 超时时间（秒）
+        :param locator: flight_product Locator 对象
+        :return: (是否存在, 错误信息|元素对象)
+        """
+        try:
+            selector: str = 'xpath=.//td[@class="ticket_info"]//span[contains(@class, "text-left")]'
+            locator = await self.get_sub_locator(locator=locator, selector=selector, timeout=timeout)
+            return (await locator.inner_text()).strip()
+        except (Exception,):
+            return
+
     async def _get_flight_product_seats_status(self, locator: Locator, timeout: float = 5.0) -> int:
         """
         获取预订搜索页航班内容栏航班产品下的余票信息
@@ -198,10 +249,30 @@ class BookSearchPage(BasePo):
         """
         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:
             # ⚠️ 正则 \d+ 没有捕获组，只能用 group(0) 或 group()
             return safe_convert_advanced(value=match.group().strip())
         else:
             return 999999
+
+    async def handle_yidun_icon(self, logger: Logger, timeout: float = 20.0) -> None:
+        """
+        获取搜索页面中的易盾校验弹框
+        :param logger: 日志对象
+        :param timeout: 超时时间（秒）
+        :return: (是否存在, 错误信息|元素对象)
+        """
+        selector: str = 'xpath=//div[@class="yidun_intelli-tips"]//div[@class="yidun_intelli-icon"]'
+        try:
+            icon: Locator = await self.get_locator(selector=selector, timeout=timeout, strict=False)
+            await icon.click(button="left")
+            logger.info("预订搜索页面，易盾校验框【易盾icon】点击完成")
+            btn: Locator = await self.get_locator(
+                selector='//div[@class="el-dialog__body"]//button[@type="button"]', timeout=3, strict=False
+            )
+            await btn.click(button="left")
+            logger.info("预订搜索页面，易盾校验框【确认】点击完成")
+        except (Exception,):
+            pass

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):

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 = 60
+        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}秒内未出现成功或已知失败状态")

qdairlines_helper/po/order_verify_page.py

@@ -9,7 +9,8 @@
 # Copyright ©2011-2026. Hunan xxxxxxx Company limited. All rights reserved.
 # ---------------------------------------------------------------------------------------------------------
 """
-from typing import Optional
+from logging import Logger
+from typing import Optional, 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
@@ -24,6 +25,44 @@ class OrderVerifyPage(BasePo):
         super().__init__(page, url or url_const.order_verify_url)
         self.__page = page
 
+    async def handle_yidun_icon(self, logger: Logger, timeout: float = 20.0) -> None:
+        """
+        获取订单校验页中的易盾校验弹框
+        :param logger: 日志对象
+        :param timeout: 超时时间（秒）
+        :return: (是否存在, 错误信息|元素对象)
+        """
+        selector: str = 'xpath=//div[@class="yidun_intelli-tips"]//div[@class="yidun_intelli-icon"]'
+        try:
+            locator: Locator = await self.get_locator(selector=selector, timeout=timeout, strict=False)
+            await locator.click(button="left")
+            logger.info("订单校验页面，易盾校验框【易盾icon】点击完成")
+        except (Exception,):
+            pass
+
+    async def get_message_box(self, logger: Logger, timeout: float = 20.0) -> Optional[str]:
+        """
+        获取订单校验页中的提示消息弹框内容
+        内容可能是：1. 您的账户订单数已达最大上限，请前往青岛航空官方微信小程序进行预订。
+                    2. 请前往青岛航空官方微信小程序进行预订。
+                    3. 抱歉,证件号码为:450511197305180615已经创建订单,订单号OW20260117B1280813,请勿重复占座
+        :param logger: 日志对象
+        :param timeout: 超时时间（秒）
+        :return: (是否存在, 错误信息|元素对象)
+        """
+        selectors: List[str] = [
+            'xpath=//div[@class="el-message-box"]//div[@class="el-message-box__message"]/p',
+            'xpath=//div[@class="layui-layer-content"]'
+        ]
+        for selector in selectors:
+            try:
+                locator: Locator = await self.get_locator(selector=selector, timeout=timeout, strict=False)
+                text: str = (await locator.inner_text()).strip()
+                logger.info(f"订单校验页面，提示框消息内容【{text}】获取完成")
+                return text
+            except (Exception,) as e:
+                logger.error(e)
+
     async def get_order_info_plane(self, timeout: float = 5.0, refresh_attempt: int = 3) -> Locator:
         """
         获取订单校验页中的订单信息版面，注意这里有个小坑，经常出现已经进入了该页面，但是订单信息没有加载出来，需要不断尝试刷新页面
@@ -35,7 +74,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.6.dist-info/RECORD

@@ -1,35 +0,0 @@
-python_qdairlines_helper-0.2.6.dist-info/licenses/LICENSE,sha256=WtjCEwlcVzkh1ziO35P2qfVEkLjr87Flro7xlHz3CEY,11556
-qdairlines_helper/__init__.py,sha256=bN1FqEK_jvefO_HU_8HFJpjuOzHTsuhmRe5KAzmraR4,479
-qdairlines_helper/config/__init__.py,sha256=JjIRocePx3gwFNpdauuiwBU6B2Ug565xaHLEMu5Oo0I,479
-qdairlines_helper/config/url_const.py,sha256=Ro-8r3dRxuloJC5NIpwUMQ7Pezg2cDyZOqNUfTqCOFQ,2086
-qdairlines_helper/controller/__init__.py,sha256=oyeciEBlDLNpqHblB0R-nXQG3HsI8L5mmlWulQ7Y38Q,482
-qdairlines_helper/controller/add_passenger.py,sha256=GxaoSoLOH_XXTR79bDtSEbnmM_dSpBko6OzlrQtuT7U,5159
-qdairlines_helper/controller/book_payment.py,sha256=x_jrgmZ4REMn-Zii7ZUQpuX3j8YAEFe8omt1Fm1z7YY,6059
-qdairlines_helper/controller/book_search.py,sha256=5Tnuolm92HwbIgwhg1SF7e7bPbV2ZRluVTfVxjna-oI,9153
-qdairlines_helper/controller/cash_pax_info.py,sha256=V5QKlvbWp8eF6gRos818w-9MyuienjgECkKKZkxCys8,2511
-qdairlines_helper/controller/home.py,sha256=KzTyl7vvI3_Blc-XQ8ItueGR1hnV6f9gEdYalfXG9Ws,1394
-qdairlines_helper/controller/nhlms_cashdesk.py,sha256=Fai8zZiqhUJl5-RWdkaGOdB3GTd5UQ7fpXDt4Emv65w,4312
-qdairlines_helper/controller/order_detail.py,sha256=LEYrxcGx3kcYuJ9IZa-crRhCJLYTppdMVUu8hEXGrnI,3154
-qdairlines_helper/controller/order_query.py,sha256=JzNrJj6HRHSJMQhszucWPf6nWQl4Y5B7oE1N9SpD47k,1907
-qdairlines_helper/controller/order_verify.py,sha256=G9CC4a6KZg-VdWH6hzHDN7DkaoW2J9_yc7-mE2fL7Ms,2273
-qdairlines_helper/controller/pay_success.py,sha256=tegkKa2b2R8ZqYTtGI6LqqW7h3SShpvM26cf_syi14E,3180
-qdairlines_helper/controller/user_login.py,sha256=7PBbzP7doeUEy4M_Igb32IhjT4GzY_I-U3YimxekR_Q,4735
-qdairlines_helper/http/__init__.py,sha256=96AJPf2zgw_rm3Wv-boIBltWFgZH3Yo-fn5M9SRK280,489
-qdairlines_helper/http/flight_order.py,sha256=tC25YNk1pDzMmk4Zy6v120PwNuuaDhlHFh5xPBxtKco,3665
-qdairlines_helper/po/__init__.py,sha256=HoouLJGLu_dI6IAKTVjBRraGHMcAUgntayTph-BUBAE,481
-qdairlines_helper/po/add_passenger_page.py,sha256=XpaU6g7YSLhA8h3bHWJ_6CwnwgUmRtmLulPoRhkQ6_I,8000
-qdairlines_helper/po/air_order_page.py,sha256=0Ux0B2hUGKCoFLRpJqGHS2w690o0A2PDnvRf9-UKfJE,930
-qdairlines_helper/po/book_search_page.py,sha256=6EgA-yAqwzyT6FIMQD901-LmVmht5eBFiwLiKCE_MEs,10848
-qdairlines_helper/po/cash_pax_info_page.py,sha256=iJlmIxD8IKnMyTNcylmoz9jV0k4u-B5ALXZEUcRajY4,3401
-qdairlines_helper/po/home_page.py,sha256=KvoOZOYwKjlJjZOT522K_8ic3_2zaYOPWkuklUHVSlM,907
-qdairlines_helper/po/login_page.py,sha256=SdWmkP_47GeosbFRcfvXLeQxxdM7b9UESvmajWq4-nA,2975
-qdairlines_helper/po/nhlms_cash_desk_page.py,sha256=TwqszVbCc4iRSE684uafdlGJB1VC5wS9ZuGWvfeb8Fo,4542
-qdairlines_helper/po/order_verify_page.py,sha256=omgs6CBPTPCGnO8cxRFd2ePFUrJZVD5cD_GBCXsZIes,2917
-qdairlines_helper/po/pay_success_page.py,sha256=XGddo8as8wf1kCCdvemqHIRWOPIPv1JG8iXEmpH4zck,1329
-qdairlines_helper/utils/__init__.py,sha256=sti2S709puM2mQbQisk0KGq_YNjW6T4zz2vyYXonNB0,479
-qdairlines_helper/utils/exception_utils.py,sha256=rXPao6h9sW5uL3lUA36FS3WTlePAm5EZ6MBjWeJJTUs,3934
-qdairlines_helper/utils/po_utils.py,sha256=74ZVyyxPmPk1tcGQoMauXhBE3qsZJej8urni1ch27io,2417
-python_qdairlines_helper-0.2.6.dist-info/METADATA,sha256=aTq22fxpTiqZKIUBftm2IPxgGj2vxmrO9OxSGppduqU,14424
-python_qdairlines_helper-0.2.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-python_qdairlines_helper-0.2.6.dist-info/top_level.txt,sha256=MRbQkBMdSG4f5mx2RWfu6aXoDSyM-2KwL-YFqNBdbng,18
-python_qdairlines_helper-0.2.6.dist-info/RECORD,,

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)