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

{python_qlv_helper-0.5.7.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.5.7
+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.5.7.dist-info → python_qlv_helper-0.7.2.dist-info}/RECORD

@@ -1,35 +1,36 @@
-python_qlv_helper-0.5.7.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=tOV80nrL8YDVNjvKi8YQP0hWqAcd8M1J0ToRK5YLWZ0,21701
-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=zIUZk1UiinoLQ4Y-Qwcv0ZmNAXtYoOGOYDdwdoA0RBI,13157
+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.5.7.dist-info/METADATA,sha256=QcI93-dpNseb9ie1ciSpmZu2GMC45SVG--lmaK8ZkJ8,14853
-python_qlv_helper-0.5.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-python_qlv_helper-0.5.7.dist-info/top_level.txt,sha256=0pYdhD8SfBcC57LzLYGHY7cwwPqdqAkB1twysCJh5OA,11
-python_qlv_helper-0.5.7.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,7 +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 qlv_helper.http.order_page import parser_order_info, get_order_page_html, parser_order_flight_table
+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_itinerary_info_with_http, fill_procurement_dto_with_http
 from playwright.async_api import Page, Locator, Error as PlaywrightError, TimeoutError as PlaywrightTimeoutError
 
 
@@ -95,7 +97,7 @@ async def order_unlock(
     lock_state, lock_btn = await page.get_order_lock_state_btn(timeout=timeout)
     if "强制解锁" in lock_state:
         if is_force is False:
-            raise EnvironmentError(f"订单<{order_id}>，被他人锁定，无需解锁处理")
+            raise EnvironmentError(f"被他人锁定，无需解锁处理")
         await lock_btn.click(button="left")
         logger.info(f"订单详情页面，用户操作【{lock_state}】按钮点击完成")
         try:
@@ -135,7 +137,7 @@ async def order_locked(
     lock_state, lock_btn = await page.get_order_lock_state_btn(timeout=timeout)
     if "强制解锁" in lock_state:
         if is_force is False:
-            raise EnvironmentError(f"订单<{order_id}>，被他人锁定，不做加锁处理")
+            raise EnvironmentError(f"被他人锁定，不做加锁处理")
         await lock_btn.click(button="left")
         logger.info(f"订单详情页面，用户操作【{lock_state}】按钮点击完成")
         try:
@@ -317,7 +319,7 @@ async def fill_itinerary(
     diff = kwargs_passengers.difference(current_passengers)
     if diff:
         raise RuntimeError(
-            f"订单<{order_id}>，传递回填票号的乘客证件信息<{kwargs_passengers}>与订单实际乘客信息<{current_passengers}>不一致"
+            f"传递回填票号的乘客证件信息<{kwargs_passengers}>与订单实际乘客信息<{current_passengers}>不一致"
         )
     passenger_itinerary_locator = cast(Locator, None)
     for passenger_locator in passenger_itinerary_locators:
@@ -333,7 +335,7 @@ async def fill_itinerary(
         await passenger_itinerary_locator.press("Enter")
         logger.info(f"订单<{order_id}>，本次的票号回填完成")
     else:
-        raise RuntimeError(f"订单<{order_id}>，回填票号过程异常，回填失败")
+        raise RuntimeError(f"回填票号过程异常，回填失败")
 
 
 async def first_open_page_fill_itinerary(
@@ -413,6 +415,7 @@ async def first_open_page_my_order_unlock(
         lock_state, lock_btn = await order_detail_po.get_order_lock_state_btn(timeout=timeout)
     elif "锁定" in lock_state:
         logger.info(f"订单<{order_id}>，处于无锁状态，无需解锁处理")
+        return order_detail_po
     elif "操作" in lock_state:
         await lock_btn.click(button="left")
         await asyncio.sleep(2)
@@ -425,3 +428,69 @@ async def first_open_page_my_order_unlock(
     await asyncio.sleep(2)
     logger.info(f"订单详情页面，日志记录栏，【{lock_state}】按钮点击完成")
     return order_detail_po
+
+
+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, **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,
+        platform_user_id=platform_user_id, user_password=user_password, passengers=passengers, fids=fids, pids=pids,
+        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