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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python_qlv_helper
-Version: 0.7.2
+Version: 0.9.3
 Summary: qlv helper python package
 Author-email: ckf10000 <ckf10000@sina.com>
 License:                                  Apache License
@@ -216,10 +216,10 @@ 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"
-Requires-Dist: python_http_helper>=0.2.0; 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
+Requires-Dist: python_http_helper>=0.2.1; python_version >= "3.12"
+Requires-Dist: python_playwright_helper>=0.4.3; python_version >= "3.12"
+Requires-Dist: python_ocr_helper>=0.0.2; python_version >= "3.12"
+Requires-Dist: flight_helper>=0.3.6
 Dynamic: license-file
 
 # qlv-helper

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

@@ -1,4 +1,4 @@
-python_qlv_helper-0.7.2.dist-info/licenses/LICENSE,sha256=WtjCEwlcVzkh1ziO35P2qfVEkLjr87Flro7xlHz3CEY,11556
+python_qlv_helper-0.9.3.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
@@ -6,19 +6,19 @@ qlv_helper/config/url_const.py,sha256=EoLHOtlO3Ob2WSMMv6TBrl7eJCfJCB844dwmD_k86B
 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=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/order_detail.py,sha256=bDmA_v0CummPlKKfxTry6-SaH6qfZ4LekqnK38Rq2CA,22114
+qlv_helper/controller/order_table.py,sha256=bVVCM2oJF4q43fdJN5aBYbpwzW2rcL0bMoCP90ZIvtY,15144
 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=Sti3dxZIN1U9z0e7NwyJ6_TrNdI-N3mRFnUN8WpN3FM,21674
+qlv_helper/http/order_page.py,sha256=aaghRwvC2Px5OgQh8Lc4-Q1eQWbXE-lYM2iLdm7qbSw,24987
 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=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/order_detail_page.py,sha256=f3PZF1Sm5Xdc9qRQDDKSq08L6PM-o4Vkchu32sZytfA,15545
 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
@@ -30,7 +30,7 @@ qlv_helper/utils/po_utils.py,sha256=SwQKL58HERGG2Weou_AwY_TQoYSvgi0gvaVCJBput_k,
 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.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,,
+python_qlv_helper-0.9.3.dist-info/METADATA,sha256=GVMfOfy40GcPrKIH_pLtFCW3vzPD6b2sZH-yd4XbnW4,14825
+python_qlv_helper-0.9.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+python_qlv_helper-0.9.3.dist-info/top_level.txt,sha256=0pYdhD8SfBcC57LzLYGHY7cwwPqdqAkB1twysCJh5OA,11
+python_qlv_helper-0.9.3.dist-info/RECORD,,

qlv_helper/controller/order_detail.py

@@ -13,12 +13,19 @@ import aiohttp
 import asyncio
 from logging import Logger
 from datetime import datetime
+from typing import Dict, Any, List, Optional
 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.utils.exception_utils import UserNotLoginError
 from flight_helper.models.dto.procurement import FillProcurementInputDTO
+from flight_helper.utils.exception_utils import RelationOrderConflictError, LockedOrderFailedError
 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
+    fill_procurement_dto_with_http as _fill_procurement_dto_with_http, fill_remark_with_http as _fill_remark_with_http, \
+    update_policy_with_http as _update_policy_with_http, unlock_order_with_http as _unlock_order_with_http, \
+    forced_unlock_order_with_http as _forced_unlock_order_with_http, locked_order_with_http as _locked_order_with_http, \
+    fill_itinerary_with_http as _fill_itinerary_with_http, \
+    kick_out_activity_order_with_http as _kick_out_activity_order_with_http, \
+    kick_out_activity_orders_with_http as _kick_out_activity_orders_with_http
 from playwright.async_api import Page, Locator, Error as PlaywrightError, TimeoutError as PlaywrightTimeoutError
 
 
@@ -57,9 +64,14 @@ async def open_order_detail_page(
     logger.info(f"即将劲旅订单详情页面，页面URL<{order_detail_url}>")
 
     try:
+        message: str = await order_detail_po.get_message_content(timeout=1)
+        if "关联订单" in message:
+            raise RelationOrderConflictError(message)
         confirm_btn = await order_detail_po.get_message_notice_dialog_confirm_btn(timeout=1)
         await confirm_btn.click(button="left")
         logger.info("订单详情页面，消息提醒弹框，【确认】按钮点击完成")
+    except (RelationOrderConflictError,):
+        raise
     except (PlaywrightTimeoutError, PlaywrightError, RuntimeError, Exception):
         pass
     return order_detail_po
@@ -77,6 +89,58 @@ async def add_custom_remark(*, logger: Logger, page: OrderDetailPage, remark: st
     logger.info(f"订单详情页面，日志记录栏，【保存备注】按钮点击完成")
 
 
+async def add_custom_remark_with_http(
+        *, order_id: int, remark: str, 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]:
+    return await _fill_remark_with_http(
+        remark=remark, order_id=order_id, qlv_domain=domain, qlv_protocol=protocol, retry=retry, timeout=timeout,
+        enable_log=enable_log, cookie_jar=cookie_jar, playwright_state=playwright_state
+    )
+
+
+async def update_order_policy_with_http(
+        *, order_id: int, policy_name: str, domain: str, protocol: str = "http", retry: int = 1, timeout: int = 5,
+        enable_log: bool = True, cookie_jar: Optional[aiohttp.CookieJar] = None, old_policy_name: Optional[str] = None,
+        playwright_state: Dict[str, Any] = None
+) -> Dict[str, Any]:
+    return await _update_policy_with_http(
+        policy_name=policy_name, order_id=order_id, qlv_domain=domain, qlv_protocol=protocol, retry=retry,
+        timeout=timeout, enable_log=enable_log, cookie_jar=cookie_jar, playwright_state=playwright_state,
+        old_policy_name=old_policy_name
+    )
+
+
+async def locked_order_with_http(
+        *, 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]:
+    return await _locked_order_with_http(
+        order_id=order_id, qlv_domain=domain, qlv_protocol=protocol, retry=retry, timeout=timeout,
+        enable_log=enable_log, cookie_jar=cookie_jar, playwright_state=playwright_state
+    )
+
+
+async def unlock_order_with_http(
+        *, 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]:
+    return await _unlock_order_with_http(
+        order_id=order_id, qlv_domain=domain, qlv_protocol=protocol, retry=retry, timeout=timeout,
+        enable_log=enable_log, cookie_jar=cookie_jar, playwright_state=playwright_state
+    )
+
+
+async def forced_unlock_order_with_http(
+        *, 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]:
+    return await _forced_unlock_order_with_http(
+        order_id=order_id, qlv_domain=domain, qlv_protocol=protocol, retry=retry, timeout=timeout,
+        enable_log=enable_log, cookie_jar=cookie_jar, playwright_state=playwright_state
+    )
+
+
 async def update_order_policy(
         *, page: OrderDetailPage, logger: Logger, policy: str, order_id: int, timeout: float = 5.0
 ) -> None:
@@ -93,6 +157,13 @@ async def order_unlock(
         *, logger: Logger, page: OrderDetailPage, remark: str, order_id: int, is_force: bool = False,
         qlv_user_id: Optional[str] = None, timeout: float = 5.0
 ) -> None:
+    try:
+        confirm_btn = await page.get_message_notice_dialog_confirm_btn(timeout=3)
+        await confirm_btn.click(button="left")
+        logger.info("订单详情页面，消息提醒弹框，【确认】按钮点击完成")
+        await asyncio.sleep(2)
+    except (Exception,):
+        pass
     # 1. 获取订单操作锁的状态
     lock_state, lock_btn = await page.get_order_lock_state_btn(timeout=timeout)
     if "强制解锁" in lock_state:
@@ -101,7 +172,7 @@ async def order_unlock(
         await lock_btn.click(button="left")
         logger.info(f"订单详情页面，用户操作【{lock_state}】按钮点击完成")
         try:
-            confirm_btn = await page.get_message_notice_dialog_confirm_btn(timeout=1)
+            confirm_btn = await page.get_message_notice_dialog_confirm_btn(timeout=5)
             await confirm_btn.click(button="left")
             logger.info("订单详情页面，强制解锁弹框确认，【确认】按钮点击完成")
             await asyncio.sleep(2)
@@ -115,10 +186,27 @@ async def order_unlock(
         return
     elif "操作" in lock_state:
         await lock_btn.click(button="left")
-        await asyncio.sleep(2)
-        lock_state_temp = lock_state
+        logger.info(f"订单详情页面，日志记录栏，【{lock_state}】按钮点击完成")
+        try:
+            confirm_btn = await page.get_message_notice_dialog_confirm_btn(timeout=3)
+            await confirm_btn.click(button="left")
+            logger.info("订单详情页面，消息提醒弹框，【确认】按钮点击完成")
+            await asyncio.sleep(2)
+        except (Exception,):
+            pass
         lock_state, lock_btn = await page.get_order_lock_state_btn(timeout=timeout)
-        logger.info(f"订单详情页面，日志记录栏，【{lock_state_temp}】按钮点击完成")
+        logger.info(f"订单详情页面，页面刷新后，【{lock_state}】按钮获取完成")
+        if "操作" in lock_state:
+            await lock_btn.click(button="left")
+            logger.info(f"订单详情页面，日志记录栏，【{lock_state}】按钮点击完成")
+            try:
+                confirm_btn = await page.get_message_notice_dialog_confirm_btn(timeout=3)
+                await confirm_btn.click(button="left")
+                logger.info("订单详情页面，消息提醒弹框，【确认】按钮点击完成")
+                await asyncio.sleep(2)
+            except (Exception,):
+                pass
+            lock_state, lock_btn = await page.get_order_lock_state_btn(timeout=timeout)
     if remark:
         # 2. 添加解锁备注
         await add_custom_remark(logger=logger, page=page, remark=remark, timeout=timeout)
@@ -155,11 +243,19 @@ async def order_locked(
     # 2. 点击【锁定|操作】按钮
     await lock_btn.click(button="left")
     logger.info(f"订单详情页面，日志记录栏，【{lock_state}】按钮点击完成")
+    try:
+        confirm_btn = await page.get_message_notice_dialog_confirm_btn(timeout=1)
+        await confirm_btn.click(button="left")
+        logger.info("订单详情页面，强制解锁弹框确认，【确认】按钮点击完成")
+        await asyncio.sleep(2)
+    except (PlaywrightTimeoutError, PlaywrightError, RuntimeError, Exception):
+        pass
 
 
 async def first_open_page_order_locked(
         *, logger: Logger, page: Page, protocol: str, domain: str, order_id: int, is_force: bool = False,
-        qlv_user_id: Optional[str] = None, timeout: float = 5.0, **kwargs
+        qlv_user_id: Optional[str] = None, timeout: float = 5.0, retry: int = 1, enable_log: bool = True,
+        cookie_jar: Optional[aiohttp.CookieJar] = None, playwright_state: Dict[str, Any] = None, **kwargs
 ) -> OrderDetailPage:
     # 1. 打开页面
     order_detail_po = await open_order_detail_page(
@@ -167,141 +263,30 @@ async def first_open_page_order_locked(
     )
 
     # 2. 锁定订单
-    await order_locked(
-        logger=logger, page=order_detail_po, order_id=order_id, timeout=timeout, is_force=is_force,
-        qlv_user_id=qlv_user_id
-    )
-    return order_detail_po
-
-
-async def first_open_page_order_unlock(
-        *, logger: Logger, page: Page, protocol: str, domain: str, order_id: int, is_force: bool = False,
-        qlv_user_id: Optional[str] = None, timeout: float = 5.0, remark: Optional[str] = None, **kwargs
-) -> OrderDetailPage:
-    # 1. 打开页面
-    order_detail_po = await open_order_detail_page(
-        page=page, logger=logger, protocol=protocol, domain=domain, order_id=order_id, timeout=timeout
-    )
-
-    # 2. 解锁订单
-    await order_unlock(
-        logger=logger, page=order_detail_po, order_id=order_id, timeout=timeout, is_force=is_force,
-        qlv_user_id=qlv_user_id, remark=remark
-    )
-    return order_detail_po
-
-
-async def fill_procurement_info(
-        *, logger: Logger, page: OrderDetailPage, order_id: int, out_ticket_platform_type: str, purchase_amount: float,
-        out_ticket_platform: str, out_ticket_account: str, purchase_account_type: str, purchase_account: str,
-        ceair_user_id: str, ceair_password: str, payment_id: str, platform_order_id: str, timeout: float = 5.0
-) -> None:
-    # 1. 出票地类型选择【out_ticket_platform_type】
-    out_ticket_platform_type_dropdown = await page.get_out_ticket_platform_type_dropdown(timeout=timeout)
-    await out_ticket_platform_type_dropdown.select_option(label=out_ticket_platform_type)
-    # await out_ticket_platform_type_dropdown.click(button="left")
-    # out_ticket_platform_type_select_option = await page.get_out_ticket_platform_type_select_option(
-    #     select_option=out_ticket_platform_type, timeout=timeout
-    # )
-    # await out_ticket_platform_type_select_option.click(button="left")
-    logger.info(f"订单详情页面，采购信息栏，出票地类型选择<{out_ticket_platform_type}>已完成")
-    await asyncio.sleep(1)
-
-    # 2. 出票平台选择【out_ticket_platform】
-    out_ticket_platform_dropdown = await page.get_out_ticket_platform_dropdown(timeout=timeout)
-    await out_ticket_platform_dropdown.select_option(label=out_ticket_platform)
-    # await out_ticket_platform_dropdown.click(button="left")
-    # out_ticket_platform_select_option = await page.get_out_ticket_platform_select_option(
-    #     select_option=out_ticket_platform, timeout=timeout
+    # await order_locked(
+    #     logger=logger, page=order_detail_po, order_id=order_id, timeout=timeout, is_force=is_force,
+    #     qlv_user_id=qlv_user_id
     # )
-    # await out_ticket_platform_select_option.click(button="left")
-    logger.info(f"订单详情页面，采购信息栏，出票平台选择<{out_ticket_platform}>已完成")
-    await asyncio.sleep(1)
-
-    # 3. 出票账号选择【out_ticket_account】
-    out_ticket_account_dropdown = await page.get_out_ticket_account_dropdown(timeout=timeout)
-    await out_ticket_account_dropdown.select_option(label=out_ticket_account)
-    # await out_ticket_account_dropdown.click(button="left")
-    # out_ticket_account_select_option = await page.get_out_ticket_account_select_option(
-    #     select_option=out_ticket_account, timeout=timeout
-    # )
-    # await out_ticket_account_select_option.click(button="left")
-    logger.info(f"订单详情页面，采购信息栏，出票账号选择<{out_ticket_account}>已完成")
-    await asyncio.sleep(1)
-
-    # 4. 采购账号类型选择【purchase_account_type】
-    purchase_account_type_dropdown = await page.get_purchase_account_type_dropdown(timeout=timeout)
-    await purchase_account_type_dropdown.select_option(label=purchase_account_type)
-    # await purchase_account_type_dropdown.click(button="left")
-    # purchase_account_type_select_option = await page.get_purchase_account_type_select_option(
-    #     select_option=purchase_account_type, timeout=timeout
-    # )
-    # await purchase_account_type_select_option.click(button="left")
-    logger.info(f"订单详情页面，采购信息栏，采购账号类型选择<{purchase_account_type}>已完成")
-    await asyncio.sleep(1)
-
-    # 5. 采购账号选择【purchase_account】
-    purchase_account_dropdown = await page.get_purchase_account_dropdown(timeout=timeout)
-    await purchase_account_dropdown.select_option(label=purchase_account)
-    # await purchase_account_dropdown.click(button="left")
-    # purchase_account_select_option = await page.get_purchase_account_select_option(
-    #     select_option=purchase_account, timeout=timeout
-    # )
-    # await purchase_account_select_option.click(button="left")
-    logger.info(f"订单详情页面，采购信息栏，采购账号选择<{purchase_account}>已完成")
-    await asyncio.sleep(1)
-
-    # 6. 填写采购金额
-    purchase_amount_input = await page.get_purchase_amount_input(timeout=timeout)
-    await purchase_amount_input.fill(value=str(purchase_amount))
-    logger.info(f"订单详情页面，采购信息栏，采购金额<{purchase_amount}>输入完成")
-
-    # 7. 填写备注
-    remark_input = await page.get_remark_input(timeout=timeout)
-    value = f"{ceair_user_id}/{ceair_password}"
-    await remark_input.fill(value=value)
-    logger.info(f"订单详情页面，采购信息栏，备注<{value}>输入完成")
-
-    # 8. 填写对账标识
-    main_check_input = await page.get_main_check_input(timeout=timeout)
-    await main_check_input.fill(value=payment_id)
-    logger.info(f"订单详情页面，采购信息栏，对账标识<{payment_id}>输入完成")
-
-    # 9. 填写官网订单号
-    air_comp_order_id_input = await page.get_air_comp_order_id_input(timeout=timeout)
-    await air_comp_order_id_input.fill(value=platform_order_id)
-    logger.info(f"订单详情页面，采购信息栏，官网订单号<{platform_order_id}>输入完成")
-
-    # 10. 点击【保存采购】按钮
-    procurement_info_save_btn = await page.get_procurement_info_save_btn(timeout=timeout)
-    await procurement_info_save_btn.click(button="left")
-    logger.info(f"订单详情页面，采购信息栏，【保存采购】按钮点击完成")
-
-
-async def first_open_page_fill_procurement_info(
-        *, logger: Logger, page: Page, order_id: int, protocol: str, domain: str, out_ticket_platform_type: str,
-        purchase_amount: float, out_ticket_platform: str, out_ticket_account: str, purchase_account_type: str,
-        purchase_account: str, ceair_user_id: str, ceair_password: str, payment_id: str, platform_order_id: str,
-        is_force: bool = False, qlv_user_id: Optional[str] = None, timeout: float = 5.0, **kwargs: Any
-) -> OrderDetailPage:
-    # 1. 打开页面
-    order_detail_po = await open_order_detail_page(
-        page=page, logger=logger, protocol=protocol, domain=domain, order_id=order_id, timeout=timeout
-    )
-
-    # 2. 锁定订单
-    await order_locked(
-        logger=logger, page=order_detail_po, order_id=order_id, is_force=is_force, timeout=timeout,
-        qlv_user_id=qlv_user_id
-    )
-
-    # 3. 回填采购信息
-    await fill_procurement_info(
-        out_ticket_platform_type=out_ticket_platform_type, out_ticket_account=out_ticket_account, payment_id=payment_id,
-        purchase_amount=purchase_amount, out_ticket_platform=out_ticket_platform, purchase_account=purchase_account,
-        purchase_account_type=purchase_account_type, ceair_user_id=ceair_user_id, ceair_password=ceair_password,
-        platform_order_id=platform_order_id, timeout=timeout, logger=logger, page=order_detail_po, order_id=order_id
+    response = await _locked_order_with_http(
+        order_id=order_id, qlv_domain=domain, qlv_protocol=protocol, retry=retry, timeout=int(timeout),
+        enable_log=enable_log, cookie_jar=cookie_jar, playwright_state=playwright_state
     )
+    message = response.get("message")
+    if message == "订单出票":
+        logger.info(f"订单<{order_id}>，被用户<{qlv_user_id}>锁单成功")
+    else:
+        msg: str = "锁单失败"
+        if message == "强旅系统":
+            if response.get("data").find("用户登陆") != -1:
+                raise UserNotLoginError(f"{msg}，用户<{qlv_user_id}>未登录劲旅系统")
+            else:
+                msg = msg + "," + response.get("data") if len(
+                    response.get("data")
+                ) < 100 else response.get("data")[:100]
+                raise RuntimeError(msg)
+        elif message == "操作提示":
+            msg = msg + f"，原因：{response.get('data')}"
+        raise LockedOrderFailedError(msg)
     return order_detail_po
 
 
@@ -321,26 +306,23 @@ async def fill_itinerary(
         raise RuntimeError(
             f"传递回填票号的乘客证件信息<{kwargs_passengers}>与订单实际乘客信息<{current_passengers}>不一致"
         )
-    passenger_itinerary_locator = cast(Locator, None)
     for passenger_locator in passenger_itinerary_locators:
         current_passenger = passenger_locator.get("username")
         passenger_itinerary = passengers_itinerary.get(current_passenger)
         if passenger_itinerary:
             passenger_itinerary_locator: Locator = passenger_locator.get("locator")
             await passenger_itinerary_locator.fill(value=passenger_itinerary)
+            await passenger_itinerary_locator.press("Enter")
             logger.info(f"订单<{order_id}>，乘客<{current_passenger}>的票号<{passenger_itinerary}>填写完成")
+            await asyncio.sleep(1)
         else:
             logger.warning(f"订单<{order_id}>，乘客<{current_passenger}>的票号没有获取到，本次回填跳过，等待下一次")
-    if passenger_itinerary_locator:
-        await passenger_itinerary_locator.press("Enter")
-        logger.info(f"订单<{order_id}>，本次的票号回填完成")
-    else:
-        raise RuntimeError(f"回填票号过程异常，回填失败")
 
 
 async def first_open_page_fill_itinerary(
-        *, page: Page, logger: Logger, protocol: str, domain: str, order_id: int,
-        passengers_itinerary: Dict[str, Any], timeout: float = 20.0, **kwargs: Any
+        *, page: Page, logger: Logger, protocol: str, domain: str, order_id: int, retry: int = 1,
+        enable_log: bool = True, passengers_itinerary: Dict[str, Any], timeout: float = 20.0,
+        cookie_jar: Optional[aiohttp.CookieJar] = None, playwright_state: Dict[str, Any] = None, **kwargs: Any
 ) -> OrderDetailPage:
     # 1. 开发页面
     order_detail_po = await open_order_detail_page(
@@ -353,25 +335,35 @@ async def first_open_page_fill_itinerary(
         passengers_itinerary=passengers_itinerary
     )
     logger.info(f"订单<{order_id}>，票号回填流程结束")
-    await order_unlock(logger=logger, page=order_detail_po, order_id=order_id, timeout=timeout, remark="")
-    logger.info(f"订单<{order_id}>，订单解锁成功")
-    return order_detail_po
-
-
-async def first_open_page_update_policy(
-        *, page: Page, logger: Logger, protocol: str, domain: str, order_id: int, policy: str, timeout: float = 20.0,
-        **kwargs: Any
-) -> OrderDetailPage:
-    # 1. 打开页面
-    order_detail_po = await open_order_detail_page(
-        page=page, logger=logger, protocol=protocol, domain=domain, order_id=order_id, timeout=timeout
-    )
-
-    # 2. 更新订单政策代码
-    await update_order_policy(
-        logger=logger, page=order_detail_po, order_id=order_id, timeout=timeout, policy=policy
-    )
 
+    # 3. 解锁订单
+    # await order_unlock(
+    #     logger=logger, page=order_detail_po, order_id=order_id, timeout=timeout, is_force=True, remark=""
+    # )
+    msg: str = f"订单<{order_id}>，"
+    try:
+        response = await forced_unlock_order_with_http(
+            retry=retry, timeout=int(timeout), enable_log=enable_log, cookie_jar=cookie_jar,
+            playwright_state=playwright_state, order_id=order_id, domain=domain, protocol=protocol
+        )
+        if response.get("data") == "1":
+            logger.info(f"{msg}强制解锁成功")
+    except Exception as e:
+        logger.error(f"{msg}强制解锁失败，原因：{e}")
+    try:
+        response = await unlock_order_with_http(
+            retry=retry, timeout=int(timeout), enable_log=enable_log, cookie_jar=cookie_jar,
+            playwright_state=playwright_state, order_id=order_id, domain=domain, protocol=protocol
+        )
+        if response.get("data") == "OK":
+            logger.info(f"{msg}解锁成功")
+        else:
+            if response.get('data'):
+                logger.error(f"{msg}解锁失败，原因：{response.get('data')}")
+            else:
+                logger.error(f"{msg}解锁失败，原因：{response}")
+    except Exception as e:
+        logger.error(f"{msg}解锁失败，原因：{e}")
     return order_detail_po
 
 
@@ -379,7 +371,7 @@ async def first_open_page_my_order_unlock(
         *, page: Page, logger: Logger, protocol: str, domain: str, order_id: int, qlv_user_id: str,
         policy: Optional[str] = None, remark: Optional[str] = None, timeout: float = 20.0, is_force: bool = False,
         **kwargs: Any
-) -> OrderDetailPage:
+) -> None:
     # 1. 打开页面
     order_detail_po = await open_order_detail_page(
         page=page, logger=logger, protocol=protocol, domain=domain, order_id=order_id, timeout=timeout
@@ -391,56 +383,10 @@ async def first_open_page_my_order_unlock(
             logger=logger, page=order_detail_po, order_id=order_id, timeout=timeout, policy=policy
         )
 
-    if remark:
-        # 3. 添加解锁备注
-        await add_custom_remark(logger=logger, page=order_detail_po, remark=remark, timeout=timeout)
-
-    # 4. 获取订单操作锁的状态
-    lock_state, lock_btn = await order_detail_po.get_order_lock_state_btn(timeout=timeout)
-    if "强制解锁" in lock_state:
-        if is_force is False:
-            logger.warning(f"订单<{order_id}>，非本账号<{qlv_user_id}>的锁单，暂不处理，即将跳过")
-            return order_detail_po
-        await lock_btn.click(button="left")
-        logger.info(f"订单详情页面，用户操作【{lock_state}】按钮点击完成")
-        try:
-            confirm_btn = await order_detail_po.get_message_notice_dialog_confirm_btn(timeout=1)
-            await confirm_btn.click(button="left")
-            logger.info("订单详情页面，强制解锁弹框确认，【确认】按钮点击完成")
-            await asyncio.sleep(2)
-        except (PlaywrightTimeoutError, PlaywrightError, RuntimeError, Exception):
-            pass
-        logger.warning(f"订单<{order_id}>，已被用户<{qlv_user_id or '无记录'}>强制解锁")
-        # 再次获取订单操作锁的状态
-        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)
-        lock_state_temp = lock_state
-        lock_state, lock_btn = await order_detail_po.get_order_lock_state_btn(timeout=timeout)
-        logger.info(f"订单详情页面，日志记录栏，【{lock_state_temp}】按钮点击完成")
-
-    # 5. 点击【解锁返回】按钮
-    await lock_btn.click(button="left")
-    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
+    # 3. 获取订单操作锁的状态
+    await order_unlock(
+        logger=logger, page=order_detail_po, remark=remark, order_id=order_id, is_force=is_force,
+        qlv_user_id=qlv_user_id, timeout=timeout
     )
 
 
@@ -449,48 +395,39 @@ async def fill_procurement_with_http_callback(
         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(
+    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
+        *, 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, data: Optional[str] = None,
+        cookie_jar: Optional[aiohttp.CookieJar] = None, playwright_state: Dict[str, Any] = None, **kwargs: Any
+) -> Dict[str, Any]:
+    return await _fill_itinerary_with_http(
+        order_id=order_id, qlv_domain=qlv_domain, pid=pid, tid=tid, transaction_id=transaction_id, data=data,
+        itinerary_id=itinerary_id, retry=retry, qlv_protocol=qlv_protocol, timeout=timeout, enable_log=enable_log,
+        cookie_jar=cookie_jar, playwright_state=playwright_state
     )
 
-    # 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("还未填写采购信息，暂时不能回填票号")
+
+async def kick_out_activity_order_with_http(
+        *, 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]:
+    return await _kick_out_activity_order_with_http(
+        order_id=order_id, qlv_domain=domain, qlv_protocol=protocol, retry=retry, timeout=timeout,
+        enable_log=enable_log, cookie_jar=cookie_jar, playwright_state=playwright_state
+    )
+
+
+async def kick_out_activity_orders_with_http(
+        *, order_ids: List[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]:
+    return await _kick_out_activity_orders_with_http(
+        order_ids=order_ids, qlv_domain=domain, qlv_protocol=protocol, retry=retry, timeout=timeout,
+        enable_log=enable_log, cookie_jar=cookie_jar, playwright_state=playwright_state
+    )

qlv_helper/controller/order_table.py

@@ -53,9 +53,10 @@ async def _get_paginated_order_table(
     response = await fetch_page_fn(
         domain=domain, protocol=protocol, retry=retry, timeout=timeout,
         enable_log=enable_log, cookie_jar=cookie_jar, playwright_state=playwright_state,
-        order_http_client=order_http_client, is_end=True
+        order_http_client=order_http_client, is_end=False
     )
     if response.get("code") != 200:
+        await order_http_client.close()
         return response
 
     html = response["data"]
@@ -73,6 +74,7 @@ async def _get_paginated_order_table(
             "pages": 1
         })
         response["data"] = pagination_info
+        await order_http_client.close()
         return response
 
     # --- 3. 多页：并发抓取第 2~pages 页 ---
@@ -82,7 +84,7 @@ async def _get_paginated_order_table(
             resp = await fetch_page_fn(
                 domain=domain, protocol=protocol, retry=retry, timeout=timeout,
                 enable_log=enable_log, cookie_jar=cookie_jar, playwright_state=playwright_state,
-                order_http_client=client, current_page=page, pages=pages, is_end=(page == pages)
+                order_http_client=client, current_page=page, pages=pages, is_end=False
             )
             if resp.get("code") == 200:
                 return parse_order_table(html=resp["data"], table_state=table_state)
@@ -90,16 +92,6 @@ async def _get_paginated_order_table(
             return list()  # 抓取失败则返回空，不影响整体
         return list()
 
-    # 🔥 并发：一口气抓全部分页
-    order_http_client = HttpClientFactory(
-        protocol=protocol if protocol == "http" else "https",
-        domain=domain,
-        timeout=timeout,
-        retry=retry,
-        enable_log=enable_log,
-        cookie_jar=cookie_jar,
-        playwright_state=playwright_state
-    )
     tasks = [fetch_page(client=order_http_client, page=page) for page in range(2, pages + 1)]
     results = await asyncio.gather(*tasks)
 
@@ -116,6 +108,7 @@ async def _get_paginated_order_table(
         "pages": 1
     })
     response["data"] = pagination_info
+    await order_http_client.close()
     return response
 
 

qlv_helper/http/order_page.py

@@ -12,6 +12,7 @@
 import re
 import json
 import aiohttp
+from random import random
 from datetime import datetime
 from urllib.parse import quote
 from bs4 import BeautifulSoup, Tag
@@ -44,46 +45,6 @@ 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,
@@ -138,9 +99,96 @@ async def fill_procurement_dto_with_http(
     )
 
 
-async def fill_itinerary_info_with_http(
+async def fill_remark_with_http(
+        *, remark: str, order_id: int, qlv_protocol: str, qlv_domain: str, 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]:
+    client = HttpClientFactory(
+        protocol=qlv_protocol, domain=qlv_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"
+    }
+    data = f"orderid={order_id}&remark={remark}"
+    return await client.request(
+        method="POST", url="/JPOrderCommon/SaveFreeRemark", headers=headers, is_end=True, data=data.encode("utf-8")
+    )
+
+
+async def update_policy_with_http(
+        *, policy_name: str, order_id: int, qlv_protocol: str, qlv_domain: str, retry: int = 1, timeout: int = 5,
+        enable_log: bool = True, cookie_jar: Optional[aiohttp.CookieJar] = None, old_policy_name: Optional[str] = None,
+        playwright_state: Dict[str, Any] = None,
+) -> Dict[str, Any]:
+    client = HttpClientFactory(
+        protocol=qlv_protocol, domain=qlv_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"
+    }
+    data = f"OrderID={order_id}&PolicyName={policy_name}&OldPolicyName="
+    if old_policy_name is not None:
+        data = f"{data}{old_policy_name}"
+    return await client.request(
+        method="POST", url="/OrderProcessing/EditPolicyName", headers=headers, is_end=True, data=data.encode("utf-8")
+    )
+
+
+async def locked_order_with_http(
+        *, order_id: int, qlv_protocol: str, qlv_domain: str, 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]:
+    client = HttpClientFactory(
+        protocol=qlv_protocol, domain=qlv_domain, timeout=timeout, retry=retry,
+        enable_log=enable_log, cookie_jar=cookie_jar or aiohttp.CookieJar(), playwright_state=playwright_state
+    )
+
+    result = await client.request(method="GET", url=f"/OrderProcessing/Ticket/{order_id}", is_end=True)
+    if "操作提示" in result.get("message", ""):
+        soup = BeautifulSoup(result.get("data"), 'html.parser')
+        h3_tag = soup.find('h3')
+        if h3_tag:
+            text = h3_tag.get_text(strip=True)
+            if text:
+                result["data"] = text
+    return result
+
+
+async def unlock_order_with_http(
+        *, order_id: int, qlv_protocol: str, qlv_domain: str, 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]:
+    client = HttpClientFactory(
+        protocol=qlv_protocol, domain=qlv_domain, timeout=timeout, retry=retry,
+        enable_log=enable_log, cookie_jar=cookie_jar or aiohttp.CookieJar(), playwright_state=playwright_state
+    )
+
+    return await client.request(
+        method="GET", url=f"/OrderProcessing/UnLock/{order_id}?s={random()}", is_end=True
+    )
+
+
+async def forced_unlock_order_with_http(
+        *, order_id: int, qlv_protocol: str, qlv_domain: str, 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]:
+    client = HttpClientFactory(
+        protocol=qlv_protocol, domain=qlv_domain, timeout=timeout, retry=retry,
+        enable_log=enable_log, cookie_jar=cookie_jar or aiohttp.CookieJar(), playwright_state=playwright_state
+    )
+
+    return await client.request(
+        method="GET", url=f"/OrderProcessing/UnLockForce/{order_id}?s={random()}", is_end=True
+    )
+
+
+async def fill_itinerary_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,
+        qlv_protocol: str = "http", timeout: int = 5, enable_log: bool = True, data: Optional[str] = None,
         cookie_jar: Optional[aiohttp.CookieJar] = None, playwright_state: Dict[str, Any] = None
 ) -> Dict[str, Any]:
     client = HttpClientFactory(
@@ -152,13 +200,49 @@ async def fill_itinerary_info_with_http(
         "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}"
+    if not data:
+        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")
     )
 
 
+async def kick_out_activity_order_with_http(
+        *, order_id: int, qlv_protocol: str, qlv_domain: str, 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]:
+    client = HttpClientFactory(
+        protocol=qlv_protocol, domain=qlv_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"
+    }
+    data = f"ID={order_id}"
+    return await client.request(
+        method="POST", url=f"/OrderList/KickOutActivityOrders", is_end=True, data=data.encode("utf-8"), headers=headers
+    )
+
+
+async def kick_out_activity_orders_with_http(
+        *, order_ids: List[int], qlv_protocol: str, qlv_domain: str, 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]:
+    client = HttpClientFactory(
+        protocol=qlv_protocol, domain=qlv_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"
+    }
+    order_ids_str = ",".join(str(id) for id in order_ids) + ","
+    data = f"OrderIDS={order_ids_str}"
+    return await client.request(
+        method="POST", url=f"/OrderList/YJTCActivityOrders", is_end=True, data=data.encode("utf-8"), headers=headers
+    )
+
+
 def order_info_static_headers() -> OrderedDict[str, str]:
     return OrderedDict([
         ("receipted_ota", "OTA实收"),  # 0

qlv_helper/po/order_detail_page.py

@@ -263,7 +263,7 @@ class OrderDetailPage(BasePo):
         :return: (是否存在, 错误信息|元素对象)
         """
         selector: str = '//a[@id="alertMsg_btnConfirm"]/cite'
-        return await self.get_locator(selector=selector, timeout=timeout)
+        return await self.get_locator(selector=selector, timeout=timeout, strict=False)
 
     async def get_policy_input(self, timeout: float = 5.0) -> Locator:
         """
@@ -290,3 +290,31 @@ class OrderDetailPage(BasePo):
             if transaction_id:
                 transaction_ids.append(transaction_id.strip())
         return transaction_ids
+
+    async def get_relation_order_detail_link(self, timeout: float = 5.0) -> Locator:
+        """
+        获取关联订单的详情链接
+        :param timeout: 超时时间
+        :return:
+        """
+        selector: str = 'xpath=//span[contains(text(), "关联订单")]/../a'
+        return await self.get_locator(selector=selector, timeout=timeout)
+
+    async def get_message_alert(self, timeout: float = 5.0) -> Locator:
+        """
+        获取详情页面消息弹框
+        :param timeout: 超时时长
+        :return:
+        """
+        selector: str = 'xpath=//a[@id="alertMsg_btnConfirm"]/cite/../..'
+        return await self.get_locator(selector=selector, timeout=timeout)
+
+    async def get_message_content(self, timeout: float = 5.0) -> str:
+        """
+        获取详情页面消息弹框
+        :param timeout: 超时时长
+        :return:
+        """
+        selector: str = 'xpath=//a[@id="alertMsg_btnConfirm"]/cite/../../p'
+        locator = await self.get_locator(selector=selector, timeout=timeout)
+        return (await locator.inner_text()).strip()