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

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

@@ -10,20 +10,23 @@
 # ---------------------------------------------------------------------------------------------------------
 """
 import re
+import json
 import aiohttp
 from datetime import datetime
+from urllib.parse import quote
 from bs4 import BeautifulSoup, Tag
 from collections import OrderedDict
 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
 
 
 async def get_order_page_html(
-        order_id: int, 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
+        *, order_id: int, 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
 ) -> Dict[str, Any]:
     order_http_client = HttpClientFactory(
         protocol=protocol if protocol == "http" else "https",
@@ -41,6 +44,121 @@ async def get_order_page_html(
     )
 
 
+async def fill_procurement_info_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
+) -> 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/{order_id}?&r={datetime.now().strftime("%Y%m%d%H%M%S")}",
+    }
+    if data_list:
+        data = data_list
+    else:
+        remark = f"{platform_user_id}/{user_password}"
+        pName = "," + ",".join(passengers) + ","
+        pids = ",".join(pids)
+        data = [
+            {"tradingDat": datetime.now().strftime("%Y-%m-%d %H:%M"), "outTktPF": "G航司官网", "outTktLoginCode": "",
+             "typeName": "VCC", "accountID": "8", "accountName": "VCC", "transactionAmount": f"{amount}",
+             "mainCheckNumber": "", "airCoOrderID": f"{pre_order_id}", "QuotaResultAmount": "0.00",
+             "remark": f"{quote(remark)}", "flightIdx": ",1,", "pName": f"{pName}", "orderID": f"{order_id}",
+             "businessTypeName": "机票", "tradingItems": "机票支出", "actualAmount": 0, "pType": "成人",
+             "fids": f"{fids}", "pids": f"{pids}", "iscandel": "true", "isbatch": "false",
+             "MainCheckNumberValus": f"{transaction_id}",
+             "OfficeNo": "", "PriceStdActual": "0.00", "ReturnAmount": "0.0000", "OffsetReturnAmount": "0.00",
+             "profitRemark": "", "preSaleType": "", "ErrorType": "", "OutTktPFTypeID": "34", "OutTicketAccount": "",
+             "OutTicketAccountID": "", "OutTicketPWD": "", "OutTicketTel": "", "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_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
@@ -154,6 +272,9 @@ def flight_extend_headers() -> OrderedDict[str, str]:
         ("id_valid_dat", " 证件有效期"),  # 9
         ("code_dep", " 起飞机场"),  # 10
         ("code_arr", " 抵达机场"),  # 11
+        ("pid", "乘客ID"),  # 12
+        ("fid", "航段ID"),  # 13
+        ("tid", "乘客表ID"),  # 14
     ])
 
 
@@ -269,7 +390,20 @@ def parse_order_flight_table_passenger_info(raw: Tag, headers: OrderedDict[str,
     nationality = guobies[0].get_text(strip=True) if len(guobies) > 0 else ""
     issue_country = guobies[1].get_text(strip=True) if len(guobies) > 1 else ""
 
-    return {
+    a1 = raw.find("a", id=lambda x: x and x.startswith("IDNo_"))
+    a2 = raw.find("a", id=lambda x: x and x.startswith("detrni_"))
+    a3 = raw.find("a", id=lambda x: x and x.startswith("detrnif_"))
+    pid = None
+    if a1:
+        full_id = a1["id"]  # IDNo_279778
+        pid = full_id.split("_")[-1]
+    elif a2:
+        full_id = a2["id"]  # detrni_279778
+        pid = full_id.split("_")[-1]
+    elif a3:
+        full_id = a3["id"]  # detrnif_279778
+        pid = full_id.split("_")[-1]
+    result = {
         get_key_by_index(index=0, ordered_dict=headers): name,  # 姓名
         get_key_by_index(index=1, ordered_dict=headers): ptype,  # 类型: 成人/儿童
         get_key_by_index(index=2, ordered_dict=headers): id_type,  # 证件类型
@@ -279,8 +413,12 @@ def parse_order_flight_table_passenger_info(raw: Tag, headers: OrderedDict[str,
         get_key_by_index(index=6, ordered_dict=headers): sex,  # 性别
         get_key_by_index(index=7, ordered_dict=headers): nationality,  # 国籍
         get_key_by_index(index=8, ordered_dict=headers): issue_country,  # 签发国
-        get_key_by_index(index=9, ordered_dict=headers): id_valid  # 证件有效期
+        get_key_by_index(index=9, ordered_dict=headers): id_valid,  # 证件有效期
     }
+    if pid is not None:
+        #  乘客ID
+        result[get_key_by_index(index=12, ordered_dict=headers)] = pid
+    return result
 
 
 def parse_order_flight_table_row(
@@ -288,8 +426,10 @@ def parse_order_flight_table_row(
 ) -> Dict[str, Any]:
     """解析航班表每一行的数据"""
     tds = tr.find_all("td", recursive=False)
-    values = {}
-
+    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
@@ -303,6 +443,14 @@ def parse_order_flight_table_row(
         else:
             raw = clean_order_flight_table(html=td)
             if "行程" in value:
+                fid = ""
+                input_tag = td.find('input', {'name': 'fid'})
+                fid_key = get_key_by_index(index=13, ordered_dict=extend_headers)
+                if input_tag:
+                    match = re.search(r'\d+', input_tag.get('value'))
+                    if match:
+                        fid = match.group()
+                    values[fid_key] = fid
                 code_dep_key = get_key_by_index(index=10, ordered_dict=extend_headers)
                 code_arr_key = get_key_by_index(index=11, ordered_dict=extend_headers)
                 raw_slice = raw.split("-")
@@ -313,7 +461,6 @@ def parse_order_flight_table_row(
                 values[key] = raw
             else:
                 values[key] = safe_convert_advanced(raw)
-
     return values
 
 
@@ -326,6 +473,8 @@ def extract_structured_table_data(table: Tag) -> List[Optional[Dict[str, Any]]]:
     for tr in table.find_all("tr")[1:]:  # 跳过表头
         rows.append(parse_order_flight_table_row(tr=tr, headers=headers, extend_headers=extend))
 
+    if rows:
+        rows = list({i["id_no"]: i for i in sorted(rows, key=lambda x: bool(x.get("fid")))}.values())
     return rows
 
 
@@ -333,14 +482,12 @@ def parser_order_flight_table(html: str) -> List[Optional[Dict[str, Any]]]:
     """解析航班表"""
     soup = BeautifulSoup(html, 'html.parser')
     # 三个主要的order_sort div
-    order_sections = soup.find_all('div', class_='order_sort')
-    section = order_sections[3] if len(order_sections) > 3 else Tag(name="")
+    table_sections = soup.find_all('table', class_='table table_border table_center')
+    table = table_sections[2] if len(table_sections) > 2 else Tag(name="")
     results = list()
 
-    tables = section.find_all('table', class_='table table_border table_center')
-    for table in tables:
-        table_data = extract_structured_table_data(table)
-        if table_data:
-            results.extend(table_data)
+    table_data = extract_structured_table_data(table)
+    if table_data:
+        results.extend(table_data)
 
     return results

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: 翻页后等待时间