ey-commerce-lib 1.0.1__tar.gz → 1.0.3__tar.gz

{ey_commerce_lib-1.0.1 → ey_commerce_lib-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ey-commerce-lib
-Version: 1.0.1
+Version: 1.0.3
 Summary: eeyoung电商客户端调用封装
 Author-email: 饶奇奇 <1124393197@qq.com>
 Requires-Python: >=3.10

{ey_commerce_lib-1.0.1 → ey_commerce_lib-1.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ey-commerce-lib"
-version = "1.0.1"
+version = "1.0.3"
 description = "eeyoung电商客户端调用封装"
 readme = "README.md"
 authors = [

{ey_commerce_lib-1.0.1 → ey_commerce_lib-1.0.3}/src/ey_commerce_lib/dxm/parser/order.py

@@ -165,9 +165,9 @@ def list_order_base_by_html(html_str: str) -> list[dict]:
                 logistics_info['logistics'] = logistics
         # 状态
         if has_logistics:
-            status = order_first_element.xpath('.//td[7]/text()')[0].strip()
+            status = get_str_list_first_not_blank_or_none(order_first_element.xpath('.//td[7]/text()'))
         else:
-            status = order_first_element.xpath('.//td[6]/text()')[0].strip()
+            status = get_str_list_first_not_blank_or_none(order_first_element.xpath('.//td[6]/text()'))
         # 整理订单
         if len(order_element_list) > 1:
             # 合并单
@@ -201,9 +201,11 @@ def list_order_rule(html_str: str):
     for rule_element in rule_element_list:
         rule_id = rule_element.xpath('./td[1]/input/@data-id')[0]
         rule_name = rule_element.xpath('./td[2]/text()')[0]
+        status = rule_element.xpath('./td[5]/span/text()')[0]
         rule_list.append({
             'rule_id': rule_id,
-            'rule_name': rule_name
+            'rule_name': rule_name,
+            'status': status
         })
     return rule_list
 

ey_commerce_lib-1.0.1/tests/dxm/test_order.py

@@ -1,57 +0,0 @@
-import json
-
-import pytest
-
-from ey_commerce_lib.dxm.constant.order import ORDER_SEARCH_APPROVAL_BASE_FORM, \
-    ORDER_SEARCH_PENDING_PROCESSING_BASE_FORM, ORDER_SEARCH_SELF_WAREHOUSE_BASE_FORM, \
-    ORDER_SEARCH_OVERSEA_WAREHOUSE_BASE_FORM, ORDER_SEARCH_HAVE_GOODS_BASE_FORM, ORDER_SEARCH_OUT_OF_STOCK_BASE_FORM, \
-    ORDER_SEARCH_DELIVERY_FAILURE_BASE_FORM, ORDER_SEARCH_DELIVERY_SUCCESS_BASE_FORM, DxmOrderRuleType
-from ey_commerce_lib.dxm.main import DxmClient
-from ey_commerce_lib.dxm.schemas.order import DxmOrderSearchForm
-from ey_commerce_lib.dxm.schemas.warehouse import WarehouseProductQuery, PurchasingAllQuery
-
-cookies = {
-    'dxm_i': 'MTAyNzg5NiFhVDB4TURJM09EazIhZjc5ZTMxMjZmN2Q3NTk5OGZlMDg4YjQzNzNlNzlmOWY',
-    'dxm_t': 'MTcxNDk2NDU4MiFkRDB4TnpFME9UWTBOVGd5IWIzZWRjYTc3YTdjYWE0MmIxMWYwNjFhOTlmMDgxZjY5',
-    'dxm_c': 'TWVOMVpiclYhWXoxTlpVNHhXbUp5VmchNmM5MmM5ODc1MDBkODVjOWJmOTFlMzdhNGJiNWI3Njk',
-    'dxm_w': 'ZDc3NWVhOTdkOTEyNGE4ZmRkODBmYzc2YmFlOGVjZjEhZHoxa056YzFaV0U1TjJRNU1USTBZVGhtWkdRNE1HWmpOelppWVdVNFpXTm1NUSFmZWZiZGZiMTEwMzhlN2M4M2MzYjZmYjAxYTcxMjViMw',
-    'dxm_s': 'aMHO7LWKAQe6NzFrV3O4cceXkBriLGNmwondOR7INWs',
-    'MYJ_MKTG_fapsc5t4tc': 'JTdCJTdE',
-    'MYJ_fapsc5t4tc': 'JTdCJTIyZGV2aWNlSWQlMjIlM0ElMjJkMGRlYzNkYi00MTNlLTQyZjktOWIxNC0xYzBhZTY4MTk4ZmIlMjIlMkMlMjJ1c2VySWQlMjIlM0ElMjIxMDI3ODk2JTIyJTJDJTIycGFyZW50SWQlMjIlM0ElMjIyNTg2MzQlMjIlMkMlMjJzZXNzaW9uSWQlMjIlM0ExNzMxMDU5MDc1MjU0JTJDJTIyb3B0T3V0JTIyJTNBZmFsc2UlMkMlMjJsYXN0RXZlbnRUaW1lJTIyJTNBMTczMTA1OTA3NTQyNCUyQyUyMmxhc3RFdmVudElkJTIyJTNBMTE2JTdE',
-    'MYJ_fapsc5t4tc': 'JTdCJTIyZGV2aWNlSWQlMjIlM0ElMjJkMGRlYzNkYi00MTNlLTQyZjktOWIxNC0xYzBhZTY4MTk4ZmIlMjIlMkMlMjJ1c2VySWQlMjIlM0ElMjIxMDI3ODk2JTIyJTJDJTIycGFyZW50SWQlMjIlM0ElMjIyNTg2MzQlMjIlMkMlMjJzZXNzaW9uSWQlMjIlM0ExNzMxMDU5MDc1MTEwJTJDJTIyb3B0T3V0JTIyJTNBZmFsc2UlMkMlMjJsYXN0RXZlbnRUaW1lJTIyJTNBMTczMTA1OTA3NTk5NiUyQyUyMmxhc3RFdmVudElkJTIyJTNBMTE2JTdE',
-    '_dxm_ad_client_id': '7AEFA0B78CE1B35075D391C5226612CED',
-    'Hm_lvt_f8001a3f3d9bf5923f780580eb550c0b': '1731459796,1731547149,1731590878,1731893161',
-    'HMACCOUNT': 'F266E8F609D8D8B1',
-    'MYJ_fapsc5t4tc': 'JTdCJTIyZGV2aWNlSWQlMjIlM0ElMjJkMGRlYzNkYi00MTNlLTQyZjktOWIxNC0xYzBhZTY4MTk4ZmIlMjIlMkMlMjJ1c2VySWQlMjIlM0ElMjIxMDI3ODk2JTIyJTJDJTIycGFyZW50SWQlMjIlM0ElMjIyNTg2MzQlMjIlMkMlMjJzZXNzaW9uSWQlMjIlM0ExNzMxOTAxNDMzMTk3JTJDJTIyb3B0T3V0JTIyJTNBZmFsc2UlMkMlMjJsYXN0RXZlbnRJZCUyMiUzQTExNiU3RA==',
-    'Hm_lpvt_f8001a3f3d9bf5923f780580eb550c0b': '1731901433',
-    'JSESSIONID': 'CD9C8372185D453012E5EEFBA64E2C9C',
-}
-
-headers = {
-    'accept': 'text/html, */*; q=0.01',
-    'accept-language': 'zh-CN,zh;q=0.9',
-    'cache-control': 'no-cache',
-    'content-type': 'application/x-www-form-urlencoded; charset=UTF-8',
-    'origin': 'https://www.dianxiaomi.com',
-    'pragma': 'no-cache',
-    'priority': 'u=1, i',
-    'referer': 'https://www.dianxiaomi.com/sys/index.htm?go=m420',
-    'sec-ch-ua': '"Google Chrome";v="131", "Chromium";v="131", "Not_A Brand";v="24"',
-    'sec-ch-ua-mobile': '?0',
-    'sec-ch-ua-platform': '"Windows"',
-    'sec-fetch-dest': 'empty',
-    'sec-fetch-mode': 'cors',
-    'sec-fetch-site': 'same-origin',
-    'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
-    'x-requested-with': 'XMLHttpRequest',
-}
-
-
-# XM7WJA451012,XM7WJA451092,XM7WJA451089
-@pytest.mark.asyncio
-async def test_order():
-    async with DxmClient(cookies=cookies, headers=headers) as dxm:
-        data = await dxm.list_order_detail_async(ORDER_SEARCH_SELF_WAREHOUSE_BASE_FORM)
-        for item in data:
-            print(item)
-        # print(await dxm.get_warehouse_dict())