ey-commerce-lib 1.0.21__tar.gz → 1.0.23__tar.gz

{ey_commerce_lib-1.0.21 → ey_commerce_lib-1.0.23}/PKG-INFO

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

{ey_commerce_lib-1.0.21 → ey_commerce_lib-1.0.23}/pyproject.toml

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

{ey_commerce_lib-1.0.21 → ey_commerce_lib-1.0.23}/src/ey_commerce_lib/dxm/main.py

@@ -1,5 +1,4 @@
 import asyncio
-import time
 import traceback
 
 from httpx import AsyncClient, Timeout
@@ -8,6 +7,7 @@ from playwright.async_api import async_playwright
 from ey_commerce_lib.dxm.constant.order import DxmOrderRuleType
 from ey_commerce_lib.dxm.parser.common import get_page_info, get_purchase_pagination_info, get_tracking_page_info
 from ey_commerce_lib.dxm.parser.count import parse_count
+from ey_commerce_lib.dxm.parser.export_template import parse_list_export_template
 from ey_commerce_lib.dxm.parser.order import list_order_base_by_html, list_order_rule, get_rule_detail, \
     get_order_detail_by_html, parse_comm_search_list_html_get_authid_dict
 from ey_commerce_lib.dxm.parser.purchase import list_purchasing_all, list_1688_purchase_order_number, \
@@ -17,6 +17,7 @@ from ey_commerce_lib.dxm.parser.warehouse import list_warehouse_product
 from ey_commerce_lib.dxm.schemas.common import Page
 from ey_commerce_lib.dxm.schemas.dxm_commodity_product import ViewDxmCommodityProductResponse
 from ey_commerce_lib.dxm.schemas.ebay_product import DxmEbayProductModel
+from ey_commerce_lib.dxm.schemas.export_package import ExportPackageOrderModel
 from ey_commerce_lib.dxm.schemas.order import DxmOrderSearchForm, DxmJsonResponse, DxmCheckProcessResponse, DxmOrderRule
 from ey_commerce_lib.dxm.schemas.tracking import TrackingPageListQuery, TrackingPageListItem
 from ey_commerce_lib.dxm.schemas.warehouse import WarehouseProduct, WarehouseProductQuery, PurchasingAllQuery
@@ -879,6 +880,53 @@ class DxmClient:
             comm_search_list_html = response.text
             return parse_comm_search_list_html_get_authid_dict(comm_search_list_html, keyword)
 
+    async def export_template_get_by_id_json(self, id_str: str):
+        """
+        根据id获取导出模板配置
+        :param id_str: 模板id
+        :return:
+        """
+        async with self.__sem:
+            response = await self.__async_client.post('/exportTemplate/getById.json', data={
+                'id': id_str
+            })
+            return response.json()
+
+    async def list_export_template(self):
+        """
+        获取导出模板的列表
+        :return:
+        """
+        async with self.__sem:
+            response = await self.__async_client.post('/exportTemplate/index.htm')
+            return parse_list_export_template(response.text)
+
+    async def export_package_order(self, data: ExportPackageOrderModel):
+        """
+        导出包裹订单
+        :param data: 导出参数模型类
+        :return:
+        """
+        async with self.__sem:
+            response = await self.__async_client.post('order/exportPackageOrder.json',
+                                                      data=data.model_dump(by_alias=True))
+            uuid = response.json().get('uuid')
+            if not uuid:
+                raise Exception('导出失败')
+            code = 0
+            msg = ''
+            # 如果导出状态没有完成就一直循环
+            while code == 0:
+                check_process_res = await self.__check_process(uuid)
+                code = check_process_res.get('processMsg').get('code')
+                msg = check_process_res.get('processMsg').get('msg')
+                print(f'导出中,{check_process_res}')
+                await asyncio.sleep(5)
+            # code为1代表导出成功
+            if code != 1:
+                raise Exception(f'导出失败，失败原因:{msg}')
+            return msg
+
     async def __aenter__(self):
         return self
 

ey_commerce_lib-1.0.23/src/ey_commerce_lib/dxm/parser/export_template.py

@@ -0,0 +1,17 @@
+from lxml import html
+
+
+def parse_list_export_template(html_content: str):
+    tree = html.fromstring(html_content)
+    export_template_element_list = tree.xpath('//div[@class="page-list no-page"]/table[@class="in-table"]/tbody/tr')
+    export_template_list = []
+    for export_template_element in export_template_element_list:
+        template_id = export_template_element.xpath('@id')[0].replace('tr', '')
+        template_name = export_template_element.xpath('./td[1]/text()')[0].strip()
+        field_str = export_template_element.xpath('./td[2]/text()')[0].strip()
+        export_template_list.append({
+            'template_id': template_id,
+            'template_name': template_name,
+            'field_str': field_str
+        })
+    return export_template_list

ey_commerce_lib-1.0.23/src/ey_commerce_lib/dxm/schemas/export_package.py

@@ -0,0 +1,23 @@
+from typing import Optional
+
+from pydantic import BaseModel, Field, ConfigDict
+
+
+class ExportPackageOrderModel(BaseModel):
+    template_id: str = Field(alias="templateId", description="模板ID")
+    package_ids: str = Field("", alias="packageIds", description="packageId使用,号连接")
+    export_keys: str = Field(alias="exportKeys", description="导出字段, 需要使用urllib.parse.quote编码")
+    order_field: str = Field('order_create_time', alias="orderField", description="固定值不用管")
+    state: str = Field("", alias="state", description="订单状态")
+    start_time: str = Field("", alias="startTime", description="开始时间")
+    end_time: str = Field("", alias="endTime", description="结束时间")
+    time_type: str = Field("", alias="timeType", description="时间类型 2(发货时间) 0(付款时间) 1(下单时间)")
+    export_style: str = Field("1", alias="exportStyle", description="按包裹导出(1) 按订单导出(0) 按产品导出(2)")
+    history: str = Field("", alias="history", description="120天订单('') 历史订单('all')")
+    is_voided: str = Field("-1", alias="isVoided")
+    rule_id: str = Field("-1", alias="ruleId")
+    sysrule: str = Field("", alias="sysrule")
+    request_location: str = Field('0', alias="requestLocation", description="页面上pageTag的值(一般不用管0)")
+    is_search: str = Field('1', alias="isSearch")
+
+    model_config = ConfigDict(populate_by_name=True)

{ey_commerce_lib-1.0.21 → ey_commerce_lib-1.0.23}/src/ey_commerce_lib/four_seller/main.py

@@ -4,7 +4,7 @@ import logging
 from typing import Callable
 
 import ddddocr
-from httpx import AsyncClient, ReadTimeout
+from httpx import AsyncClient, ReadTimeout, Timeout
 from playwright.async_api import async_playwright, TimeoutError
 
 from ey_commerce_lib.four_seller.constant.response import ResponseCodeEnum
@@ -37,13 +37,14 @@ class FourSellerClient:
         self.__login_in_progress = None
         # ddddocr实例
         self.__ocr = ddddocr.DdddOcr()
+        timeout = Timeout(connect=60.0, read=60.0, write=60.0, pool=30.0)
         # 异步客户端
         self.__async_client = AsyncClient(base_url="https://www.4seller.com", cookies={"userToken": user_token},
                                           headers={
                                               "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
                                                             "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/137.0.0.0 "
                                                             "Safari/537.36"
-                                          })
+                                          }, timeout=timeout)
 
     async def __auto_login_4seller(self) -> str:
         """

{ey_commerce_lib-1.0.21 → ey_commerce_lib-1.0.23}/src/ey_commerce_lib/takesend/main.py

@@ -9,7 +9,9 @@ class TakeSendClient(object):
         timeout = Timeout(connect=60.0, read=60.0, write=60.0, pool=30.0)
         self.__async_client = AsyncClient(
             base_url="http://k5.takesend.com:8180",
-            timeout=timeout)
+            timeout=timeout,
+            verify=False
+        )
         self.__username = username
         self.__password = password
 
@@ -18,9 +20,9 @@ class TakeSendClient(object):
         自动登录
         :return:
         """
-        # 1. 先访问首页更新JESSIONID
+        # 访问首页
         await self.__async_client.get("/c_index.jsp")
-        # 2.在登录
+        # 登录
         params = {
             'action': 'logon'
         }
@@ -28,9 +30,10 @@ class TakeSendClient(object):
             'userid': self.__username,
             'password': self.__password
         }
-        await self.__async_client.post("//client/Logon", params=params, data=data, headers=LOGIN_HEADERS)
+        # 请求登录接口
+        await self.__async_client.post(".//client/Logon", params=params, data=data, headers=LOGIN_HEADERS)
 
-    async def client_cc_order(self, excel_data: list):
+    async def client_cc_order(self, excel_data: list | str):
         """
         修改泰嘉产品上传重量数据
         :param excel_data:
@@ -43,7 +46,9 @@ class TakeSendClient(object):
         data = {
             'excel[]': excel_data,
         }
-        return await self.__async_client.post("/Client/CCOrder", params=params, data=data, headers=EDIT_HEADERS)
+
+        response = await self.__async_client.post('/Client/CCOrder', params=params, data=data, headers=EDIT_HEADERS)
+        return response.json()
 
     async def __aenter__(self):
         return self

{ey_commerce_lib-1.0.21 → ey_commerce_lib-1.0.23}/tests/dxm/test_purchase.py

@@ -1,4 +1,5 @@
 import json
+import urllib.parse
 
 import pytest
 
@@ -6,6 +7,7 @@ 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_OUT_OF_STOCK_BASE_FORM, ORDER_SEARCH_HAVE_GOODS_BASE_FORM
 from ey_commerce_lib.dxm.main import DxmClient
+from ey_commerce_lib.dxm.schemas.export_package import ExportPackageOrderModel
 from ey_commerce_lib.dxm.schemas.order import DxmOrderSearchForm
 from ey_commerce_lib.dxm.schemas.tracking import TrackingPageListQuery
 from ey_commerce_lib.dxm.schemas.warehouse import WarehouseProductQuery
@@ -24,7 +26,6 @@ async def login_success(user_token: str):
 
 @pytest.mark.asyncio
 async def test_auto_login_4seller():
-    # user_token = await auto_login_4seller(user_name="sky@eeyoung.com", password="ey010203@@")
     # print(user_token)
     async with FourSellerClient(
             user_name="xxxxx",
@@ -52,11 +53,27 @@ async def test_dxm_api():
         #         print(pair_info.get('proid'))
         # data = await dxm_client.update_dxm_commodity_front_sku('17773195771232287', 'fuck112')
         # data = await dxm_client.get_authid_like_keyword('泰嘉')
-        data = await dxm_client.list_order_base_async(query=DxmOrderSearchForm(
-            search_types='trackNum',
-            contents='36QT4109377801000931506'
-        ))
-        print(data)
+        data = await dxm_client.list_export_template()
+        for item in data:
+            if item.get('template_name') == '周报订单导出模板':
+                template_json = await dxm_client.export_template_get_by_id_json(id_str=item.get('template_id'))
+                template_id = template_json.get('template').get('id')
+                template_field = template_json.get('template').get('templateField')
+                url = await dxm_client.export_package_order(ExportPackageOrderModel(
+                    # 模板id
+                    template_id=f'{template_id}',
+                    # 导出字段
+                    export_keys=urllib.parse.quote(template_field),
+                    # 按包裹导出
+                    export_type='1',
+                    # 发货时间
+                    time_type='2',
+                    # 已发货
+                    state='shipped',
+                    start_time='2025-08-06 00:00:00',
+                    end_time='2025-08-12 23:59:59'
+                ))
+                print(f'导出成功,url={url}')
 
 
 @pytest.mark.asyncio

ey_commerce_lib-1.0.21/src/ey_commerce_lib/dxm/order.py

@@ -1,2 +0,0 @@
-async def page_order():
-    pass