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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python_qlv_helper
-Version: 0.5.7
+Version: 0.6.0
 Summary: qlv helper python package
 Author-email: ckf10000 <ckf10000@sina.com>
 License:                                  Apache License

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

@@ -1,4 +1,4 @@
-python_qlv_helper-0.5.7.dist-info/licenses/LICENSE,sha256=WtjCEwlcVzkh1ziO35P2qfVEkLjr87Flro7xlHz3CEY,11556
+python_qlv_helper-0.6.0.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,12 +6,12 @@ qlv_helper/config/url_const.py,sha256=PbKKKH4heqP6SO186MTt-CEpf-Ix5ODlLQ2Aq2ZBZh
 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_detail.py,sha256=PjBS1YmiRzWaXg0brJef96k0-0uLr6oaEYz5zZzpjoo,22675
 qlv_helper/controller/order_table.py,sha256=4AgA9EO0_GVuwnW3ltXPoN74U_6YpOqkRJVdeLb6L1o,6082
 qlv_helper/controller/user_login.py,sha256=iyyDbOREsXtV5bqAFeXGwurvcCmDHmquh6ReWCfnOBE,5281
 qlv_helper/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=uhCnRPvIvSg5ACMCfpw5_Z62iAAw-Dm-yDRloe5QBP8,16934
 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
@@ -29,7 +29,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.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.6.0.dist-info/METADATA,sha256=cG17GIsXVxDMdh92lqvgtJKpMI4Qn1dNjgtTrQbZMjc,14853
+python_qlv_helper-0.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+python_qlv_helper-0.6.0.dist-info/top_level.txt,sha256=0pYdhD8SfBcC57LzLYGHY7cwwPqdqAkB1twysCJh5OA,11
+python_qlv_helper-0.6.0.dist-info/RECORD,,

qlv_helper/controller/order_detail.py

@@ -16,7 +16,8 @@ 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 qlv_helper.http.order_page import parser_order_info, get_order_page_html, parser_order_flight_table, \
+    fill_procurement_info_with_http
 from playwright.async_api import Page, Locator, Error as PlaywrightError, TimeoutError as PlaywrightTimeoutError
 
 
@@ -95,7 +96,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 +136,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 +318,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 +334,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 +414,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 +427,17 @@ 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
+) -> 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
+    )

qlv_helper/http/order_page.py

@@ -10,8 +10,10 @@
 # ---------------------------------------------------------------------------------------------------------
 """
 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
@@ -22,8 +24,8 @@ from qlv_helper.utils.type_utils import get_key_by_index, get_value_by_index, sa
 
 
 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 +43,47 @@ 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")
+    )
+
+
 def order_info_static_headers() -> OrderedDict[str, str]:
     return OrderedDict([
         ("receipted_ota", "OTA实收"),  # 0
@@ -154,6 +197,8 @@ def flight_extend_headers() -> OrderedDict[str, str]:
         ("id_valid_dat", " 证件有效期"),  # 9
         ("code_dep", " 起飞机场"),  # 10
         ("code_arr", " 抵达机场"),  # 11
+        ("pid", "乘客ID"),  # 12
+        ("fid", "航段ID"),  # 13
     ])
 
 
@@ -269,7 +314,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 +337,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 +350,7 @@ 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"]}
     for idx, td in enumerate(tds):
         if idx >= len(headers):
             continue
@@ -303,6 +364,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 +382,6 @@ def parse_order_flight_table_row(
                 values[key] = raw
             else:
                 values[key] = safe_convert_advanced(raw)
-
     return values
 
 
@@ -326,6 +394,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 +403,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