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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python_qdairlines_helper
-Version: 0.0.6
+Version: 0.2.6
 Summary: qdairlines helper python package
 Author-email: ckf10000 <ckf10000@sina.com>
 License:                                  Apache License
@@ -212,6 +212,7 @@ 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
 Dynamic: license-file
 
 # python-qdairlines-helper

python_qdairlines_helper-0.2.6.dist-info/RECORD

@@ -0,0 +1,35 @@
+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/config/url_const.py

@@ -25,7 +25,6 @@ add_passenger_url: str = "/book/verifySecure"
 order_verify_url: str = "/book/orderVerify"
 cash_pax_info_url: str = "/book/cashPaxInfoInput"
 # https://nhlms.cloudpnr.com/nobel/WebEntry.do  汇付天下收银台
-nhlms_cashdesk_domain: str = "https://nhlms.cloudpnr.com"
 nhlms_cashdesk_url: str = "/nobel/WebEntry.do"
 # https://excashier.alipay.com/standard/auth.htm?payOrderId=4e3606b1c842414c88f631c35952a88e.85  支付宝收银台
 alipay_url: str = "/standard/auth.htm"
@@ -35,3 +34,5 @@ wechat_pay_url: str = "/book/payPreCash"
 yeepay_cashdesk_url: str = "/bc-cashier/bcnewpc/request/{}/{}"
 # https://www.qdairlines.com/user/airorder/orderdetail?orderNo=OW20260105B1154687&orderType=2
 order_detail_url: str = "/user/airorder/orderdetail"
+# https://www.qdairlines.com/pay/success
+pay_success_url: str = "/pay/success"

qdairlines_helper/controller/add_passenger.py

@@ -9,16 +9,19 @@
 # Copyright ©2011-2026. Hunan xxxxxxx Company limited. All rights reserved.
 # ---------------------------------------------------------------------------------------------------------
 """
-from typing import List, Dict, Any
+from typing import List
+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 flight_helper.models.dto.passenger import PassengerDTO
+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
 
 
 async def load_add_passenger_po(
-        *, page: Page, protocol: str, domain: str, timeout: float = 60.0
+        *, page: Page, logger: Logger, protocol: str, domain: str, timeout: float = 60.0
 ) -> AddPassengerPage:
     url_prefix = f"{protocol}://{domain}"
     add_passenger_url = url_prefix + url_const.add_passenger_url
@@ -27,59 +30,59 @@ async def load_add_passenger_po(
     logger.info(f"即将进入青岛航空官网添加乘客页面，页面URL<{add_passenger_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 add_passenger_po
 
 
 async def add_passenger(
-        *, page: AddPassengerPage, passengers: List[Dict[str, Any]], service_mobile: str, timeout: float = 60.0
+        *, page: AddPassengerPage, logger: Logger, passengers_dto: List[PassengerDTO], book_input_dto: BookingInputDTO,
+        timeout: float = 60.0
 ) -> None:
     # 遍历方式添加乘客
-    for index, passenger in enumerate(passengers):
-        p_type = passenger.get("p_type")
+    for index, passenger_dto in enumerate(passengers_dto):
         if index != 0:
             # 1. 点击【添加成人|添加儿童|添加婴儿】按钮
-            add_adult_btn = await page.get_add_passenger_btn(passenger_type=p_type, timeout=timeout)
+            add_adult_btn = await page.get_add_passenger_btn(
+                passenger_type=passenger_dto.passenger_type, timeout=timeout
+            )
             await add_adult_btn.click(button="left")
-            logger.info(f"添加乘客页面，【添加{p_type}】按钮点击完成")
+            logger.info(f"添加乘客页面，【添加{passenger_dto.passenger_type}】按钮点击完成")
         # 2. 获取 乘机人信息plane
         passenger_info_plane = await page.get_add_passenger_plane(timeout=timeout, position_index=index)
         logger.info(f"添加乘客页面，第<{index + 1}>乘机人信息---plane获取完成")
 
         # 3. 选择旅客类型
         adult_checkbox = await page.get_passenger_type_checkbox(
-            passenger_type=p_type, timeout=timeout, position_index=index
+            passenger_type=passenger_dto.passenger_type, timeout=timeout, position_index=index
         )
         await adult_checkbox.click(button="left")
-        logger.info(f"添加乘客页面，第<{index + 1}>乘机人信息---旅客类型【{p_type}】单选框点击完成")
+        logger.info(f"添加乘客页面，第<{index + 1}>乘机人信息---旅客类型【{passenger_dto.passenger_type}】单选框点击完成")
 
         # 4. 输入姓名
-        p_name = passenger.get("p_name")
         username_input = await page.get_passenger_username_input(locator=passenger_info_plane, timeout=timeout)
-        await username_input.fill(value=p_name)
-        logger.info(f"添加乘客页面，第<{index + 1}>乘机人信息---姓名<{p_name}>输入完成")
+        await username_input.fill(value=passenger_dto.passenger_name)
+        logger.info(f"添加乘客页面，第<{index + 1}>乘机人信息---姓名<{passenger_dto.passenger_name}>输入完成")
 
         # 5. 选择性别
-        gender = passenger.get("gender")
-        gender_checkbox = await page.get_gender_checkbox(locator=passenger_info_plane, gender=gender, timeout=timeout)
+        gender_checkbox = await page.get_gender_checkbox(
+            locator=passenger_info_plane, gender=passenger_dto.gender, timeout=timeout
+        )
         await gender_checkbox.click(button="left")
-        logger.info(f"添加乘客页面，第<{index + 1}>乘机人信息---性别【{gender}】单选框点击完成")
+        logger.info(f"添加乘客页面，第<{index + 1}>乘机人信息---性别【{passenger_dto.gender}】单选框点击完成")
 
         # 6. 选择证件类型 TODO 暂时只支持身份证类型，待后续完善
-        id_type = passenger.get("id_type")
-        if id_type != "身份证":
-            raise EnvironmentError(f"乘客证件类型<{id_type}>暂不支持")
+        if passenger_dto.id_type != "身份证":
+            raise EnvironmentError(f"乘客证件类型<{passenger_dto.id_type}>暂不支持")
 
         # 7. 输入证件号码
-        id_no = passenger.get("id_no")
         id_no_input = await page.get_id_no_input(locator=passenger_info_plane, timeout=timeout)
-        await id_no_input.fill(value=id_no)
-        logger.info(f"添加乘客页面，第<{index + 1}>乘机人信息---证件号码<{id_no}>输入完成")
+        await id_no_input.fill(value=passenger_dto.id_number)
+        logger.info(f"添加乘客页面，第<{index + 1}>乘机人信息---证件号码<{passenger_dto.id_number}>输入完成")
 
     # 8. 输入联系人电话
     service_mobile_input = await page.get_service_mobile_input(timeout=timeout)
-    await service_mobile_input.fill(value=service_mobile)
-    logger.info(f"添加乘客页面，联系人信息---手机号码<{service_mobile}>输入完成")
+    await service_mobile_input.fill(value=book_input_dto.specialist_mobile)
+    logger.info(f"添加乘客页面，联系人信息---手机号码<{book_input_dto.specialist_mobile}>输入完成")
 
     # 9. 勾选同意单选框
     agree_checkbox = await page.get_agree_checkbox(timeout=timeout)
@@ -89,4 +92,4 @@ async def add_passenger(
     # 10. 点击【下一步】
     next_btn = await page.get_next_btn(timeout=timeout)
     await next_btn.click(button="left")
-    logger.info(f"添加乘客页面，【下一步】按钮点击完成，<{len(passengers)}>名乘客信息添加成功")
+    logger.info(f"添加乘客页面，【下一步】按钮点击完成，<{len(passengers_dto)}>名乘客信息添加成功")

qdairlines_helper/controller/book_payment.py

@@ -9,75 +9,107 @@
 # Copyright ©2011-2026. Hunan xxxxxxx Company limited. All rights reserved.
 # ---------------------------------------------------------------------------------------------------------
 """
+from logging import Logger
+from aiohttp import CookieJar
 from playwright.async_api import Page
-from qdairlines_helper.utils.log_utils import logger
-from typing import Dict, Any, List, Optional, Callable
+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.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_type
-from qdairlines_helper.controller.nhlms_cashdesk import load_nhlms_cash_desk_po, pay_account_payment
+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
 
 
 async def book_payment_callback(
-        *, page: Page, protocol: str, domain: str, dep_city: str, arr_city: str, dep_date: str, flight_no: str,
-        cabin: str, login_user: str, login_password: str, passengers: List[Dict[str, Any]], service_mobile: str,
-        price_std: float, order_id: int, is_pay_completed_callback: Callable, product_type: str = "经济舱",
-        payment_type: str = "汇付天下", sub_payment_type: str = "付款账户支付", operator_account: Optional[str] = None,
-        timeout: float = 60.0, pay_password: Optional[str] = None, refresh_attempt: int = 3,
-        price_increase_threshold: float = 20.0, price_reduction_threshold: float = 10.0, **kwargs: Any
-) -> Dict[str, Any]:
+        *, page: Page, logger: Logger, is_pay_completed_callback: 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,
+        hf_paid_account_payment_dto: Optional[HFPaidAccountPaymentInputDTO] = None, **kwargs: Any
+) -> PaymentResultDTO:
     # 1. 打开预订搜索页面
-    book_search_page = await open_book_search_page(page=page, protocol=protocol, domain=domain, timeout=timeout)
+    book_search_page = await open_book_search_page(
+        page=page, logger=logger, protocol=book_input_dto.book_protocol, domain=book_input_dto.book_domain,
+        timeout=timeout
+    )
 
     # 2. 预订搜索
     await book_search(
-        book_search_page=book_search_page, dep_city=dep_city, arr_city=arr_city, dep_date=dep_date, flight_no=flight_no,
-        cabin=cabin, passengers=len(passengers), product_type=product_type, price_std=price_std, timeout=timeout,
-        price_increase_threshold=price_increase_threshold, price_reduction_threshold=price_reduction_threshold,
+        book_search_page=book_search_page, one_way_booking_dto=one_way_booking_dto, book_input_dto=book_input_dto,
+        passengers=len(passengers_dto), logger=logger, timeout=timeout
     )
-    logger.info(f"订单<{order_id}>，预订搜索结束")
+    logger.info(f"订单<{one_way_booking_dto.order_no}>，预订搜索结束")
 
     # 3. 加载添加乘客页面对象
-    add_passenger_po = await load_add_passenger_po(page=page, protocol=protocol, domain=domain, timeout=timeout)
+    add_passenger_po = await load_add_passenger_po(
+        page=page, logger=logger, protocol=book_input_dto.book_protocol, domain=book_input_dto.book_domain,
+        timeout=timeout
+    )
 
     # 4. 添加乘客
-    await add_passenger(page=add_passenger_po, passengers=passengers, service_mobile=service_mobile, timeout=timeout)
-    logger.info(f"订单<{order_id}>，添加乘客结束")
+    await add_passenger(
+        page=add_passenger_po, logger=logger, passengers_dto=passengers_dto, book_input_dto=book_input_dto,
+        timeout=timeout
+    )
+    logger.info(f"订单<{one_way_booking_dto.order_no}>，添加乘客结束")
 
     # 5. 加载订单校验页面对象
-    order_verify_po = await load_order_verify_po(page=page, protocol=protocol, domain=domain, timeout=timeout)
+    order_verify_po = await load_order_verify_po(
+        page=page, logger=logger, protocol=book_input_dto.book_protocol, domain=book_input_dto.book_domain,
+        timeout=timeout
+    )
 
     # 6. 校验订单
-    await order_verify(page=order_verify_po, refresh_attempt=refresh_attempt, timeout=timeout)
-    logger.info(f"订单<{order_id}>，校验订单结束")
+    await order_verify(page=order_verify_po, logger=logger, refresh_attempt=refresh_attempt, timeout=timeout)
+    logger.info(f"订单<{one_way_booking_dto.order_no}>，校验订单结束")
 
     # 7. 加载支付类型页面对象
-    cash_pax_info_po = await load_cash_pax_info_po(page=page, protocol=protocol, domain=domain, timeout=timeout)
+    cash_pax_info_po = await load_cash_pax_info_po(
+        page=page, logger=logger, protocol=book_input_dto.book_protocol, domain=book_input_dto.book_domain,
+        timeout=timeout
+    )
 
-    # 8. 选择支付方式
-    pre_order_no: str = await select_payment_type(page=cash_pax_info_po, payment_type=payment_type, timeout=timeout)
-    logger.info(f"订单<{order_id}>，选择支付方式结束")
+    if isinstance(hf_paid_account_payment_dto, HFPaidAccountPaymentInputDTO):
+        # 8. 选择支付渠道
+        pre_order_no: str = await select_payment_channel(
+            page=cash_pax_info_po, logger=logger, channel_name=hf_paid_account_payment_dto.channel_name, timeout=timeout
+        )
+        logger.info(f"订单<{one_way_booking_dto.order_no}>，选择支付方式结束")
 
-    # 9. 根据支付方式，加载不同的收银台页面对象
-    if payment_type == "汇付天下":
-        nhlms_cash_desk_po = await load_nhlms_cash_desk_po(context=kwargs.get("context"), timeout=timeout)
+        # 9. 根据支付方式，加载不同的收银台页面对象
+        nhlms_cash_desk_po = await load_nhlms_cash_desk_po(
+            context=kwargs.get("context"), timeout=timeout, logger=logger,
+            domain=hf_paid_account_payment_dto.pay_domain, protocol=hf_paid_account_payment_dto.pay_protocol
+        )
 
         # 10. 汇付天下操作支付
-        if sub_payment_type == "付款账户支付":
+        if hf_paid_account_payment_dto.payment_type == "付款账户支付":
             # 10. 汇付天下操作支付
-            pay_transaction, actual_payment_amount = await pay_account_payment(
-                page=nhlms_cash_desk_po, operator_account=operator_account, pay_password=pay_password, timeout=timeout,
-                payment_type=sub_payment_type, is_pay_completed_callback=is_pay_completed_callback, order_id=order_id
+            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
+
+            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")
             )
-            logger.info(f"订单<{order_id}>，汇付天下操作支付结束")
 
-            return dict(
-                actual_payment_amount=actual_payment_amount, pre_order_no=pre_order_no, passengers=passengers,
-                channel_user_id=login_user, channel_user_password=login_password, order_id=order_id,
-                pay_transaction=pay_transaction
+            # 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
             )
-        else:
-            raise EnvironmentError(f"汇付天下暂不支持<{sub_payment_type}>操作支付方式")
+            return payment_result_dto
     else:
-        raise EnvironmentError(f"暂不支持<{payment_type}>支付方式")
+        raise PaymentChannelMissError()

qdairlines_helper/controller/book_search.py

@@ -10,17 +10,23 @@
 # ---------------------------------------------------------------------------------------------------------
 """
 import asyncio
-from typing import Dict, Any
+from logging import Logger
+from typing import Dict, Any, List
 from playwright.async_api import Page, Locator
-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.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
 
 
-async def open_book_search_page(*, page: Page, protocol: str, domain: str, timeout: float = 60.0) -> BookSearchPage:
+async def open_book_search_page(
+        *, page: Page, logger: Logger, protocol: str, domain: str, timeout: float = 60.0
+) -> BookSearchPage:
     url_prefix = f"{protocol}://{domain}"
-    book_search_url = url_prefix + url_const.login_url
+    book_search_url = url_prefix + url_const.book_search_url
     await page.goto(book_search_url)
 
     book_search_po = BookSearchPage(page=page, url=book_search_url)
@@ -28,87 +34,134 @@ async def open_book_search_page(*, page: Page, protocol: str, domain: str, timeo
     logger.info(f"即将进入青岛航空官网航班预订查询页面，页面URL<{book_search_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 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,):
+        try:
+            # 2. 点击继续购票按钮
+            continue_book_btn = await page.get_reminder_dialog_continue_book_btn(timeout=timeout)
+            await continue_book_btn.click(button="left")
+            logger.info("航班预订查询页面，出现温馨提醒弹框，【继续购票】按钮点击完成")
+        except (PlaywrightTimeoutError, RuntimeError, EnvironmentError, Exception,):
+            pass
+
+
 async def book_search(
-        *, book_search_page: BookSearchPage, dep_city: str, arr_city: str, dep_date: str, flight_no: str,
-        cabin: str, passengers: int, product_type: str = "经济舱", price_std: float, timeout: float = 60.0,
-        price_increase_threshold: float = 20.0, price_reduction_threshold: float = 10.0
+        *, book_search_page: BookSearchPage, logger: Logger, passengers: int, book_input_dto: BookingInputDTO,
+        one_way_booking_dto: OneWayBookingDTO, timeout: float = 60.0
 ) -> None:
-    try:
-        # 1. 判断是否存在温馨提醒弹框
-        continue_book_btn = await book_search_page.get_reminder_dialog_continue_book_btn(timeout=timeout)
-        await continue_book_btn.click(button="left")
-        logger.info("航班预订查询页面，出现温馨提醒弹框，【继续购票】按钮点击完成")
-    except (Exception,):
-        pass
-
-    # 2.搜索栏输入起飞城市
+    # 1.搜索栏输入起飞城市
     depart_city_input = await book_search_page.get_depart_city_input(timeout=timeout)
-    await depart_city_input.fill(value=dep_city)
+    await depart_city_input.fill(value=one_way_booking_dto.dep_code)
     await asyncio.sleep(delay=1)
     await depart_city_input.press("Enter")
-    logger.info(f"航班预订查询页面，搜索栏-起飞城市<{dep_city}>输入完成")
+    logger.info(
+        f"航班预订查询页面，搜索栏-起飞城市<{one_way_booking_dto.dep_city} {one_way_booking_dto.dep_code}>输入完成")
 
-    # 3.搜索栏输入抵达城市
+    # 2.搜索栏输入抵达城市
     arrive_city_input = await book_search_page.get_arrive_city_input(timeout=timeout)
-    await arrive_city_input.fill(value=arr_city)
+    await arrive_city_input.fill(value=one_way_booking_dto.arr_code)
     await asyncio.sleep(delay=1)
     await arrive_city_input.press("Enter")
-    logger.info(f"航班预订查询页面，搜索栏-抵达城市<{arr_city}>输入完成")
+    logger.info(
+        f"航班预订查询页面，搜索栏-抵达城市<{one_way_booking_dto.arr_city} {one_way_booking_dto.arr_code}>输入完成")
 
-    # 4.搜索栏输入起飞时间
+    # 3.搜索栏输入起飞时间
     depart_date_input = await book_search_page.get_depart_date_input(timeout=timeout)
-    await depart_date_input.fill(value=dep_date)
+    await depart_date_input.fill(value=one_way_booking_dto.dep_date)
     await asyncio.sleep(delay=1)
     await depart_date_input.press("Enter")
-    logger.info(f"航班预订查询页面，搜索栏-起飞日期<{dep_date}>输入完成")
+    logger.info(f"航班预订查询页面，搜索栏-起飞日期<{one_way_booking_dto.dep_date}>输入完成")
 
-    # 5.点击【查询机票】按钮
+    # 4.点击【查询机票】按钮
     flight_query_btn = await book_search_page.get_flight_query_btn(timeout=timeout)
     await flight_query_btn.click(button="left")
     logger.info(f"航班预订查询页面，【查询机票】按钮点击完成")
 
-    # 6. 获取航班基本信息plane locator
-    flight_info_plane: Locator = await book_search_page.get_flight_info_plane(timeout=timeout)
-    page_flight_no: str = await book_search_page.get_flight_no(locator=flight_info_plane, timeout=timeout)
-    if flight_no not in page_flight_no:
-        raise RuntimeError(f"航班预订查询页面，没有搜索到航班<{flight_no}>数据")
+    # 5.点击查询后，再次处理是否有弹框
+    await _book_search_dialog_handle(
+        logger=logger, page=book_search_page, flight_query_btn=flight_query_btn, 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
+    )
 
-    # 7. 获取产品类型
+    # 8. 获取产品类型
     flight_product_nav: Locator = await book_search_page.get_flight_product_nav(
-        locator=flight_info_plane, product_type=product_type, timeout=timeout
+        locator=flight_info_plane, product_type=book_input_dto.product_type, timeout=timeout
     )
     await flight_product_nav.click(button="left")
-    logger.info(f"航班预订查询页面，产品类型【{product_type}】选择完成")
+    logger.info(f"航班预订查询页面，产品类型【{book_input_dto.product_type}】选择完成")
+
+    # 9. 点击获取更多产品和价格的按钮
+    more_product_btn = await book_search_page.get_more_product_btn(locator=flight_info_plane, timeout=timeout)
+    await more_product_btn.click(button="left")
+    logger.info(f"航班预订查询页面，航班<{one_way_booking_dto.flight_no}>产品列表，【更多舱位及价格】按钮点击完成")
 
-    # 8. 获取所有的产品
-    products: Dict[str, Any] = await book_search_page.get_flight_products(timeout=timeout)
-    cabin_product: Dict[str, Any] = products.get(cabin)
-    # 8.1 判断是否存在该舱位
+    # 9. 获取所有的产品
+    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)
+    # 9.1 判断是否存在该舱位
     if not cabin_product:
-        raise RuntimeError(f"航班预订查询页面，没有搜索到航班<{flight_no}>的{cabin}舱数据")
-    # 8.2 判断余座
+        raise RuntimeError(
+            f"航班预订查询页面，没有搜索到航班<{one_way_booking_dto.flight_no}>的{one_way_booking_dto.cabin}舱数据")
+    # 9.2 判断余座
     seats_status = cabin_product.get("seats_status")
-    logger.info(f"航班预订查询页面，航班<{flight_no}>舱位<{cabin}>的座位情况：{seats_status}")
+    logger.info(
+        f"航班预订查询页面，航班<{one_way_booking_dto.flight_no}>舱位<{one_way_booking_dto.cabin}>的座位情况：{seats_status}")
     if seats_status < passengers:
-        raise EnvironmentError(f"航班<{flight_no}>的余票: {seats_status}，数量不足")
-    # 8.3. 判断货币符号，是否为 ¥(人民币结算)
+        raise NotEnoughTicketsError(
+            flight_no=one_way_booking_dto.flight_no, seats_status=seats_status, passengers=passengers
+        )
+    # 9.3. 判断货币符号，是否为 ¥(人民币结算)
     # 目前都为国内航班，暂不考虑货币种类
 
-    # 8.4 判断销售价格是否满足预订需要
+    # 9.4 判断销售价格是否满足预订需要
     amounts: Dict[str, Any] = cabin_product.get("amounts")
     amount: float = amounts.get("amount")
-    if amount > price_std + price_increase_threshold:
-        raise EnvironmentError(
-            f"航班预订查询页面，航班<{flight_no}>官网价：{amount} 高于：订单销售价[{price_std}] + 上浮阈值[{price_increase_threshold}]，损失过高")
-    if amount < price_std - price_reduction_threshold:
-        raise EnvironmentError(
-            f"航班预订查询页面，航班<{flight_no}>官网价：{amount} 低于：订单销售价[{price_std}] - 下降阈值[{price_reduction_threshold}]，收益过高")
-
-    # 9. 点击【购票】按钮
+    if amount > one_way_booking_dto.standard_price + book_input_dto.standard_increase_threshold:
+        raise ExcessiveLossesError(
+            flight_no=one_way_booking_dto.flight_no, query_price=amount, order_price=one_way_booking_dto.standard_price,
+            increase_threshold=book_input_dto.standard_increase_threshold, asset="票面价"
+        )
+    if amount < one_way_booking_dto.standard_price - book_input_dto.standard_reduction_threshold:
+        raise ExcessiveProfitdError(
+            flight_no=one_way_booking_dto.flight_no, query_price=amount, order_price=one_way_booking_dto.standard_price,
+            reduction_threshold=book_input_dto.standard_reduction_threshold, asset="票面价"
+        )
+    if book_input_dto.sale_increase_threshold > 0:
+        if amount > one_way_booking_dto.sale_price + book_input_dto.sale_increase_threshold:
+            raise ExcessiveLossesError(
+                flight_no=one_way_booking_dto.flight_no, query_price=amount, order_price=one_way_booking_dto.sale_price,
+                increase_threshold=book_input_dto.sale_increase_threshold, asset="销售价"
+            )
+    if book_input_dto.sale_increase_threshold > 0:
+        if amount < one_way_booking_dto.sale_price - book_input_dto.sale_reduction_threshold:
+            raise ExcessiveProfitdError(
+                flight_no=one_way_booking_dto.flight_no, query_price=amount,
+                order_price=one_way_booking_dto.sale_price,
+                reduction_threshold=book_input_dto.sale_reduction_threshold, asset="销售价"
+            )
+
+    # 10. 点击【购票】按钮
     booking_btn: Locator = cabin_product.get("booking_btn")
     await booking_btn.click(button="left")
     logger.info(f"航班预订查询页面，【购票】按钮点击完成")

qdairlines_helper/controller/cash_pax_info.py

@@ -9,15 +9,16 @@
 # 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.cash_pax_info_page import CashPaxInfoPage
 from qdairlines_helper.utils.po_utils import get_ip_access_blocked_msg
 
 
 async def load_cash_pax_info_po(
-        *, page: Page, protocol: str, domain: str, timeout: float = 60.0
+        *, page: Page, logger: Logger, protocol: str, domain: str, timeout: float = 60.0
 ) -> CashPaxInfoPage:
     url_prefix = f"{protocol}://{domain}"
     cash_pax_info_url = url_prefix + url_const.cash_pax_info_url
@@ -26,19 +27,21 @@ async def load_cash_pax_info_po(
     logger.info(f"即将进入青岛航空官网支付方式页面，页面URL<{cash_pax_info_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 cash_pax_info_po
 
 
-async def select_payment_type(*, page: CashPaxInfoPage, payment_type: str = "汇付天下", timeout: float = 60.0) -> str:
+async def select_payment_channel(
+        *, page: CashPaxInfoPage, logger: Logger, channel_name: str = "汇付天下", timeout: float = 60.0
+) -> str:
     # 1. 获取青岛航空官网订单号
     pre_order_no = await page.get_pre_order_no(timeout=timeout)
     logger.info(f"选择支付方式页面，青岛航空官网订单号<{pre_order_no}>获取完成")
 
-    # 2. 选择支付类型【payment_type】
-    payment_type_checkbox = await page.get_payment_type_checkbox(payment_type=payment_type, timeout=timeout)
-    await payment_type_checkbox.click(button="left")
-    logger.info(f"选择支付方式页面，第三方支付【{payment_type}】单选框点击完成")
+    # 2. 选择支付渠道【channel_name】
+    payment_channel_checkbox = await page.get_payment_channel_checkbox(channel_name=channel_name, timeout=timeout)
+    await payment_channel_checkbox.click(button="left")
+    logger.info(f"选择支付方式页面，支付渠道【{channel_name}】单选框点击完成")
 
     # 3. 点击【确认支付】
     confirm_payment_btn = await page.get_confirm_payment_btn(timeout=timeout)

qdairlines_helper/controller/home.py

@@ -9,14 +9,15 @@
 # Copyright ©2011-2026. Hunan xxxxxxx Company limited. All rights reserved.
 # ---------------------------------------------------------------------------------------------------------
 """
+from logging import Logger
 from playwright.async_api import Page
 from qdairlines_helper.po.home_page import HomePage
-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.utils.po_utils import get_ip_access_blocked_msg
 
 
-async def load_home_po(*, page: Page, protocol: str, domain: str, timeout: float = 60.0) -> HomePage:
+async def load_home_po(*, page: Page, logger: Logger, protocol: str, domain: str, timeout: float = 60.0) -> HomePage:
     url_prefix = f"{protocol}://{domain}"
     home_url = url_prefix + url_const.home_url
     home_po = HomePage(page=page, url=home_url)
@@ -24,5 +25,5 @@ async def load_home_po(*, page: Page, protocol: str, domain: str, timeout: float
     logger.info(f"即将进入青岛航空官网首页，页面URL<{home_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 home_po