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

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

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

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

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

{ey_commerce_lib-1.0.23 → ey_commerce_lib-1.0.24}/src/ey_commerce_lib/takesend/config.py

@@ -23,4 +23,17 @@ EDIT_HEADERS = {
     'Referer': 'http://k5.takesend.com:8180/client/Logon?action=initMenu',
     'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36',
     'X-Requested-With': 'XMLHttpRequest',
-}
+}
+
+LIST_HEADS = {
+    'Accept': '*/*',
+    'Accept-Language': 'zh-CN,zh;q=0.9',
+    'Cache-Control': 'no-cache',
+    'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
+    'Origin': 'http://k5.takesend.com:8180',
+    'Pragma': 'no-cache',
+    'Proxy-Connection': 'keep-alive',
+    'Referer': 'http://k5.takesend.com:8180/client/Logon?action=initMenu',
+    'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/141.0.0.0 Safari/537.36',
+    'X-Requested-With': 'XMLHttpRequest',
+}

ey_commerce_lib-1.0.24/src/ey_commerce_lib/takesend/main.py

@@ -0,0 +1,117 @@
+from httpx import AsyncClient, Timeout
+
+from ey_commerce_lib.takesend.config import LOGIN_HEADERS, EDIT_HEADERS, LIST_HEADS
+from ey_commerce_lib.takesend.parser.order import get_order_page, get_order_track_number_list
+
+
+class TakeSendClient(object):
+
+    def __init__(self, username: str, password: str):
+        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,
+            verify=False
+        )
+        self.__username = username
+        self.__password = password
+
+    async def login(self):
+        """
+        自动登录
+        :return:
+        """
+        # 访问首页
+        await self.__async_client.get("/c_index.jsp")
+        # 登录
+        params = {
+            'action': 'logon'
+        }
+        data = {
+            'userid': self.__username,
+            'password': self.__password
+        }
+        # 请求登录接口
+        await self.__async_client.post(".//client/Logon", params=params, data=data, headers=LOGIN_HEADERS)
+
+    async def client_cc_order(self, excel_data: list | str):
+        """
+        修改泰嘉产品上传重量数据
+        :param excel_data:
+        :return:
+        """
+
+        params = {
+            'action': 'updateDweight',
+        }
+        data = {
+            'excel[]': excel_data,
+        }
+
+        response = await self.__async_client.post('/Client/CCOrder', params=params, data=data, headers=EDIT_HEADERS)
+        return response.json()
+
+    async def client_cc_order_list_by_pre_date(self, pageNum: int, pageSize: int, begeditdate: str, endeditdate: str):
+        """
+        泰嘉已预报根据制单日期查询全部订单
+        :param pageNum:
+        :param pageSize:
+        :param begeditdate: 制单日期开始
+        :param endeditdate: 制单日期结束
+        :return:
+        """
+
+        # 访问首页刷新token
+        await self.__async_client.get('/client/Logon?action=initMenu')
+        params = {
+            'action': 'list',
+        }
+        data = {
+            'flag': '3',
+            'pageNum1': '1',
+            'numPerPage': '200',
+            'orderField': '1',
+            'orderDirection': 'asc',
+            'corpbillid': '',
+            'channelid': '',
+            'orgLookup.country': '',
+            'orgLookup.chinese': '',
+            'printnum': '',
+            'ordertype': 'CORDER',
+            'buyerid': '',
+            'mbflag': '',
+            'houseid': '',
+            'begeditdate': '2025-10-24 00:00:00',
+            'endeditdate': '2025-10-24 23:50:50',
+        }
+        response = await self.__async_client.post('/Client/CCOrder', params=params, data=data)
+        return response.text
+
+    async def list_track_number_client_cc_order_list_by_pre_date(self, begeditdate: str, endeditdate: str):
+        """
+        泰嘉已预报根据制单日期查询全部订单
+        :param begeditdate:
+        :param endeditdate:
+        :return:
+        """
+        # 遍历页码
+        page_info = get_order_page(
+            await self.client_cc_order_list_by_pre_date(pageNum=1, pageSize=200, begeditdate=begeditdate,
+                                                        endeditdate=endeditdate))
+        total = page_info['total']
+        # 计算总页数
+        total_page = total // 200 + 1
+        track_number_list = []
+        for page in range(1, total_page + 1):
+            # 获取订单列表
+            page_html = await self.client_cc_order_list_by_pre_date(pageNum=page, pageSize=200, begeditdate=begeditdate,
+                                                                    endeditdate=endeditdate)
+            # 解析
+            track_number_list.extend(get_order_track_number_list(page_html))
+        return track_number_list
+
+    async def __aenter__(self):
+        return self
+
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        await self.__async_client.aclose()

ey_commerce_lib-1.0.24/src/ey_commerce_lib/takesend/parser/order.py

@@ -0,0 +1,20 @@
+from lxml import html
+
+
+def get_order_track_number_list(html_str: str):
+    tree = html.fromstring(html_str)
+    track_number_element_list = tree.xpath('//div[@class="pageContent"]//tbody/tr[@target="sid_serialid"]/td[4]/text()')
+    track_number_list = []
+    for track_number_element in track_number_element_list:
+        track_number = track_number_element.strip()
+        if track_number:
+            track_number_list.append(track_number)
+    return track_number_list
+
+
+def get_order_page(html_str: str):
+    tree = html.fromstring(html_str)
+    return {
+        'total': int(tree.xpath('//div[@class="pagination"]/@totalcount')[0]),
+        'page_size': int(tree.xpath('//div[@class="pagination"]/@numperpage')[0])
+    }

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

@@ -17,6 +17,7 @@ from ey_commerce_lib.four_seller.main import FourSellerClient
 from ey_commerce_lib.four_seller.schemas.query.order import FourSellerOrderQueryModel
 from ey_commerce_lib.takesend.main import TakeSendClient
 import ey_commerce_lib.dxm.utils.dxm_commodity_product as dxm_commodity_product_util
+from ey_commerce_lib.takesend.parser.order import get_order_track_number_list
 
 
 async def login_success(user_token: str):
@@ -27,12 +28,8 @@ async def login_success(user_token: str):
 @pytest.mark.asyncio
 async def test_auto_login_4seller():
     # print(user_token)
-    async with FourSellerClient(
-            user_name="xxxxx",
-            password="xxxxxx",
-            login_success_call_back=login_success,
-            user_token="xxxxxx") as four_seller_client:
-        await four_seller_client.list_history_order(FourSellerOrderQueryModel())
+    pass
+
 
 
 cookies = {

ey_commerce_lib-1.0.23/src/ey_commerce_lib/takesend/main.py

@@ -1,57 +0,0 @@
-from httpx import AsyncClient, Timeout
-
-from ey_commerce_lib.takesend.config import LOGIN_HEADERS, EDIT_HEADERS
-
-
-class TakeSendClient(object):
-
-    def __init__(self, username: str, password: str):
-        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,
-            verify=False
-        )
-        self.__username = username
-        self.__password = password
-
-    async def login(self):
-        """
-        自动登录
-        :return:
-        """
-        # 访问首页
-        await self.__async_client.get("/c_index.jsp")
-        # 登录
-        params = {
-            'action': 'logon'
-        }
-        data = {
-            'userid': self.__username,
-            'password': self.__password
-        }
-        # 请求登录接口
-        await self.__async_client.post(".//client/Logon", params=params, data=data, headers=LOGIN_HEADERS)
-
-    async def client_cc_order(self, excel_data: list | str):
-        """
-        修改泰嘉产品上传重量数据
-        :param excel_data:
-        :return:
-        """
-
-        params = {
-            'action': 'updateDweight',
-        }
-        data = {
-            'excel[]': excel_data,
-        }
-
-        response = await self.__async_client.post('/Client/CCOrder', params=params, data=data, headers=EDIT_HEADERS)
-        return response.json()
-
-    async def __aenter__(self):
-        return self
-
-    async def __aexit__(self, exc_type, exc_val, exc_tb):
-        await self.__async_client.aclose()