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

{python_qdairlines_helper-0.4.3.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.4.3
+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.4.0
-Requires-Dist: python_http_helper>=0.2.1
-Requires-Dist: flight_helper>=0.3.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.4.3.dist-info → python_qdairlines_helper-0.6.0.dist-info}/RECORD

@@ -1,19 +1,19 @@
-python_qdairlines_helper-0.4.3.dist-info/licenses/LICENSE,sha256=WtjCEwlcVzkh1ziO35P2qfVEkLjr87Flro7xlHz3CEY,11556
+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=9QdaakkIyi8qCjZ7TT687JX8Jqt5mp9SSQ307NYZ3tY,6270
-qdairlines_helper/controller/book_search.py,sha256=XQQuI1xX6rO-MqdJ15_X5wX94Yeqj9UVat6p55beNu8,8977
+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=1gWURu9VnjjvvalAu-uF7eXVMSsiaBDWHPwG8EgDRh8,4308
+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=3_bc1R47_vaCIEJaPWrxyYrE49v2J1-KsGCmAEEloKc,2269
-qdairlines_helper/controller/pay_success.py,sha256=G8Vf5MDDBgvDo3MIg-deEvyv4PJfxdzLhpHU9TGuejc,3295
-qdairlines_helper/controller/user_login.py,sha256=ojW6mqZdiURpi5K1gMPdFlqCUieOkBhcXDJELW5Hktw,6210
+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
@@ -21,16 +21,16 @@ qdairlines_helper/http/user_login.py,sha256=S_thG1RLXv5x5MQJmEG-oo38ReIF3_p17hVw
 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=T2bxKFuvApY0rMlU7NHso0CwQ9XXOR0xz4bvIgI1x0k,10865
+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=K3GCcmfHbMOhZnVB7hHKJflVy0DbiidDJBfJ3IMbMGc,6671
-qdairlines_helper/po/order_verify_page.py,sha256=7boJVdzoV9IdIGtbjza3za9C26_4LFBjOmp27-0_ick,2924
+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.4.3.dist-info/METADATA,sha256=J8UgJTIFyVdwztik2df4g_eVENNr_WY8wH6Vj7FqcdM,14424
-python_qdairlines_helper-0.4.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-python_qdairlines_helper-0.4.3.dist-info/top_level.txt,sha256=MRbQkBMdSG4f5mx2RWfu6aXoDSyM-2KwL-YFqNBdbng,18
-python_qdairlines_helper-0.4.3.dist-info/RECORD,,
+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/controller/book_payment.py

@@ -15,6 +15,7 @@ from playwright.async_api import Page
 from typing import Any, List, Callable, Optional, Dict
 from flight_helper.models.dto.passenger import PassengerDTO
 from flight_helper.models.dto.itinerary import QueryItineraryRequestDTO
+from qdairlines_helper.controller.pay_success import two_check_pay_success
 from 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
@@ -23,14 +24,13 @@ from flight_helper.models.dto.payment import HFPaidAccountPaymentInputDTO, Payme
 from qdairlines_helper.controller.add_passenger import add_passenger, load_add_passenger_po
 from qdairlines_helper.controller.cash_pax_info import load_cash_pax_info_po, select_payment_channel
 from qdairlines_helper.controller.nhlms_cashdesk import load_nhlms_cash_desk_po, hf_paid_account_payment
-from qdairlines_helper.controller.pay_success import two_check_pay_success, check_hf_payment_is_success
 
 
 async def book_payment_callback(
-        *, 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. 加载支付类型页面对象
@@ -94,8 +97,8 @@ async def book_payment_callback(
         # 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,
-            is_pay_completed_callback=is_pay_completed_callback,
-            hf_paid_account_payment_dto=hf_paid_account_payment_dto
+            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
@@ -105,14 +108,10 @@ async def book_payment_callback(
             storage_state=qdair_cookie.get("storage_state"), token=qdair_cookie.get("token"),
             pre_order_no=pre_order_no, user_id=qdair_cookie.get("user_id"), headers=qdair_cookie.get("headers")
         )
-
-        # 11. 检查是否支付成功
-        if kwargs.get("暂时不走这个逻辑，改用轻逻辑验证"):
-            await two_check_pay_success(
-                page=page, logger=logger, timeout=timeout, query_dto=query_dto, retry=retry, enable_log=enable_log,
-                callback_get_proxy=callback_get_proxy, cookie_jar=cookie_jar
-            )
-        await check_hf_payment_is_success(page=nhlms_cash_desk_po, logger=logger)
+        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

@@ -9,15 +9,14 @@
 # Copyright ©2011-2026. Hunan xxxxxxx Company limited. All rights reserved.
 # ---------------------------------------------------------------------------------------------------------
 """
-import time
 import asyncio
+from time import time
 from logging import Logger
-from typing import Dict, Any, List, Optional
+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.po.book_search_page import BookSearchPage
 from qdairlines_helper.utils.po_utils import get_ip_access_blocked_msg
-from playwright.async_api import TimeoutError as PlaywrightTimeoutError
 from flight_helper.models.dto.booking import OneWayBookingDTO, BookingInputDTO
 from flight_helper.utils.exception_utils import NotEnoughTicketsError, ExcessiveProfitdError, ExcessiveLossesError, \
     IPBlockError
@@ -39,26 +38,18 @@ async def open_book_search_page(
     return book_search_po
 
 
-async def _book_search_dialog_handle(
-        *, logger: Logger, page: BookSearchPage, flight_no: str, timeout: float = 60.0
-) -> Locator:
-    end_time = time.time() + timeout
-    last_exception: Optional[Exception] = None
-    while time.time() < end_time:
+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=1)
             await continue_book_btn.click(button="left")
             logger.info("航班预订查询页面，出现温馨提醒弹框，【继续购票】按钮点击完成")
+            return
         except (Exception,):
             pass
-        try:
-            # 1.获取航班基本信息plane locator
-            flight_info_plane: Locator = await page.get_flight_info_plane(flight_no=flight_no, timeout=1)
-            return flight_info_plane
-        except (Exception,) as e:
-            last_exception = e
-    raise last_exception
+        await asyncio.sleep(0.1)  # 快速轮询
 
 
 async def book_search(
@@ -67,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 asyncio.sleep(delay=2)
-    await depart_city_input.press("Enter")
+    # 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")
+    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 asyncio.sleep(delay=2)
-    await arrive_city_input.press("Enter")
+    # 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")
+    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}>输入完成")
 
@@ -94,14 +99,12 @@ async def book_search(
     logger.info(f"航班预订查询页面，【查询机票】按钮点击完成")
 
     # 5.点击查询后，再次处理是否有弹框，并航班基本信息plane locator
-    flight_info_plane: Locator = await _book_search_dialog_handle(
-        logger=logger, page=book_search_page, timeout=timeout, flight_no=one_way_booking_dto.flight_no
-    )
+    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(
-    #     flight_no=one_way_booking_dto.flight_no, timeout=timeout
-    # )
+    flight_info_plane: Locator = await book_search_page.get_flight_info_plane(
+        flight_no=one_way_booking_dto.flight_no, timeout=timeout
+    )
 
     # 8. 获取产品类型
     flight_product_nav: Locator = await book_search_page.get_flight_product_nav(
@@ -120,7 +123,7 @@ async def book_search(
         locator=flight_info_plane, flight_no=one_way_booking_dto.flight_no, logger=logger
     )
     # 取出需要预订的舱位产品
-    products = [x for x in products if x.get("cabin")]
+    products = [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 判断是否存在该舱位

qdairlines_helper/controller/nhlms_cashdesk.py

@@ -11,10 +11,9 @@
 """
 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 flight_helper.utils.exception_utils import DuplicatePaymentError
 from qdairlines_helper.po.nhlms_cash_desk_page import NhlmsCashDeskPage
 from playwright_helper.utils.browser_utils import switch_for_table_window
 from 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: int, 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_verify.py

@@ -13,6 +13,7 @@ from logging import Logger
 from playwright.async_api import Page
 import qdairlines_helper.config.url_const as url_const
 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

@@ -37,18 +37,13 @@ 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)
 
@@ -58,10 +53,5 @@ async def two_check_pay_success(
         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)
-
-
-async def check_hf_payment_is_success(*, page: NhlmsCashDeskPage, logger: Logger) -> None:
-    # 1. 看支付成功页面是否加载完成
-    await page.check_is_pay_success(logger=logger)

qdairlines_helper/controller/user_login.py

@@ -106,9 +106,10 @@ async def get_user_info(
 ) -> Dict[str, Any]:
     user_login = UserLogin(http_request_dto=http_request_dto, cookie_jar=cookie_jar)
     last_user_info: Dict[str, Any] = dict()
-    for index in range(5):
+    count = 2
+    for index in range(count):
         proxy = None
-        is_end: bool = True if index + 1 == 5 else False
+        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)
@@ -121,7 +122,8 @@ async def get_user_info(
             await user_login.http_client.close()
             logger.info("获取青岛航空官网的用户详情数据成功")
             break
-        except (Exception,):
+        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")

qdairlines_helper/po/book_search_page.py

@@ -11,9 +11,9 @@
 """
 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 flight_helper.utils.exception_utils import ProductTypeError
 from playwright_helper.utils.type_utils import convert_order_amount_text, safe_convert_advanced
@@ -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)
@@ -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:
         """
         获取预订搜索页航班内容栏航班产品下的余票信息
@@ -205,3 +256,23 @@ class BookSearchPage(BasePo):
             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/nhlms_cash_desk_page.py

@@ -111,7 +111,7 @@ class NhlmsCashDeskPage(BasePo):
                 '//h3[contains(text(), "您的IP")]'
             )
         ])
-        timeout = 120
+        timeout = 60
         end_time = datetime.now() + timedelta(seconds=timeout)
 
         while datetime.now() < end_time:

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:
         """
         获取订单校验页中的订单信息版面，注意这里有个小坑，经常出现已经进入了该页面，但是订单信息没有加载出来，需要不断尝试刷新页面