python-qlv-helper 0.6.0__py3-none-any.whl → 0.7.2__py3-none-any.whl

{python_qlv_helper-0.6.0.dist-info → python_qlv_helper-0.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python_qlv_helper
-Version: 0.6.0
+Version: 0.7.2
 Summary: qlv helper python package
 Author-email: ckf10000 <ckf10000@sina.com>
 License:                                  Apache License
@@ -210,14 +210,16 @@ Project-URL: Issues, https://github.com/ckf10000/qlv-helper/issues
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: playwright==1.56.0; python_version >= "3.12" and platform_system == "Windows"
-Requires-Dist: playwright-stealth==2.0.0; python_version >= "3.12" and platform_system == "Windows"
-Requires-Dist: ddddocr==1.5.6; python_version >= "3.12" and platform_system == "Windows"
+Requires-Dist: playwright==1.56.0; python_version >= "3.12"
+Requires-Dist: playwright-stealth==2.0.0; python_version >= "3.12"
+Requires-Dist: ddddocr==1.5.6; python_version >= "3.12"
 Requires-Dist: aiohttp==3.13.2; python_version >= "3.12"
 Requires-Dist: beautifulsoup4==4.14.2; python_version >= "3.12"
-Requires-Dist: airtest==1.3.6; python_version >= "3.12" and platform_system == "Windows"
+Requires-Dist: airtest==1.3.6; python_version >= "3.12"
 Requires-Dist: python_http_helper>=0.2.0; python_version >= "3.12"
-Requires-Dist: python_playwright_helper>=0.2.9; python_version >= "3.12"
+Requires-Dist: python_playwright_helper>=0.3.0; python_version >= "3.12"
+Requires-Dist: python_ocr_helper>=0.0.1; python_version >= "3.12"
+Requires-Dist: flight_helper>=0.2.9
 Dynamic: license-file
 
 # qlv-helper

{python_qlv_helper-0.6.0.dist-info → python_qlv_helper-0.7.2.dist-info}/RECORD

@@ -1,35 +1,36 @@
-python_qlv_helper-0.6.0.dist-info/licenses/LICENSE,sha256=WtjCEwlcVzkh1ziO35P2qfVEkLjr87Flro7xlHz3CEY,11556
+python_qlv_helper-0.7.2.dist-info/licenses/LICENSE,sha256=WtjCEwlcVzkh1ziO35P2qfVEkLjr87Flro7xlHz3CEY,11556
 qlv_helper/__init__.py,sha256=5DCc5JhfdsgtIuFWgkxPOW5VVKZ8RPikQLGIuyZX6_Y,465
 qlv_helper/config/__init__.py,sha256=0pKLgui-sC6yMNBBuuTTLkUGhPybiJQSTKTbi66alvg,465
 qlv_helper/config/custom_exception.py,sha256=uYme0iseQt_dP-Y6-hZ_H2OA2OQR0Kp5PmmZvhEZlEc,805
-qlv_helper/config/url_const.py,sha256=PbKKKH4heqP6SO186MTt-CEpf-Ix5ODlLQ2Aq2ZBZhU,537
+qlv_helper/config/url_const.py,sha256=EoLHOtlO3Ob2WSMMv6TBrl7eJCfJCB844dwmD_k86BM,630
 qlv_helper/controller/__init__.py,sha256=cOJA0xMIytv17oICzPYqWLaSy-Ro2Ceeti0hHhsUj6Y,468
 qlv_helper/controller/domestic_activity_order.py,sha256=MlmsDVsMBWq2h4Yjh1rhO372Z3p8tu2-4IZGP-nkfr8,1136
-qlv_helper/controller/main_page.py,sha256=JtkB6BdKYHoNYZ4fkeALpSmAj-NAuiv1x6BvCcBtpic,1252
-qlv_helper/controller/order_detail.py,sha256=PjBS1YmiRzWaXg0brJef96k0-0uLr6oaEYz5zZzpjoo,22675
-qlv_helper/controller/order_table.py,sha256=4AgA9EO0_GVuwnW3ltXPoN74U_6YpOqkRJVdeLb6L1o,6082
-qlv_helper/controller/user_login.py,sha256=iyyDbOREsXtV5bqAFeXGwurvcCmDHmquh6ReWCfnOBE,5281
+qlv_helper/controller/main_page.py,sha256=p_-nXAIptNrx1SUgma7oPB-cqFFHYdCNvXCfsesIQFc,1855
+qlv_helper/controller/order_detail.py,sha256=pdxN6ahsoeJq2XqBNRUwLrGG12WSy737fU17fhJMjgg,25621
+qlv_helper/controller/order_table.py,sha256=unLL1xMKK1xvm_iewpdMcUPZc6AcBcLq0hAGXAdjdhU,15373
+qlv_helper/controller/user_login.py,sha256=oXO1otTGuK3_r07fKdncQE3Is2w-kiI-mWmJyFvsVyE,5915
+qlv_helper/controller/wechat_login.py,sha256=0u9H6tJiQO28nT5AG2Ot7EWFmpBqFJD_9dd12snsJIQ,2196
 qlv_helper/http/__init__.py,sha256=yDh1xi_o7ohXqDAzLu62qCWIGk4_aD1dhnUaCon3klM,484
 qlv_helper/http/main_page.py,sha256=LTpwrG8H_NqwCa3185irgcGd6JQkChAk7HQsDM-TNTI,1519
-qlv_helper/http/order_page.py,sha256=uhCnRPvIvSg5ACMCfpw5_Z62iAAw-Dm-yDRloe5QBP8,16934
+qlv_helper/http/order_page.py,sha256=Sti3dxZIN1U9z0e7NwyJ6_TrNdI-N3mRFnUN8WpN3FM,21674
 qlv_helper/http/order_table_page.py,sha256=IaXn5wjqPi1aRXHz0kucdHEdZswUWAZfECC13y57y8k,14440
 qlv_helper/po/__init__.py,sha256=eDr06o0eYapBsYpOhA11bbxzs2F0dsuDjOKmxk_2HVE,480
-qlv_helper/po/domestic_activity_order_page.py,sha256=f-XSc2HD6GYisUJZwK2-u0Tr4W3B_vb5JpXvHnjfHOQ,5030
-qlv_helper/po/login_page.py,sha256=HKGjS4WrkWnDdnh0JQAYxA3DyEWbInviQTna_KrP2FA,5960
-qlv_helper/po/main_page.py,sha256=Hf8Wj7D9GitIj4HIi_zDHHIc5kasFQwraqEMZObYI7w,3320
-qlv_helper/po/order_detail_page.py,sha256=zCB-pWyXdZz8vlDhvl1K79-bQ7C7Y12DiDSXlS_woYw,13681
+qlv_helper/po/domestic_activity_order_page.py,sha256=El63U0GI2PU9WGIkGxPgCE1Fp1yCsw2v1H6cZhSaG4c,8509
+qlv_helper/po/login_page.py,sha256=JbapNFwGCei3K3mpfhte1TVNeqzG7yHsCtp5KiKv_6g,4271
+qlv_helper/po/main_page.py,sha256=0_tqZILZnLS6y3chg9ERTHDtg86pW0aIQ1vNuPFLVG8,1752
+qlv_helper/po/order_detail_page.py,sha256=0Xyi9zxnSHv4OfFAlPPz_D0S5S0ZHKLphUUT8R4svzk,14414
 qlv_helper/po/wechat_auth_page.py,sha256=a4YZlM5JOS0l3CNJm_oJFBhZY7AbNOpdIwilSjAO5bY,3171
 qlv_helper/utils/__init__.py,sha256=rGzBkUf1tslG4WRPQjVWTVuwWG76pkckuKO_6K4sEus,465
 qlv_helper/utils/browser_utils.py,sha256=mKoqSEz1vFrVemp9cgI4R5UhA4k7i0Cd9cWsIXJZ6E4,986
 qlv_helper/utils/datetime_utils.py,sha256=BaDJKuH-yqc2NF9KYN66zUYUEJ9ZRHj09AV4-gILf3o,606
 qlv_helper/utils/file_handle.py,sha256=_dJ9Yk8esttJYsjdBMZAkjZTDQh5QYVPXjLRRyWUMh0,1087
 qlv_helper/utils/html_utils.py,sha256=i5oOFYETH3kDS9-rSyGu1SHFTkfZvAPPQ4za76BCdVA,1962
-qlv_helper/utils/ocr_helper.py,sha256=IrS4iPTm1SXnVpbHKMowQA2w1bvI0fUVRqEAbmwnjws,2781
+qlv_helper/utils/ocr_helper.py,sha256=vpIokr07Utmpsb78MHF83UcXL90A8BPbLgjMg4kONyA,3343
 qlv_helper/utils/po_utils.py,sha256=SwQKL58HERGG2Weou_AwY_TQoYSvgi0gvaVCJBput_k,3516
 qlv_helper/utils/stealth_browser.py,sha256=srNOYJOboYo30TvW5OP5TaVpg4jgHm9GxqmYnuwcUQU,3140
 qlv_helper/utils/type_utils.py,sha256=S5FXUje2mbDuq27LU05WymxNu1VGOLBUV3tuqcx51dE,3792
 qlv_helper/utils/windows_utils.py,sha256=Cvedsk1c2ujgPNVxszz8XWANkvEr8G9kne6povtZRU4,2866
-python_qlv_helper-0.6.0.dist-info/METADATA,sha256=cG17GIsXVxDMdh92lqvgtJKpMI4Qn1dNjgtTrQbZMjc,14853
-python_qlv_helper-0.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-python_qlv_helper-0.6.0.dist-info/top_level.txt,sha256=0pYdhD8SfBcC57LzLYGHY7cwwPqdqAkB1twysCJh5OA,11
-python_qlv_helper-0.6.0.dist-info/RECORD,,
+python_qlv_helper-0.7.2.dist-info/METADATA,sha256=LuxKTcs6bOcTbrthW-Q3N35aT9nF7sTKDDZS0uae9bQ,14825
+python_qlv_helper-0.7.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+python_qlv_helper-0.7.2.dist-info/top_level.txt,sha256=0pYdhD8SfBcC57LzLYGHY7cwwPqdqAkB1twysCJh5OA,11
+python_qlv_helper-0.7.2.dist-info/RECORD,,

qlv_helper/config/url_const.py

@@ -11,3 +11,5 @@
 """
 
 order_detail_url = "/OrderProcessing/NewTicket_show/{}?&r={}"
+domestic_activity_order_url = "/OrderList/GuoNei_ActivityOrders"
+login_url = "/Home/Login"

qlv_helper/controller/main_page.py

@@ -10,13 +10,29 @@
 # ---------------------------------------------------------------------------------------------------------
 """
 import aiohttp
+from logging import Logger
+from playwright.async_api import Page
 from typing import Dict, Any, Optional
+from qlv_helper.po.main_page import MainPage
 from qlv_helper.http.main_page import get_main_page_html, parser_head_title
 
 
+async def open_main_page(
+        *, page: Page, logger: Logger, qlv_protocol: str, qlv_domain: str, timeout: float = 60.0, **kwargs: Any
+) -> MainPage:
+    url_prefix = f"{qlv_protocol}://{qlv_domain}"
+    main_url = url_prefix + "/"
+    await page.goto(main_url)
+
+    main_po = MainPage(page=page, url=main_url)
+    await main_po.url_wait_for(url=main_url, timeout=timeout)
+    logger.info(f"即将进入首页，页面URL<{main_url}>")
+    return main_po
+
+
 async def get_main_info_with_http(
         domain: str, protocol: str = "http", retry: int = 1, timeout: int = 5, enable_log: bool = True,
-        cookie_jar: Optional[aiohttp.CookieJar] = None, playwright_state: Dict[str, Any] = None
+        cookie_jar: Optional[aiohttp.CookieJar] = None, playwright_state: Dict[str, Any] = None, **kwargs: Any
 ) -> Dict[str, Any]:
     response = await get_main_page_html(
         domain=domain, protocol=protocol, retry=retry, timeout=timeout, enable_log=enable_log,
@@ -27,4 +43,4 @@ async def get_main_info_with_http(
 
     html = response.get("data")
     response["message"] = parser_head_title(html=html)
-    return response
+    return response

qlv_helper/controller/order_detail.py

@@ -16,8 +16,9 @@ from datetime import datetime
 import qlv_helper.config.url_const as url_const
 from typing import Dict, Any, List, cast, Optional
 from qlv_helper.po.order_detail_page import OrderDetailPage
+from flight_helper.models.dto.procurement import FillProcurementInputDTO
 from qlv_helper.http.order_page import parser_order_info, get_order_page_html, parser_order_flight_table, \
-    fill_procurement_info_with_http
+    fill_procurement_info_with_http, fill_itinerary_info_with_http, fill_procurement_dto_with_http
 from playwright.async_api import Page, Locator, Error as PlaywrightError, TimeoutError as PlaywrightTimeoutError
 
 
@@ -433,7 +434,7 @@ async def fill_procurement_with_http(
         *, order_id: int, qlv_domain: str, amount: float, pre_order_id: str, platform_user_id: str, user_password: str,
         passengers: List[str], fids: str, pids: List[str], transaction_id: str, qlv_protocol: str = "http",
         retry: int = 1, timeout: int = 5, enable_log: bool = True, cookie_jar: Optional[aiohttp.CookieJar] = None,
-        playwright_state: Dict[str, Any] = None, data_list: Optional[List[Dict[str, Any]]] = None
+        playwright_state: Dict[str, Any] = None, data_list: Optional[List[Dict[str, Any]]] = None, **kwargs: Any
 ) -> Dict[str, Any]:
     return await fill_procurement_info_with_http(
         order_id=order_id, qlv_domain=qlv_domain, amount=amount, pre_order_id=pre_order_id,
@@ -441,3 +442,55 @@ async def fill_procurement_with_http(
         transaction_id=transaction_id, qlv_protocol=qlv_protocol, retry=retry, timeout=timeout, enable_log=enable_log,
         cookie_jar=cookie_jar, playwright_state=playwright_state, data_list=data_list
     )
+
+
+async def fill_procurement_with_http_callback(
+        *, fill_procurement_dto: FillProcurementInputDTO, retry: int = 1, timeout: int = 5, enable_log: bool = True,
+        cookie_jar: Optional[aiohttp.CookieJar] = None, playwright_state: Dict[str, Any] = None,
+        data_list: Optional[List[Dict[str, Any]]] = None, **kwargs: Any
+) -> Dict[str, Any]:
+    return await fill_procurement_dto_with_http(
+        fill_procurement_dto=fill_procurement_dto, retry=retry, timeout=timeout, enable_log=enable_log,
+        cookie_jar=cookie_jar, playwright_state=playwright_state, data_list=data_list
+    )
+
+
+async def fill_itinerary_with_http(
+        *, page: Page, logger: Logger, qlv_protocol: str, qlv_domain: str, order_id: int, retry: int = 1,
+        passengers: List[Dict[str, Any]], timeout: float = 20.0, cookie_jar: Optional[aiohttp.CookieJar] = None,
+        playwright_state: Dict[str, Any] = None, enable_log: bool = True, **kwargs: Any
+) -> bool:
+    # 1. 打开页面
+    order_detail_po = await open_order_detail_page(
+        page=page, logger=logger, protocol=qlv_protocol, domain=qlv_domain, order_id=order_id, timeout=timeout
+    )
+
+    # 2. 获取采购信息的流水id
+    purchase_transaction_ids = await order_detail_po.get_purchase_info_transaction_id(timeout=timeout)
+    purchase_transaction_ids = [x for x in purchase_transaction_ids if x != "0"]
+    if purchase_transaction_ids:
+        flag = True
+        purchase_transaction_ids.sort()
+        purchase_transaction_id = purchase_transaction_ids[0]
+        for passenger in passengers:
+            pid = passenger.get("pid")
+            tid = passenger.get("tid")
+            p_name = passenger.get("p_name")
+            itinerary_id = passenger.get("itinerary_id")
+            try:
+                response = await fill_itinerary_info_with_http(
+                    order_id=order_id, qlv_domain=qlv_domain, pid=pid, tid=tid, transaction_id=purchase_transaction_id,
+                    itinerary_id=itinerary_id, retry=retry, qlv_protocol=qlv_protocol, timeout=int(timeout),
+                    enable_log=enable_log, cookie_jar=cookie_jar, playwright_state=playwright_state
+                )
+                if response == 200 or "OK" in response.get("data"):
+                    logger.info(f"订单<{order_id}>，乘客<{p_name}>票号<{itinerary_id}>回填成功")
+                else:
+                    logger.warning(
+                        f'订单<{order_id}>，乘客<{p_name}>票号<{itinerary_id}>回填失败：{response.get("data")}')
+                    flag = False
+            except (Exception,):
+                flag = False
+        return flag
+    else:
+        raise EnvironmentError("还未填写采购信息，暂时不能回填票号")

qlv_helper/controller/order_table.py

@@ -10,10 +10,17 @@
 # ---------------------------------------------------------------------------------------------------------
 """
 import asyncio
+from copy import deepcopy
+from logging import Logger
 from aiohttp import CookieJar
-from typing import Optional, Dict, Any, Callable, List
+from datetime import datetime, timedelta
+from playwright.async_api import Page, Locator
+import qlv_helper.config.url_const as url_const
 from http_helper.client.async_proxy import HttpClientFactory
 from qlv_helper.utils.html_utils import parse_pagination_info
+from qlv_helper.utils.type_utils import safe_convert_advanced
+from typing import Optional, Dict, Any, Callable, List, cast, Tuple
+from qlv_helper.po.domestic_activity_order_page import DomesticActivityOrderPage
 from qlv_helper.http.order_table_page import get_domestic_activity_order_page_html, get_domestic_ticket_outed_page_html, \
     parse_order_table, get_domestic_unticketed_order_page_html
 
@@ -28,7 +35,7 @@ async def _get_paginated_order_table(
         cookie_jar: Optional[CookieJar],
         playwright_state: Dict[str, Any],
         table_state: str,
-        fetch_page_fn: Callable[..., Any],   # 拿到第一页/分页 HTML 的函数
+        fetch_page_fn: Callable[..., Any],  # 拿到第一页/分页 HTML 的函数
 ) -> Dict[str, Any]:
     """通用分页表格抓取（支持并发）"""
 
@@ -79,7 +86,7 @@ async def _get_paginated_order_table(
             )
             if resp.get("code") == 200:
                 return parse_order_table(html=resp["data"], table_state=table_state)
-        except (Exception, ):
+        except (Exception,):
             return list()  # 抓取失败则返回空，不影响整体
         return list()
 
@@ -111,6 +118,7 @@ async def _get_paginated_order_table(
     response["data"] = pagination_info
     return response
 
+
 async def get_domestic_activity_order_table(
         domain: str, protocol: str = "http", retry: int = 1, timeout: int = 5, enable_log: bool = True,
         cookie_jar: Optional[CookieJar] = None, playwright_state: Dict[str, Any] = None
@@ -144,6 +152,7 @@ async def get_domestic_ticket_outed_table(
         fetch_page_fn=get_domestic_ticket_outed_page_html
     )
 
+
 async def get_domestic_unticketed_order_table(
         domain: str, protocol: str = "http", retry: int = 1, timeout: int = 5, enable_log: bool = True,
         cookie_jar: Optional[CookieJar] = None, playwright_state: Dict[str, Any] = None
@@ -158,4 +167,164 @@ async def get_domestic_unticketed_order_table(
         playwright_state=playwright_state,
         table_state="proccessing",
         fetch_page_fn=get_domestic_unticketed_order_page_html
-    )
+    )
+
+
+async def open_domestic_activity_order_page(
+        *, page: Page, logger: Logger, qlv_protocol: str, qlv_domain: str, timeout: float = 20.0
+) -> DomesticActivityOrderPage:
+    url_prefix = f"{qlv_protocol}://{qlv_domain}"
+    domestic_activity_order_url = url_prefix + url_const.domestic_activity_order_url
+    await page.goto(domestic_activity_order_url)
+
+    domestic_activity_order_po = DomesticActivityOrderPage(page=page, url=domestic_activity_order_url)
+    await domestic_activity_order_po.url_wait_for(url=domestic_activity_order_url, timeout=timeout)
+    logger.info(f"即将进入国内活动订单页面，页面URL<{domestic_activity_order_url}>")
+    return domestic_activity_order_po
+
+
+async def pop_will_expire_domestic_activity_order(
+        *, page: Page, logger: Logger, qlv_protocol: str, qlv_domain: str, last_minute_threshold: int,
+        timeout: float = 20.0, **kwargs: Any
+) -> Tuple[List[Dict[str, Any]], bool]:
+    # 1. 打开国内活动订单页面
+    domestic_activity_order_po = await open_domestic_activity_order_page(
+        page=page, logger=logger, qlv_protocol=qlv_protocol, qlv_domain=qlv_domain, timeout=timeout
+    )
+
+    # TODO 暂时不考虑分页的情况
+    # 2. 获取table所有tr的Locator对象
+    trs_locator = await domestic_activity_order_po.get_flight_table_trs_locator(timeout=timeout)
+    trs_locator = await trs_locator.all()
+    table_data = list()
+    feilds = {
+        "to_from": "", "urgant_state": "", "order_id": 0, "pre_order_id": "", "aduit_pnr": "", "child_pnr": "",
+        "payment_time": "", "last_time_ticket": "", "dat_dep": "", "code_dep": "", "code_arr": "", "flight_no": "",
+        "cabin": "", "policy": "", "total_people": 0, "total_adult": 0, "total_child": 0, "receipted": 0.00,
+        "stat_opration": "", "more_seats": "", "operation_info": "", "substitute_btn_locator": ""
+    }
+    pre_pop_orders = list()
+    is_pop = False
+    for tr_locator in trs_locator[1:]:
+        row_locator = await domestic_activity_order_po.get_flight_table_trs_td(locator=tr_locator, timeout=timeout)
+        tds_locators = await row_locator.all()
+        sub_feilds = list()
+        copy_feilds = deepcopy(feilds)
+        for index, td_locator in enumerate(tds_locators):
+            try:
+                text = (await td_locator.inner_text()).strip()
+                if index == 0:
+                    copy_feilds["to_from"] = text
+                    sub_feilds.append("to_from")
+                elif index == 1:
+                    order_id = await domestic_activity_order_po.get_flight_table_td_order_id(
+                        locator=td_locator, timeout=timeout
+                    )
+                    urgant_state = await domestic_activity_order_po.get_flight_table_td_urgant(
+                        locator=td_locator, timeout=timeout
+                    )
+                    copy_feilds["order_id"] = safe_convert_advanced(value=order_id)
+                    copy_feilds["urgant_state"] = urgant_state
+                    sub_feilds.extend(["order_id", "urgant_state"])
+                elif index == 2:
+                    copy_feilds["pre_order_id"] = text
+                    sub_feilds.append("pre_order_id")
+                elif index == 3:
+                    text = text.replace("\xa0", "")
+                    text_slice = text.split("|")
+                    copy_feilds["aduit_pnr"] = text_slice[0].strip()
+                    copy_feilds["child_pnr"] = text_slice[1].strip()
+                    sub_feilds.extend(["aduit_pnr", "child_pnr"])
+                elif index == 4:
+                    copy_feilds["payment_time"] = text
+                    sub_feilds.append("payment_time")
+                elif index == 5:
+                    continue
+                elif index == 6:
+                    copy_feilds["last_time_ticket"] = text
+                    sub_feilds.append("last_time_ticket")
+                elif index == 7:
+                    continue
+                elif index == 8:
+                    text = text.replace("\xa0", "|")
+                    text_slice = [i for i in text.split("|") if i.strip()]
+                    ctrip = text_slice[1].split("-")
+                    copy_feilds["dat_dep"] = text_slice[0].strip()
+                    copy_feilds["code_dep"] = ctrip[0].strip()
+                    copy_feilds["code_arr"] = ctrip[1].strip()
+                    copy_feilds["flight_no"] = text_slice[2].strip()
+                    copy_feilds["cabin"] = text_slice[3].strip()
+                    sub_feilds.extend(["dat_dep", "code_dep", "code_arr", "flight_no", "cabin"])
+                elif index == 9:
+                    text = text.replace("\xa0", "")
+                    text = text.replace(">", "")
+                    text = text.replace("<", "")
+                    text = text.replace("&", "")
+                    text = text.replace("<br>", "\n")
+                    copy_feilds["policy"] = text
+                    sub_feilds.append("policy")
+                elif index == 10:
+                    text = text.replace("【 ", "|")
+                    text = text.replace("/", "|")
+                    text = text.replace("】", "")
+                    text_slice = text.split("|")
+                    copy_feilds["total_people"] = safe_convert_advanced(value=text_slice[0].strip())
+                    copy_feilds["total_adult"] = safe_convert_advanced(value=text_slice[1].strip())
+                    copy_feilds["total_child"] = safe_convert_advanced(value=text_slice[2].strip())
+                    sub_feilds.extend(["total_people", "total_adult", "total_child"])
+                elif index == 11:
+                    copy_feilds["receipted"] = safe_convert_advanced(value=text)
+                    sub_feilds.append("receipted")
+                elif index == 12:
+                    copy_feilds["stat_opration"] = text
+                    sub_feilds.append("stat_opration")
+                elif index == 13:
+                    copy_feilds["more_seats"] = safe_convert_advanced(value=text)
+                    sub_feilds.append("more_seats")
+                elif index == 14:
+                    text_slice = text.split(" ")
+                    operation_info = dict(
+                        lock_btn_locator=cast(Locator, None), pop_btn_locator=cast(Locator, None), locked=""
+                    )
+                    if "锁定" in text_slice[0]:
+                        lock_btn_locator = await domestic_activity_order_po.get_flight_table_td_operation_lock_btn(
+                            locator=td_locator, timeout=timeout
+                        )
+                        operation_info["lock_btn_locator"] = lock_btn_locator
+                    else:
+                        operation_info["locked"] = text_slice[0].strip()
+                    if "踢出" in text:
+                        pop_btn_locator = await domestic_activity_order_po.get_flight_table_td_operation_pop_btn(
+                            locator=td_locator, timeout=timeout
+                        )
+                        operation_info["pop_btn_locator"] = pop_btn_locator
+                    copy_feilds["operation_info"] = operation_info
+                    sub_feilds.append("operation_info")
+                elif index == 15:
+                    copy_feilds[
+                        "substitute_btn_locator"
+                    ] = await domestic_activity_order_po.get_flight_table_td_operation_substitute_btn(
+                        locator=td_locator, timeout=timeout)
+                    sub_feilds.append("substitute_btn_locator")
+            except (Exception,) as e:
+                logger.error(f"第<{index + 1}>列数据处理异常，原因：{e}")
+        if len(sub_feilds) == 22:
+            table_data.append(copy_feilds)
+            if datetime.strptime(
+                    copy_feilds.get("last_time_ticket"), "%Y-%m-%d %H:%M:%S"
+            ) < datetime.now() + timedelta(minutes=last_minute_threshold):
+                pre_pop_orders.append(copy_feilds)
+    for pre_pop_order in pre_pop_orders:
+        order_id = pre_pop_order.get("order_id")
+        operation_info = pre_pop_order.get("operation_info")
+        pop_btn_locator = operation_info.get("pop_btn_locator")
+        last_time_ticket = pre_pop_order.get("last_time_ticket")
+        if pop_btn_locator and isinstance(pop_btn_locator, Locator):
+            minute = (datetime.strptime(last_time_ticket, "%Y-%m-%d %H:%M:%S") - datetime.now()).total_seconds() / 60
+            await pop_btn_locator.click()
+            if is_pop is False:
+                is_pop = True
+            logger.info(
+                f"订单<{order_id}>，距离最晚出票时限: {last_time_ticket}，仅剩<{minute}>分钟，已将工单剔出活动订单"
+            )
+    return table_data, is_pop

qlv_helper/controller/user_login.py

@@ -9,111 +9,115 @@
 # Copyright ©2011-2025. Hunan xxxxxxx Company limited. All rights reserved.
 # ---------------------------------------------------------------------------------------------------------
 """
+import os
 import asyncio
-from typing import Tuple
+import traceback
+from logging import Logger
+from datetime import datetime
+from typing import Dict, Any, Optional
 from qlv_helper.po.login_page import LoginPage
-from playwright.async_api import BrowserContext
-from qlv_helper.po.wechat_auth_page import WechatAuthPage
-from qlv_helper.utils.browser_utils import switch_for_table_window
-from qlv_helper.utils.po_utils import on_click_locator, locator_input_element
-
-
-async def _username_login(login_po: LoginPage, username: str, password: str, timeout: float = 5.0) -> Tuple[bool, str]:
-    # 1. 输入用户名
-    is_success, username_input = await login_po.get_login_username_input(timeout=timeout)
-    if is_success is False:
-        return is_success, username_input
-    await locator_input_element(locator=username_input, text=username.strip())
-
-    # 2. 输入密码
-    is_success, password_input = await login_po.get_login_password_input(timeout=timeout)
-    if is_success is False:
-        return is_success, username_input
-    await locator_input_element(locator=password_input, text=password.strip())
-
-    # 3. 获取一层验证码
-    is_success, code_str = await login_po.get_number_code(timeout=timeout)
-    if is_success is False:
-        return is_success, code_str
-
-    # 4. 输入一层验证码
-    is_success, code_input = await login_po.get_login_number_code_input(timeout=timeout)
-    if is_success is False:
-        return is_success, code_input
-    await locator_input_element(locator=code_input, text=code_str.lower())
-
-    # 5. 点击登录
-    is_success, login_btn = await login_po.get_login_btn(timeout=timeout)
-    if is_success is False:
-        return is_success, login_btn
-    await on_click_locator(locator=login_btn)
-
-
-async def _wechat_login(browser: BrowserContext, login_po: LoginPage, timeout: float = 5.0) -> Tuple[bool, str]:
-    # 1. 点击微信登录快捷入口
-    is_success, wechat_entrance = await login_po.get_wechat_entrance(timeout=timeout)
-    if is_success is False:
-        return is_success, wechat_entrance
-    await on_click_locator(locator=wechat_entrance)
-
-    page_new = await switch_for_table_window(browser=browser, url_keyword="open.weixin.qq.com", wait_time=int(timeout))
-    wachat_po = WechatAuthPage(page=page_new)
-
-    # 2. 点击【微信快捷登录】按钮
-    is_success, wechat_quick_login_btn = await wachat_po.get_wechat_quick_login_btn(timeout=timeout)
-    if is_success is False:
-        return is_success, wechat_quick_login_btn
-    await on_click_locator(locator=wechat_quick_login_btn)
-
-    # 3. 点击微信弹框的中【允许】按钮
-    return await wachat_po.on_click_allow_btn(timeout=int(timeout) * 3)
-
-
-async def username_login(
-        login_po: LoginPage, username: str, password: str, timeout: float = 5.0, retry: int = 3
-) -> Tuple[bool, str]:
-    # 1. 第一次全流程的登录
-    await _username_login(login_po=login_po, username=username, password=password, timeout=timeout)
-    for _ in range(retry):
-        # 2. 判断是否为当前页
-        if login_po.is_current_page() is False:
-            return True, f"账号:{username} 登录成功"
-
-        # 3. 判断是否存在登录警告，存在的话，继续输入验证码，再次登录
-        is_warn: bool = await login_po.is_exist_login_warn(timeout=timeout)
-        if is_warn is True:
-            # 4. 获取一层验证码
-            is_success, code_str = await login_po.get_number_code(timeout=timeout)
-            if is_success is False:
-                return is_success, code_str
-
-            # 5. 输入一层验证码
-            is_success, code_input = await login_po.get_login_number_code_input(timeout=timeout)
-            if is_success is False:
-                return is_success, code_input
-            await locator_input_element(locator=code_input, text=code_str.lower())
+import qlv_helper.config.url_const as url_const
+from playwright.async_api import Page, ElementHandle
+from qlv_helper.utils.ocr_helper import get_image_text
+
+async def _username_login(
+        *, login_po: LoginPage, logger: Logger, username: str, password: str, screenshot_dir: str, api_key: str,
+        secret_key: str, timeout: float = 5.0, attempt: int = 10
+) -> Optional[Dict[str, Any]]:
+    for index in range(1, attempt + 1):
+        try:
+            # 1. 输入用户名
+            username_input = await login_po.get_login_username_input(timeout=timeout)
+            await username_input.fill(value=username)
+            logger.info(f"登录页面，用户名<{username}>输入完成")
+        except (Exception,):
+            pass
+        try:
+            # 2. 输入密码
+            password_input = await login_po.get_login_password_input(timeout=timeout)
+            await password_input.fill(value=password)
+            logger.info(f"登录页面，用户密码<{password}>输入完成")
+        except (Exception,):
+            pass
+        try:
+            # 3. 首次获取验证码，并点击
+            # captcha_1 = await login_po.get_captcha(timeout=timeout)
+            # await captcha_1.click(button="left")
+            # await asyncio.sleep(delay=3)
+
+            # 4. 再次获取验证码
+            captcha_2 = await login_po.get_captcha(timeout=timeout)
+            # 4.1 获取验证码类型
+            captcha_type: int = await login_po.get_captcha_type(locator=captcha_2, timeout=timeout)
+            logger.info(f"登录页面，验证码类型<{captcha_type}>获取成功")
+            # 4.2 获取验证码图片，直接截图获取原始图片字节，不刷新图片
+            image: ElementHandle = await login_po.get_captcha_image(timeout=timeout)
+            dt_str: str = datetime.now().strftime("%Y%m%d%H%M%S")
+            fn: str = os.path.join(screenshot_dir, f"captcha_{username}_{captcha_type}_{dt_str}.png")
+            await image.screenshot(path=fn, timeout=timeout * 1000)
+            logger.info(f"登录页面，验证码图片已经生成，图片路径：{fn}")
+            # 4.3 获取验证码内容
+            capthcha_text = await get_image_text(
+                image_path=fn, captcha_type=captcha_type, api_key=api_key, secret_key=secret_key
+            )
+            logger.info(f"登录页面，验证码内容：<{capthcha_text}>识别成功")
+
+            # 5. 获取验证码输入框
+            captcha_input = await login_po.get_login_captcha_input(timeout=timeout)
+            await captcha_input.fill(value=capthcha_text)
+            logger.info(f"登录页面，验证码<{capthcha_text}>输入完成")
 
             # 6. 点击登录
-            is_success, login_btn = await login_po.get_login_btn(timeout=timeout)
-            if is_success is False:
-                return is_success, login_btn
-            await on_click_locator(locator=login_btn)
-        else:
-            # 7. 重复一次全流程的登录
-            await _username_login(login_po=login_po, username=username, password=password, timeout=timeout)
-
-        await asyncio.sleep(delay=timeout)
-
-    return True, f"账号:{username} 一次登录流程结束"
+            login_btn = await login_po.get_login_btn(timeout=timeout)
+            await login_btn.click(button="left")
+            logger.info(f"登录页面，【登录】按钮点击完成")
+            await asyncio.sleep(delay=3)
+
+            # 7. 验证登录是否成功
+            result = login_po.is_current_page()
+            if result is False:
+                logger.info(f"用户<{username}>登录成功，登录流程结束")
+
+                # 9. 获取当前cookie，不指定 path，Playwright 会返回 JSON 字符串
+                return await login_po.get_page().context.storage_state()
+            else:
+                raise RuntimeError("登录失败")
+        except (RuntimeError,):
+            if index == attempt:
+                logger.error(f"尝试登录<{attempt}>次，均失败，登录结束")
+            else:
+                logger.error(f"第<{index}>次登录失败，等待下一次登录")
+        except (Exception,):
+            logger.error(traceback.format_exc())
+            if index == attempt:
+                logger.error(f"尝试登录<{attempt}>次，均失败，登录结束")
+            else:
+                logger.error(f"第<{index}>次登录失败，等待下一次登录")
+
+
+async def open_login_page(
+        *, page: Page, logger: Logger, qlv_protocol: str, qlv_domain: str, timeout: float = 60.0
+) -> LoginPage:
+    url_prefix = f"{qlv_protocol}://{qlv_domain}"
+    login_url = url_prefix + url_const.login_url
+    await page.goto(login_url)
+
+    login_po = LoginPage(page=page, url=login_url)
+    await login_po.url_wait_for(url=login_url, timeout=timeout)
+    logger.info(f"即将进入登录页，页面URL<{login_url}>")
+    return login_po
 
 
-async def wechat_login(
-        browser: BrowserContext, login_po: LoginPage, timeout: float = 5.0, retry: int = 3
-) -> Tuple[bool, str]:
-    for index in range(retry):
-        # 全流程的登录
-        is_success, message = await _wechat_login(browser=browser, login_po=login_po, timeout=timeout)
-
-        # 判断是否为当前页
-        if is_success is True or index == retry - 1:
-            return is_success, message
+async def username_login(
+        *, page: Page, logger: Logger, qlv_protocol: str, qlv_domain: str, username: str, screenshot_dir: str,
+        password: str, api_key: str, secret_key: str, timeout: float = 60.0, attempt: int = 10, **kwargs: Any
+) -> Dict[str, Any]:
+    # 1. 打开登录页面
+    login_po = await open_login_page(
+        page=page, logger=logger, qlv_domain=qlv_domain, qlv_protocol=qlv_protocol, timeout=timeout
+    )
+    # 2. 一次全流程的登录
+    return await _username_login(
+        login_po=login_po, logger=logger, username=username, password=password, screenshot_dir=screenshot_dir,
+        timeout=timeout, api_key=api_key, secret_key=secret_key, attempt=attempt
+    )

qlv_helper/controller/wechat_login.py

@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+"""
+# ---------------------------------------------------------------------------------------------------------
+# ProjectName:  qlv-helper
+# FileName:     wechat_login.py
+# Description:  微信登录模块
+# Author:       ASUS
+# CreateDate:   2025/12/31
+# Copyright ©2011-2025. Hunan xxxxxxx Company limited. All rights reserved.
+# ---------------------------------------------------------------------------------------------------------
+"""
+from typing import Tuple
+from qlv_helper.po.login_page import LoginPage
+from playwright.async_api import BrowserContext
+
+from qlv_helper.utils.po_utils import on_click_locator
+from qlv_helper.po.wechat_auth_page import WechatAuthPage
+from qlv_helper.utils.browser_utils import switch_for_table_window
+
+
+async def _wechat_login(browser: BrowserContext, login_po: LoginPage, timeout: float = 5.0) -> Tuple[bool, str]:
+    # 1. 点击微信登录快捷入口
+    is_success, wechat_entrance = await login_po.get_wechat_entrance(timeout=timeout)
+    if is_success is False:
+        return is_success, wechat_entrance
+    await on_click_locator(locator=wechat_entrance)
+
+    page_new = await switch_for_table_window(browser=browser, url_keyword="open.weixin.qq.com", wait_time=int(timeout))
+    wachat_po = WechatAuthPage(page=page_new)
+
+    # 2. 点击【微信快捷登录】按钮
+    is_success, wechat_quick_login_btn = await wachat_po.get_wechat_quick_login_btn(timeout=timeout)
+    if is_success is False:
+        return is_success, wechat_quick_login_btn
+    await on_click_locator(locator=wechat_quick_login_btn)
+
+    # 3. 点击微信弹框的中【允许】按钮
+    return await wachat_po.on_click_allow_btn(timeout=int(timeout) * 3)
+
+
+async def wechat_login(
+        *, browser: BrowserContext, login_po: LoginPage, timeout: float = 5.0, retry: int = 3
+) -> Tuple[bool, str]:
+    for index in range(1, retry + 1):
+        # 全流程的登录
+        is_success, message = await _wechat_login(browser=browser, login_po=login_po, timeout=timeout)
+
+        # 判断是否为当前页
+        if is_success is True or index == retry:
+            return is_success, message

qlv_helper/http/order_page.py

@@ -20,6 +20,7 @@ from typing import Dict, Any, Optional, List
 from qlv_helper.utils.type_utils import convert_cn_to_en
 from http_helper.client.async_proxy import HttpClientFactory
 from qlv_helper.utils.datetime_utils import get_current_dtstr
+from flight_helper.models.dto.procurement import FillProcurementInputDTO
 from qlv_helper.utils.type_utils import get_key_by_index, get_value_by_index, safe_convert_advanced
 
 
@@ -51,8 +52,7 @@ async def fill_procurement_info_with_http(
 ) -> Dict[str, Any]:
     client = HttpClientFactory(
         protocol=qlv_protocol, domain=qlv_domain, timeout=timeout, enable_log=enable_log, retry=retry,
-        cookie_jar=cookie_jar or aiohttp.CookieJar(),
-        playwright_state=playwright_state
+        cookie_jar=cookie_jar or aiohttp.CookieJar(), playwright_state=playwright_state
     )
 
     headers = {
@@ -84,6 +84,81 @@ async def fill_procurement_info_with_http(
     )
 
 
+async def fill_procurement_dto_with_http(
+        *, fill_procurement_dto: FillProcurementInputDTO, retry: int = 1, timeout: int = 5, enable_log: bool = True,
+        cookie_jar: Optional[aiohttp.CookieJar] = None, playwright_state: Dict[str, Any] = None,
+        data_list: Optional[List[Dict[str, Any]]] = None
+) -> Dict[str, Any]:
+    client = HttpClientFactory(
+        protocol=fill_procurement_dto.pl_protocol, domain=fill_procurement_dto.pl_domain, timeout=timeout, retry=retry,
+        enable_log=enable_log, cookie_jar=cookie_jar or aiohttp.CookieJar(), playwright_state=playwright_state
+    )
+
+    headers = {
+        "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
+        "Referer": f"{fill_procurement_dto.pl_protocol}://{fill_procurement_dto.pl_domain}/OrderProcessing/NewTicket/{fill_procurement_dto.order_no}?&r={datetime.now().strftime("%Y%m%d%H%M%S")}",
+    }
+    if data_list:
+        data = data_list
+    else:
+        pName = "," + ",".join(
+            fill_procurement_dto.passenger_names) + "," if fill_procurement_dto.passenger_names else ''
+        pids = ",".join(fill_procurement_dto.passenger_ids) if fill_procurement_dto.passenger_ids else ''
+        data = [{
+            "tradingDat": datetime.now().strftime("%Y-%m-%d %H:%M"),
+            "outTktPF": f"{fill_procurement_dto.out_ticket_platform or ''}", "outTktLoginCode": "",
+            "typeName": f"{fill_procurement_dto.type_name or ''}",
+            "accountID": f"{fill_procurement_dto.purchase_account_id or ''}",
+            "accountName": f"{fill_procurement_dto.purchase_account or ''}",
+            "transactionAmount": f"{fill_procurement_dto.transaction_amount}",
+            "mainCheckNumber": "",
+            "airCoOrderID": f"{fill_procurement_dto.air_co_order_id}", "QuotaResultAmount": "0.00",
+            "remark": f"{quote(fill_procurement_dto.remark) or ''}",
+            "flightIdx": f",{fill_procurement_dto.segment_index or '1'},", "pName": f"{pName}",
+            "orderID": f"{fill_procurement_dto.order_no}",
+            "businessTypeName": "机票", "tradingItems": "机票支出", "actualAmount": 0,
+            "pType": f"{fill_procurement_dto.passenger_type}",
+            "fids": f"{fill_procurement_dto.flight_ids or ''}",
+            "pids": f"{pids or ''}",
+            "iscandel": "true", "isbatch": "false",
+            "MainCheckNumberValus": f"{fill_procurement_dto.pay_transaction}",
+            "OfficeNo": "", "PriceStdActual": "0.00", "ReturnAmount": "0.0000", "OffsetReturnAmount": "0.00",
+            "profitRemark": "", "preSaleType": "", "ErrorType": "",
+            "OutTktPFTypeID": f"{fill_procurement_dto.out_ticket_platform_type_id or ''}",
+            "OutTicketAccount": f"{fill_procurement_dto.out_ticket_account or ''}",
+            "OutTicketAccountID": f"{fill_procurement_dto.out_ticket_account_id or ''}",
+            "OutTicketPWD": f"{fill_procurement_dto.out_ticket_account_password or ''}",
+            "OutTicketTel": f"{fill_procurement_dto.out_ticket_mobile or ''}",
+            "OutTicketPNR": ""}
+        ]
+    data = f"list={json.dumps(data)}&isPayAll=true&delTransactionids=&OutTicketLossType&OutTicketLossRemark="
+    return await client.request(
+        method="POST", url="/OrderProcessing/PurchaseInfoSave",
+        headers=headers, is_end=True, data=data.encode("utf-8")
+    )
+
+
+async def fill_itinerary_info_with_http(
+        *, order_id: int, qlv_domain: str, pid: str, tid: str, transaction_id: str, itinerary_id: str, retry: int = 1,
+        qlv_protocol: str = "http", timeout: int = 5, enable_log: bool = True,
+        cookie_jar: Optional[aiohttp.CookieJar] = None, playwright_state: Dict[str, Any] = None
+) -> Dict[str, Any]:
+    client = HttpClientFactory(
+        protocol=qlv_protocol, domain=qlv_domain, timeout=timeout, enable_log=enable_log, retry=retry,
+        cookie_jar=cookie_jar or aiohttp.CookieJar(), playwright_state=playwright_state
+    )
+
+    headers = {
+        "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
+        "Referer": f"{qlv_protocol}://{qlv_domain}/OrderProcessing/NewTicket_show/{order_id}?&r={datetime.now().strftime("%Y%m%d%H%M%S")}",
+    }
+    data = f"OrderID={order_id}&OrderPID={pid}&OrderTID={tid}&TicketNo={itinerary_id}&ZJTransactionID={transaction_id}"
+    return await client.request(
+        method="POST", url="/OrderProcessing/TicketNoSave",
+        headers=headers, is_end=True, data=data.encode("utf-8")
+    )
+
+
 def order_info_static_headers() -> OrderedDict[str, str]:
     return OrderedDict([
         ("receipted_ota", "OTA实收"),  # 0
@@ -199,6 +274,7 @@ def flight_extend_headers() -> OrderedDict[str, str]:
         ("code_arr", " 抵达机场"),  # 11
         ("pid", "乘客ID"),  # 12
         ("fid", "航段ID"),  # 13
+        ("tid", "乘客表ID"),  # 14
     ])
 
 
@@ -350,7 +426,10 @@ def parse_order_flight_table_row(
 ) -> Dict[str, Any]:
     """解析航班表每一行的数据"""
     tds = tr.find_all("td", recursive=False)
-    values = {get_key_by_index(index=12, ordered_dict=extend_headers): tr["pid"]}
+    values = {
+        get_key_by_index(index=12, ordered_dict=extend_headers): tr["pid"],
+        get_key_by_index(index=14, ordered_dict=extend_headers): tr["tid"]
+    }
     for idx, td in enumerate(tds):
         if idx >= len(headers):
             continue

qlv_helper/po/domestic_activity_order_page.py

@@ -23,6 +23,96 @@ class DomesticActivityOrderPage(BasePo):
         super().__init__(page, url)
         self.__page = page
 
+    async def get_flight_table_locator(self, timeout: float = 5.0) -> Locator:
+        """
+        获取table
+        :param timeout:
+        :return:
+        """
+        selecor: str = 'xpath=//table[@class="table table_hover table_border  table_center"]//tbody'
+        return await self.get_locator(selector=selecor, timeout=timeout)
+
+    async def get_flight_table_trs_locator(self, timeout: float = 5.0) -> Locator:
+        """
+        获取table所有tr locator对象
+        :param timeout:
+        :return:
+        """
+        selecor: str = 'xpath=//table[@class="table table_hover table_border  table_center"]/tbody/tr'
+        return await self.get_locator(selector=selecor, timeout=timeout)
+
+    async def get_flight_table_tds_th(self, locator: Locator, timeout: float = 5.0) -> Locator:
+        """
+        获取table所有tr下的th locator对象
+        :param locator:
+        :param timeout:
+        :return:
+        """
+        selecor: str = 'xpath=./th'
+        return await self.get_sub_locator(locator=locator, selector=selecor, timeout=timeout)
+
+    async def get_flight_table_trs_td(self, locator: Locator, timeout: float = 5.0) -> Locator:
+        """
+        获取table所有tr下的td locator对象
+        :param locator:
+        :param timeout:
+        :return:
+        """
+        selecor: str = 'xpath=./td'
+        return await self.get_sub_locator(locator=locator, selector=selecor, timeout=timeout)
+
+    async def get_flight_table_td_order_id(self, locator: Locator, timeout: float = 5.0) -> str:
+        """
+        获取table 行中的订单id
+        :param locator:
+        :param timeout:
+        :return:
+        """
+        selecor: str = 'xpath=./a'
+        locator = await self.get_sub_locator(locator=locator, selector=selecor, timeout=timeout)
+        return (await locator.inner_text()).strip()
+
+    async def get_flight_table_td_urgant(self, locator: Locator, timeout: float = 5.0) -> str:
+        """
+        获取table 行中的紧急状态
+        :param locator:
+        :param timeout:
+        :return:
+        """
+        selecor: str = 'xpath=./font'
+        locator = await self.get_sub_locator(locator=locator, selector=selecor, timeout=timeout)
+        return (await locator.inner_text()).strip()
+
+    async def get_flight_table_td_operation_lock_btn(self, locator: Locator, timeout: float = 5.0) -> Locator:
+        """
+        获取table 行中的锁单按钮
+        :param locator:
+        :param timeout:
+        :return:
+        """
+        selecor: str = 'xpath=./a'
+        return await self.get_sub_locator(locator=locator, selector=selecor, timeout=timeout)
+
+    async def get_flight_table_td_operation_pop_btn(self, locator: Locator, timeout: float = 5.0) -> Locator:
+        """
+        获取table 行中的剔出按钮
+        :param locator:
+        :param timeout:
+        :return:
+        """
+        selecor: str = 'xpath=./button'
+        return await self.get_sub_locator(locator=locator, selector=selecor, timeout=timeout)
+
+    async def get_flight_table_td_operation_substitute_btn(self, locator: Locator, timeout: float = 5.0) -> Locator:
+        """
+        获取table 行中的补位按钮
+        :param locator:
+        :param timeout:
+        :return:
+        """
+        selecor: str = 'xpath=./a'
+        return await self.get_sub_locator(locator=locator, selector=selecor, timeout=timeout)
+
     async def get_flight_table(self, timeout: float = 5.0) -> Tuple[bool, Union[Locator, str]]:
         try:
             locator = self.__page.locator(self.__table_selector)
@@ -84,6 +174,7 @@ class DomesticActivityOrderPage(BasePo):
     3. 主流程：分页 + 每页解析 tbody
     ------------------------------------------------------------
     """
+
     async def parse_table_with_pagination(self, refresh_wait_time: float = 10.0) -> List[Dict[str, Any]]:
         """
         refresh_wait_time: 翻页后等待时间

qlv_helper/po/login_page.py

@@ -11,8 +11,7 @@
 """
 from typing import Tuple, Union
 from playwright_helper.libs.base_po import BasePo
-from qlv_helper.utils.ocr_helper import get_image_text
-from playwright.async_api import Page, TimeoutError as PlaywrightTimeoutError, Locator
+from playwright.async_api import Page, TimeoutError as PlaywrightTimeoutError, Locator, ElementHandle
 
 
 class LoginPage(BasePo):
@@ -22,104 +21,67 @@ class LoginPage(BasePo):
         super().__init__(page, url)
         self.__page = page
 
-    async def get_login_username_input(self, timeout: float = 5.0) -> Tuple[bool, Union[Locator, str]]:
+    async def get_login_username_input(self, timeout: float = 5.0) -> Locator:
         """
         获取登录页面的用户名输入框
         :param timeout: 超时时间（秒）
         :return: (是否存在, 错误信息|元素对象)
-        :return:
         """
         selector: str = '//input[@id="UserName"]'
-        try:
-            locator = self.__page.locator(selector)
-            if locator:
-                await locator.wait_for(state='visible', timeout=timeout * 1000)
-                return True, locator
-            else:
-                return False, '没有找到登录页面中的【用户名】输入框'
-        except PlaywrightTimeoutError:
-            return False, f"元素 '{selector}' 未在 {timeout} 秒内找到"
-        except Exception as e:
-            return False, f"检查元素时发生错误: {str(e)}"
+        return await self.get_locator(selector=selector, timeout=timeout)
 
-    async def get_login_password_input(self, timeout: float = 5.0) -> Tuple[bool, Union[Locator, str]]:
+    async def get_login_password_input(self, timeout: float = 5.0) -> Locator:
         """
         获取登录页面的密码输入框
         :param timeout: 超时时间（秒）
         :return: (是否存在, 错误信息|元素对象)
-        :return:
         """
         selector: str = '//input[@id="Password"]'
-        try:
-            locator = self.__page.locator(selector)
-            if locator:
-                await locator.wait_for(state='visible', timeout=timeout * 1000)
-                return True, locator
-            else:
-                return False, '没有找到登录页面中的【密码】输入框'
-        except PlaywrightTimeoutError:
-            return False, f"元素 '{selector}' 未在 {timeout} 秒内找到"
-        except Exception as e:
-            return False, f"检查元素时发生错误: {str(e)}"
+        return await self.get_locator(selector=selector, timeout=timeout)
 
-    async def get_login_number_code_input(self, timeout: float = 5.0) -> Tuple[bool, Union[Locator, str]]:
+    async def get_captcha(self, timeout: float = 5.0) -> Locator:
         """
-        获取登录页面的数字验证码输入框，第一层验证码
+        获取验证码Locator对象
         :param timeout: 超时时间（秒）
         :return: (是否存在, 错误信息|元素对象)
-        :return:
         """
-        selector: str = '//input[@id="Code"]'
-        try:
-            locator = self.__page.locator(selector)
-            if locator:
-                await locator.wait_for(state='visible', timeout=timeout * 1000)
-                return True, locator
-            else:
-                return False, '没有找到登录页面中的【数字验证码】输入框'
-        except PlaywrightTimeoutError:
-            return False, f"元素 '{selector}' 未在 {timeout} 秒内找到"
-        except Exception as e:
-            return False, f"检查元素时发生错误: {str(e)}"
+        selector: str = 'xpath=//div[@class="form_row"]/img[@onclick="this.src=this.src+\'?\'"]'
+        return await self.get_locator(selector=selector, timeout=timeout)
 
-    async def get_login_btn(self, timeout: float = 5.0) -> Tuple[bool, Union[Locator, str]]:
+    @staticmethod
+    async def get_captcha_type(locator: Locator, timeout: float = 5.0) -> int:
         """
-        获取登录页面的登录按钮
+        获取验证码的类型
+        :param locator: 验证码Locator对象
         :param timeout: 超时时间（秒）
         :return: (是否存在, 错误信息|元素对象)
-        :return:
         """
-        selector: str = '//input[@class="login-btn"]'
-        try:
-            locator = self.__page.locator(selector)
-            if locator:
-                await locator.wait_for(state='visible', timeout=timeout * 1000)
-                return True, locator
-            else:
-                return False, '没有找到登录页面中的【登录】按钮'
-        except PlaywrightTimeoutError:
-            return False, f"元素 '{selector}' 未在 {timeout} 秒内找到"
-        except Exception as e:
-            return False, f"检查元素时发生错误: {str(e)}"
+        img_src: str = await locator.get_attribute(name="src", timeout=timeout)
+        img_src_slice = img_src.split("=")
+        return int(img_src_slice[-1][0])
 
-    async def get_number_code(self, timeout: float = 5.0) -> Tuple[bool, str]:
+    async def get_captcha_image(self, timeout: float = 5.0) -> ElementHandle:
         selector: str = '//div[@id="signup_forms"]//img'
-        return await get_image_text(page=self.__page, selector=selector, timeout=timeout)
+        locator: Locator = await self.get_locator(selector=selector, timeout=timeout)
+        return await locator.element_handle(timeout=timeout * 1000)
 
-    async def is_exist_login_warn(self, timeout: float = 5.0) -> bool:
-        selector: str = '//p[@class="login_warn"]'
-        try:
-            locator = self.__page.locator(selector)
-            if locator:
-                text: str = await locator.text_content(timeout=timeout * 1000)
-                if text.strip() != "":
-                    return True
-                else:
-                    return False
-            else:
-                return False
-        except (PlaywrightTimeoutError, Exception):
-            return False
+    async def get_login_captcha_input(self, timeout: float = 5.0) -> Locator:
+        """
+        获取登录页面的验证码输入框
+        :param timeout: 超时时间（秒）
+        :return: (是否存在, 错误信息|元素对象)
+        """
+        selector: str = '//input[@id="Code"]'
+        return await self.get_locator(selector=selector, timeout=timeout)
+
+    async def get_login_btn(self, timeout: float = 5.0) -> Locator:
+        """
+        获取登录页面的登录按钮
+        :param timeout: 超时时间（秒）
+        :return: (是否存在, 错误信息|元素对象)
+        """
+        selector: str = '//input[@class="login-btn"]'
+        return await self.get_locator(selector=selector, timeout=timeout)
 
     async def get_wechat_entrance(self, timeout: float = 5.0) -> Tuple[bool, Union[Locator, str]]:
         selector: str = '//img[@src="/images/weixin.png"]'

qlv_helper/po/main_page.py

@@ -9,9 +9,8 @@
 # Copyright ©2011-2025. Hunan xxxxxxx Company limited. All rights reserved.
 # ---------------------------------------------------------------------------------------------------------
 """
-from typing import Tuple, Union
+from playwright.async_api import Page, Locator
 from playwright_helper.libs.base_po import BasePo
-from playwright.async_api import Page, TimeoutError as PlaywrightTimeoutError, Locator
 
 
 class MainPage(BasePo):
@@ -23,48 +22,18 @@ class MainPage(BasePo):
         self.url = url
         self.__page = page
 
-    async def get_confirm_btn_with_system_notice_dialog(self, timeout: float = 5.0) -> Tuple[bool, Union[Locator, str]]:
+    async def get_confirm_btn_with_system_notice_dialog(self, timeout: float = 5.0) -> Locator:
         """
         获取系统通知弹框中的确认按钮，注意这个地方，存在多个叠加的弹框，因此用last()方法，只需定位到最上面的那个弹框就行
         :return:
         """
         selector: str = "//div[@class='CommonAlert'][last()]//a[@class='CommonAlertBtnConfirm']"
-        try:
-            locator = self.__page.locator(selector)
-            if locator:
-                await locator.wait_for(state='visible', timeout=timeout * 1000)
-                return True, locator
-            else:
-                return False, '没有找到首页中的【系统提醒-确定】按钮'
-        except PlaywrightTimeoutError:
-            return False, f"元素 '{selector}' 未在 {timeout} 秒内找到"
-        except Exception as e:
-            return False, f"检查元素时发生错误: {str(e)}"
+        return await self.get_locator(selector=selector, timeout=timeout)
 
-    async def get_level1_menu_order_checkout(self, timeout: float = 5.0) -> Tuple[bool, Union[Locator, str]]:
+    async def get_level1_menu_order_checkout(self, timeout: float = 5.0) -> Locator:
         selector: str = "//span[contains(normalize-space(), '订单出票')]"
-        try:
-            locator = self.__page.locator(selector)
-            if locator:
-                await locator.wait_for(state='visible', timeout=timeout * 1000)
-                return True, locator
-            else:
-                return False, '没有找到首页中的【订单出票】左侧一级导航菜单'
-        except PlaywrightTimeoutError:
-            return False, f"元素 '{selector}' 未在 {timeout} 秒内找到"
-        except Exception as e:
-            return False, f"检查元素时发生错误: {str(e)}"
+        return await self.get_locator(selector=selector, timeout=timeout)
 
-    async def get_level2_menu_order_checkout(self, timeout: float = 5.0) -> Tuple[bool, Union[Locator, str]]:
+    async def get_level2_menu_order_checkout(self, timeout: float = 5.0) -> Locator:
         selector: str = "//a[@menuname='国内活动订单']"
-        try:
-            locator = self.__page.locator(selector)
-            if locator:
-                await locator.wait_for(state='visible', timeout=timeout * 1000)
-                return True, locator
-            else:
-                return False, '没有找到首页中的【国内活动订单】左侧二级导航菜单'
-        except PlaywrightTimeoutError:
-            return False, f"元素 '{selector}' 未在 {timeout} 秒内找到"
-        except Exception as e:
-            return False, f"检查元素时发生错误: {str(e)}"
+        return await self.get_locator(selector=selector, timeout=timeout)

qlv_helper/po/order_detail_page.py

@@ -273,3 +273,20 @@ class OrderDetailPage(BasePo):
         """
         selector: str = '//legend//input[@name="PolicyName"]'
         return await self.get_locator(selector=selector, timeout=timeout)
+
+    async def get_purchase_info_transaction_id(self, timeout: float = 5.0) -> List[str]:
+        """
+        获取订单详情页面的采购信息流水
+        :param timeout:
+        :return:
+        """
+        # selector: str = '//tr[@class="PurchaseInfoClass"]'
+        selector: str = '//table[@id="PurchaseInfos"]/tbody/tr'
+        loc: Locator = await self.get_locator(selector=selector, timeout=timeout)
+        locators = await loc.all()
+        transaction_ids = list()
+        for locator in locators:
+            transaction_id = await locator.get_attribute("transactionid")
+            if transaction_id:
+                transaction_ids.append(transaction_id.strip())
+        return transaction_ids

qlv_helper/utils/ocr_helper.py

@@ -9,11 +9,13 @@
 # Copyright ©2011-2025. Hunan xxxxxxx Company limited. All rights reserved.
 # ---------------------------------------------------------------------------------------------------------
 """
+import json
+import asyncio
 import ddddocr
 import requests
-from typing import Union, Tuple
+from typing import Tuple
 from aiohttp import ClientSession
-from playwright.async_api import Page, TimeoutError as PlaywrightTimeoutError
+from ocr_helper.core.baidu import ImageContentOCR
 
 # 复用 OCR 实例，不用每次都重新加载模型（更快）
 _ocr = ddddocr.DdddOcr(show_ad=False)
@@ -39,45 +41,38 @@ async def async_fetch_and_ocr_captcha(url: str) -> Tuple[str, bytes]:
     return result, img_bytes
 
 
-def recognize_captcha(image: Union[str, bytes]) -> str:
-    """
-    识别验证码图片，返回识别文本。
-    参数:
-        image: 图片路径 str，或图片的二进制 bytes
-    返回:
-        识别出的验证码字符串
-    """
-    try:
-        # 如果是路径，读取文件
-        if isinstance(image, str):
-            with open(image, "rb") as f:
-                img_bytes = f.read()
+async def get_image_text(image_path: str, captcha_type: int, api_key, secret_key: str) -> str:
+    if captcha_type == 0:
+        with open(image_path, "rb") as f:
+            img_bytes = f.read()
+        for _ in range(100):
+            text = _ocr.classification(img_bytes).strip()
+            if len(text) == 4:
+                return text
+        raise RuntimeError("ddddocr识别验证码失败")
+    else:
+        api = ImageContentOCR(api_key=api_key, secret_key=secret_key)
+        response = await api.get_access_token(is_end=False)
+        if not response.get("access_token"):
+            raise RuntimeError(f"获取百度API的认证Token失败，原因：{response}")
+        token = response.get("access_token")
+        response = await api.submit_request(
+            question='图片中的文字是什么，如果含有运算信息，请将运算结果返回。注意给我返回一个json格式数据包，例如：{"content":"xxxx", result: xxx}, 如果无运算信息，设置为空串就行',
+            image_path=image_path,
+            token=token,
+            is_end=False
+        )
+        task_id: str = response.get("result", dict()).get("task_id")
+        if not task_id:
+            raise RuntimeError(f"提交图片至百度API接口失败，原因：{response}")
+        await asyncio.sleep(delay=10)
+        response = await api.get_result(task_id=task_id, token=token, is_end=True)
+        if response.get("result").get("ret_code") == 0 and response.get("result").get("ret_msg") == "success":
+            description = response.get("result").get("description")
+            description = json.loads(description[description.find("{"):description.find("}") + 1])
+            if description.get("result"):
+                return str(description.get("result")).strip()
+            else:
+                return description.get("content").strip()
         else:
-            img_bytes = image
-
-        result = _ocr.classification(img_bytes)
-        return result
-
-    except Exception as e:
-        raise RuntimeError(f"OCR 识别失败: {e}")
-
-
-async def get_image_text(page: Page, selector: str, timeout: float = 5.0) -> Tuple[bool, str]:
-    try:
-        # 找到 img
-        locator = page.locator(selector)
-        if locator:
-            img = await locator.element_handle(timeout=timeout * 1000)
-
-            # 直接截图获取原始图片字节，不刷新图片
-            img_bytes = await img.screenshot(timeout=timeout * 1000)
-
-            # OCR 识别
-            text = _ocr.classification(img_bytes)
-            return True, text.strip()
-        else:
-            return False, f'没有找到当前页面中的【{selector}】图片'
-    except PlaywrightTimeoutError:
-        return False, f"元素 '{selector}' 未在 {timeout} 秒内找到"
-    except Exception as e:
-        return False, f"检查元素时发生错误: {str(e)}"
+            raise RuntimeError(f"调用百度API，获取图片识别结果失败，原因{response}")