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

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

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

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

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

{ey_commerce_lib-1.0.24 → ey_commerce_lib-1.0.25}/src/ey_commerce_lib/dxm/main.py

@@ -8,8 +8,8 @@ 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.order import list_order_rule, get_rule_detail, \
+    parse_comm_search_list_html_get_authid_dict
 from ey_commerce_lib.dxm.parser.purchase import list_purchasing_all, list_1688_purchase_order_number, \
     list_wait_pay_page_purchase_order_number
 from ey_commerce_lib.dxm.parser.tracking import parse_tracking_page
@@ -34,78 +34,111 @@ class DxmClient:
         self.__async_client = AsyncClient(base_url=self.__base_url, cookies=cookies, headers=headers,
                                           timeout=timeout)
 
-    async def page_order_base_async(self, query: DxmOrderSearchForm):
+    async def package_advanced_search_api(self, query: DxmOrderSearchForm):
         """
-        条件分页查询订单基础信息
+        条件店小秘订单高级搜索api
         :param query:
         :return:
         """
         # 查询分页数据
-        data = await self.__async_client.post("/package/advancedSearch.htm", data=query.model_dump(by_alias=True))
+        package_advanced_search_res = await self.__async_client.post("/api/package/advancedSearch.json",
+                                                                     data=query.model_dump(by_alias=True))
+        package_advanced_search_data = package_advanced_search_res.json()
+        if package_advanced_search_data.get('code') != 0:
+            raise Exception('店小秘订单高级查询接口失败')
         # 获取分页信息
-        page_info = get_page_info(data.text)
-        data = list_order_base_by_html(data.text)
-        return {
-            **page_info,
-            'data': data
-        }
+        return package_advanced_search_data
 
-    async def list_order_base_async(self, query: DxmOrderSearchForm):
+    async def package_advanced_search_list(self, query: DxmOrderSearchForm):
         """
-        条件查询订单信息列表
+        条件店小秘订单高级搜索分页数据列表(根据条件将page中的list进行汇总)
         :return:
         """
         query.page_no = 1
-        data = await self.page_order_base_async(query)
-        total_page = data['total_page']
-        result = data['data']
+        package_advanced_search_data = await self.package_advanced_search_api(query)
+        total_page = package_advanced_search_data.get('data', {}).get('page', {}).get('totalPage')
+        package_advanced_search_data_list = package_advanced_search_data.get('data', {}).get('page', {}).get('list', [])
         for page_number in range(2, total_page + 1):
+            # 更改条件查询的页码
             query.page_no = page_number
-            data = await self.page_order_base_async(query)
-            result.extend(data['data'])
-        return result
+            # 调用api获取分页数据
+            page_package_advanced_search_data = await self.package_advanced_search_api(query)
+            # 获取每一页的数据,没有获取到则为空数组
+            page_package_advanced_search_data_list = (page_package_advanced_search_data.get('data', {})
+                                                      .get('page', {}).get('list', []))
+            # 合并每一页的数据
+            package_advanced_search_data_list.extend(page_package_advanced_search_data_list)
+        return package_advanced_search_data_list
+
+    async def package_advanced_search_with_detail(self, query: DxmOrderSearchForm):
+        """
+        条件店小秘订单高级搜索分页数据(带详情)
+        :param query:
+        :return:
+        """
 
-    async def page_order_detail_async(self, query: DxmOrderSearchForm):
-        async def set_detail(order_base: dict):
+        async def set_detail(pkg: dict):
             """
-            设置详情
-            :param order_base:
+            将包裹详情数据注入到订单高级查询数据中
+            :param pkg:每一条包裹
             :return:
             """
-            order_base['detail'] = await self.package_detail(order_base['package_id'])
+            pkg['withDetail'] = await self.package_detail_json_api(pkg.get('id'))
 
         # 获取基本分页数据信息
-        page_base_order = await self.page_order_base_async(query)
+        package_advanced_search_data = await self.package_advanced_search_api(query)
         # 获取并设置详情信息
         await asyncio.gather(*[
-            set_detail(item)
-            for item in page_base_order['data']])
+            set_detail(pkg)
+            for pkg in package_advanced_search_data.get('data', {}).get('page', {}).get('list', [])])
 
-        return page_base_order
+        return package_advanced_search_data
 
-    async def list_order_detail_async(self, query: DxmOrderSearchForm):
+    async def package_advanced_search_with_detail_list(self, query: DxmOrderSearchForm):
+        """
+        条件店小秘订单高级搜索分页数据(带详情)
+        :param query:
+        :return:
+        """
+        # 默认从第一页开始
         query.page_no = 1
-        data = await self.page_order_detail_async(query)
-        total_page = data['total_page']
-        result = data['data']
+        # 获取第一页数据
+        package_advanced_search_with_detail_data = await self.package_advanced_search_with_detail(query)
+        # 获取总页数
+        total_page = package_advanced_search_with_detail_data.get('data', {}).get('page', {}).get('totalPage', 0)
+        # 获取第一页数据列表
+        package_advanced_search_with_detail_list = package_advanced_search_with_detail_data.get('data', {}).get('page',
+                                                                                                                {}).get(
+            'list', [])
+        # 循环获取每一页数据
         for page_number in range(2, total_page + 1):
+            # 变更页码
             query.page_no = page_number
-            data = await self.page_order_detail_async(query)
-            result.extend(data['data'])
-        return result
-
-    async def package_detail(self, package_id: str):
+            # 获取每一页数据
+            page_package_advanced_search_with_detail_data = await self.package_advanced_search_with_detail(query)
+            # 获取每一页数据列表
+            page_package_advanced_search_with_detail_data_list = page_package_advanced_search_with_detail_data.get(
+                'data', {}).get('page', {}).get('list', [])
+            # 合并
+            package_advanced_search_with_detail_list.extend(page_package_advanced_search_with_detail_data_list)
+        # 返回合并后的数据
+        return package_advanced_search_with_detail_list
+
+    async def package_detail_json_api(self, package_id: str):
         """
         获取包裹的详情数据
         :param package_id:
         :return:
         """
         async with self.__sem:
-            package_detail_res = await self.__async_client.post('/package/detail.htm', data={
+            package_detail_res = await self.__async_client.post('/api/package/detail.json', data={
                 'packageId': package_id,
                 'history': ''
             })
-            return get_order_detail_by_html(package_detail_res.text)
+            package_detail_json = package_detail_res.json()
+            if package_detail_json.get('code') != 0:
+                raise Exception(f'店小秘获取订单详情失败,失败原因是{traceback.format_exc()}')
+            return package_detail_json
 
     async def move_process(self, package_id: str) -> DxmJsonResponse:
         """

{ey_commerce_lib-1.0.24 → ey_commerce_lib-1.0.25}/src/ey_commerce_lib/dxm/parser/common.py

@@ -14,23 +14,17 @@ class PageInfo(TypedDict):
     page_number: int
 
 
-def get_page_info(html_str: str) -> PageInfo:
+def get_page_info(page_order_data: dict) -> PageInfo:
     """
     获取分页信息和分页数据
     :return:
     """
-    tree = html.fromstring(html_str)
-    page_size_list = tree.xpath('//input[@id="pageSize"]/@value')
-    total_page_list = tree.xpath('//input[@id="totalPage"]/@value')
-    total_size_list = tree.xpath('//input[@id="totalSize"]/@value')
-    page_number_list = tree.xpath('//input[@id="pageNo"]/@value')
-    if len(page_size_list) == 0 or len(total_page_list) == 0:
-        raise PageInfoNotFoundException("分页信息获取失败")
+    page_info = page_order_data.get('data').get('page')
     return {
-        'page_size': int(page_size_list[0]),
-        'total_page': int(total_page_list[0]),
-        'total_size': int(total_size_list[0]),
-        'page_number': int(page_number_list[0])
+        'page_size': page_info.get('pageSize'),
+        'total_page':page_info.get('totalPage'),
+        'total_size': page_info.get('totalSize'),
+        'page_number': page_info.get('pageNo')
     }
 
 

{ey_commerce_lib-1.0.24 → ey_commerce_lib-1.0.25}/src/ey_commerce_lib/dxm/parser/order.py

@@ -136,88 +136,8 @@ def get_order_buyer_select_provider(good_element: html.HtmlElement):
     return buyer_select_provider
 
 
-def list_order_base_by_html(html_str: str) -> list[dict]:
-    """
-    获取基本的订单分页信息
-    有三种情况:
-        1. 合并单
-        2. 一单多件
-        3. 普通一单一件
-    :param html_str:
-    :return:
-    """
-    tree = html.fromstring(html_str)
-    good_element_list = tree.xpath('//tbody[@class="xianshishujudate"]/tr[@class="goodsId"]')
-    order_list = list()
-    table_columns = tree.xpath('//table[@id="orderListTable"]/thead/tr/th/text()')
-    # 是否又物流方式
-    has_logistics = True if '物流方式' in table_columns else False
-    for good_element in good_element_list:
-        # 包裹号
-        package_number = good_element.xpath('.//a[@class="limingcentUrlpic"]/text()')[0]
-        # 包裹id
-        package_id = good_element.xpath('.//input[@class="input1"]/@value')[0]
-        # authid 物流方式的id
-        auth_id = good_element.xpath(f'.//input[@id="dxmAuthId{package_id}"]/@value')[0]
-        # data-custom-mark标记
-        data_custom_mark = get_str_list_first_not_blank_or_none(good_element.xpath('@data-custom-mark'))
-        buyer_select_provider = get_order_buyer_select_provider(good_element)
-        order_form_source = good_element.xpath('.//span[contains(@class, "order-form-source")]/text()')[0]
-        platform, shop = order_form_source.replace('「', '').replace('」', '').split('：')
-        order_class = f"orderId_{package_id}"
-        order_element_list = tree.xpath(f'//tr[@class="{order_class}"]')
-        order_first_element = order_element_list[0]
-        # 订单备注
-        hover_prompt_content_list = good_element.xpath('.//span[contains(@class, "hoverPrompt")]/@data-content')
-        # 物流方式, 要先检查是否包含物流方式这一列
-        logistics_info = None
-        if has_logistics:
-            # 物流方式
-            logistics_list = order_first_element.xpath('.//td[6]/span/a/text()')
-            # 可能又不存在的物流方式情况发生
-            if len(logistics_list) > 0:
-                logistics_info = dict()
-                logistics = logistics_list[0].strip()
-                # 物流单号
-                logistics_info['track_number'] = get_str_list_first_not_blank_or_none(
-                    order_first_element.xpath('.//td[6]//span[contains(@class, "limingcentUrlpicson")]/a/text()'))
-                logistics_info['logistics'] = logistics
-                # 称重重量
-                weight_element_list = order_first_element.xpath('.//td[6]//span[@class="gray-c"]/text()')
-                weight = None
-                for weight_element in weight_element_list:
-                    if '称重重量' in weight_element:
-                        # 如果包含了称重重量的话，获取完整的数字部分
-                        weight = float(re.search(r'\d+(?:\.\d+)?', weight_element).group())
-                # 设置重量部分
-                logistics_info['weight'] = weight
-
-        # 状态
-        if has_logistics:
-            status = get_str_list_first_not_blank_or_none(order_first_element.xpath('.//td[7]/text()'))
-        else:
-            status = get_str_list_first_not_blank_or_none(order_first_element.xpath('.//td[6]/text()'))
-        # 整理订单
-        if len(order_element_list) > 1:
-            # 合并单
-            order_item_list = get_merge_order_item_list(order_element_list)
-        else:
-            # 普通单
-            order_item_list = get_single_order_item_list(order_element_list[0])
-        order_list.append({
-            'package_id': package_id,
-            'auth_id': auth_id,
-            'package_number': package_number,
-            'data_custom_mark': data_custom_mark,
-            'buyer_select_provider': buyer_select_provider,
-            'platform': platform,
-            'shop': shop,
-            'hover_prompt_content_list': hover_prompt_content_list,
-            'logistics_info': logistics_info,
-            'status': status,
-            'order_item_list': order_item_list
-        })
-    return order_list
+def list_order_base_by_html(page_order_data: dict) -> list[dict]:
+    return page_order_data.get('data').get('page').get('list')
 
 
 def list_order_rule(html_str: str):

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

@@ -31,7 +31,6 @@ async def test_auto_login_4seller():
     pass
 
 
-
 cookies = {
 
 }
@@ -44,33 +43,34 @@ headers = {
 @pytest.mark.asyncio
 async def test_dxm_api():
     async with (DxmClient(headers=headers, cookies=cookies) as dxm_client):
-        # data = await dxm_client.list_order_detail_async(query=ORDER_SEARCH_HAVE_GOODS_BASE_FORM)
+        data = await dxm_client.package_advanced_search_with_detail(query=ORDER_SEARCH_APPROVAL_BASE_FORM)
+        print(data.get('code'))
         # for order in data:
         #     for pair_info in order.get('detail').get('pair_info_list'):
         #         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_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}')
+        # 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