ey-commerce-lib 1.0.2__tar.gz → 1.0.4__tar.gz

{ey_commerce_lib-1.0.2 → ey_commerce_lib-1.0.4}/PKG-INFO

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

{ey_commerce_lib-1.0.2 → ey_commerce_lib-1.0.4}/pyproject.toml

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

{ey_commerce_lib-1.0.2 → ey_commerce_lib-1.0.4}/src/ey_commerce_lib/dxm/main.py

@@ -1,10 +1,11 @@
 import asyncio
 
 from ey_commerce_lib.dxm.constant.order import DxmOrderRuleType
-from ey_commerce_lib.dxm.parser.common import get_page_info
+from ey_commerce_lib.dxm.parser.common import get_page_info, get_purchase_pagination_info
 from ey_commerce_lib.dxm.parser.order import list_order_base_by_html, list_order_rule, get_rule_detail, \
     get_order_detail_by_html
-from ey_commerce_lib.dxm.parser.purchase import list_purchasing_all
+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.warehouse import list_warehouse_product
 from ey_commerce_lib.dxm.schemas.common import Page
 from ey_commerce_lib.dxm.schemas.order import DxmOrderSearchForm, DxmJsonResponse, DxmCheckProcessResponse, DxmOrderRule
@@ -380,14 +381,161 @@ class DxmClient:
 
     async def page_purchasing_all(self, query: PurchasingAllQuery):
         """
-        分页查询采购单
+        分页查询采购单全部
         :return:
         """
         async with self.__sem:
             page_purchasing_all_pageList_res = await self.__async_client.post(
                 "/dxmPurchasingNote/purchasingAllPageList.htm",
                 data=query.model_dump(by_alias=True))
-            list_purchasing_all(page_purchasing_all_pageList_res.text)
+            page_info = get_purchase_pagination_info(page_purchasing_all_pageList_res.text)
+            return {
+                **page_info,
+                'data': list_purchasing_all(page_purchasing_all_pageList_res.text)
+            }
+
+    async def list_purchasing_all(self, query: PurchasingAllQuery):
+        """
+        查询采购单全部列表
+        :param query:
+        :return:
+        """
+        query.page_no = 1
+        data = await self.page_purchasing_all(query)
+        total_page = data['total_page']
+        result = data['data']
+        for page_number in range(2, total_page + 1):
+            query.page_no = page_number
+            data = await self.page_purchasing_all(query)
+            result.extend(data['data'])
+        return result
+
+    async def wait_pay_page_list(self, data: dict):
+        """
+        采购分页
+        :return:
+        """
+        async with self.__sem:
+            page_purchasing_all_pageList_res = await self.__async_client.post(
+                "/dxmPurchasingNote/waitPayPageList.htm",
+                data=data)
+            page_info = get_page_info(page_purchasing_all_pageList_res.text)
+            purchase_order_number_list = list_wait_pay_page_purchase_order_number(page_purchasing_all_pageList_res.text)
+            # 200个200个一批进行处理
+            page_data = list()
+            for i in range(0, len(purchase_order_number_list), 200):
+                search_value = ','.join(purchase_order_number_list[i:i + 200])
+                data = await self.list_purchasing_all(PurchasingAllQuery(search_value=search_value
+                                                                         , search_type=0))
+                page_data.extend(data)
+            return {
+                **page_info,
+                'data': page_data
+            }
+
+    async def wait_pay_list(self, data: dict):
+        """
+        采购订单其它查询列表
+        :param data:
+        :return:
+        """
+        async with self.__sem:
+            data['pageNo'] = 1
+            wait_pay_page_list_res = await self.wait_pay_page_list(data)
+            total_page = wait_pay_page_list_res['total_page']
+            result = wait_pay_page_list_res['data']
+            for page_number in range(2, total_page + 1):
+                data['pageNo'] = page_number
+                wait_pay_page_list_res = await self.wait_pay_page_list(data)
+                result.extend(wait_pay_page_list_res['data'])
+            return result
+
+    async def wait_pay_alibaba_page_list(self, data: dict):
+        """
+        采购订单1688采购分页
+        :return:
+        """
+        wait_pay_alibaba_page_list_res = await self.__async_client.post('/dxmPurchasingNote/waitPayAliBabaPageList.htm',
+                                                                        data=data)
+        page_info = get_page_info(wait_pay_alibaba_page_list_res.text)
+        purchase_order_number_list = list_1688_purchase_order_number(wait_pay_alibaba_page_list_res.text)
+        # 分页数据
+        page_data = list()
+        # 200个一批进行搜索
+        for i in range(0, len(purchase_order_number_list), 200):
+            search_value = ','.join(purchase_order_number_list[i:i + 200])
+            data = await self.list_purchasing_all(PurchasingAllQuery(search_value=search_value
+                                                                     , search_type=0))
+            page_data.extend(data)
+        return {
+            **page_info,
+            'data': page_data
+        }
+
+    async def wait_pay_alibaba_list(self, data: dict):
+        """
+        采购订单1688采购列表
+        :param data:
+        :return:
+        """
+        data['pageNo'] = 1
+        wait_pay_alibaba_page_list_res = await self.wait_pay_alibaba_page_list(data)
+        total_page = wait_pay_alibaba_page_list_res['total_page']
+        result = wait_pay_alibaba_page_list_res['data']
+        for page_number in range(2, total_page + 1):
+            data['pageNo'] = page_number
+            wait_pay_alibaba_page_list_res = await self.wait_pay_alibaba_page_list(data)
+            result.extend(wait_pay_alibaba_page_list_res['data'])
+        return result
+
+    async def __sync_alibaba_order(self):
+        """
+        采购全部同步订单
+        :return:
+        """
+        async with self.__sem:
+            sync_alibaba_order_response = await self.__async_client.post("/dxmPurchasingNote/syncAliBabaOrder.json")
+            return sync_alibaba_order_response.json()
+
+    async def sync_alibaba_order(self):
+        """
+        同步采购全部订单
+        :return:
+        """
+        sync_alibaba_order_data = await self.__sync_alibaba_order()
+        process_uuid = sync_alibaba_order_data.get('uuid')
+        while True:
+            # 查询同步进度
+            check_process_res = await self.__check_process(process_uuid)
+            process_code = check_process_res.get('processMsg').get('code')
+            if process_code:
+                # 同步完成结束监测
+                break
+            await asyncio.sleep(1)
+
+    async def validate_price(self, ids: str):
+        """
+        采购单提交审核
+        :param ids: purchase_id 多个,分隔
+        :return:
+        """
+        validate_price_res = await self.__async_client.post("/dxmPurchasingNote/validatePrice.json", data={
+            'ids': ids
+        })
+        return validate_price_res
+
+    async def wait_pay_pay_money(self, purchase_id: str):
+        """
+        采购订单支付(通过审核)
+        :param purchase_id:
+        :return:
+        """
+        async with self.__sem:
+            wait_pay_pay_money_res = await self.__async_client.post("/dxmPurchasingNote/waitPayPayMoney.json", data={
+                'id': purchase_id,
+                'auditResult': '1',
+            })
+            return wait_pay_pay_money_res.json()
 
     async def __aenter__(self):
         return self

{ey_commerce_lib-1.0.2 → ey_commerce_lib-1.0.4}/src/ey_commerce_lib/dxm/parser/common.py

@@ -52,6 +52,27 @@ def __parse_js_vals(js_snippet: str) -> dict[str, int]:
     return {key: int(value) for key, value in matches}
 
 
+def get_purchase_pagination_info(script: str) -> dict:
+    # 定义要提取的字段及其对应的 key 名
+    field_map = {
+        'pageNo': 'page_number',
+        'pageSize': 'page_size',
+        'totalSize': 'total_size',
+        'totalPage': 'total_page',
+    }
+
+    result = {}
+
+    for field, key in field_map.items():
+        pattern = rf"\$\('#{field}'\)\.val\('(\d+)'\);"
+        match = re.search(pattern, script)
+        if not match:
+            raise ValueError(f"无法从字符串中提取字段：{field}")
+        result[key] = int(match.group(1))
+
+    return result
+
+
 def get_purchasing_page_info(html_str: str):
     """
     获取分页信息和分页数据(店小秘->采购部分)

{ey_commerce_lib-1.0.2 → ey_commerce_lib-1.0.4}/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:
             # 合并单

ey_commerce_lib-1.0.4/src/ey_commerce_lib/dxm/parser/purchase.py

@@ -0,0 +1,122 @@
+import lxml.html
+from lxml import html
+
+from ey_commerce_lib.utils.list_util import get_str_list_first_not_blank_or_none
+
+
+def list_1688_purchase_order_number(html_str: str) -> list[str]:
+    """
+    根据1688采购页面html获取1688采购页面采购单号列表
+    :param html_str:
+    :return:
+    """
+    tree = html.fromstring(html_str)
+    good_element_list: list[html.HtmlElement] = tree.xpath('//tr[contains(@class, "goodsId")]')
+    purchase_order_number_list = list()
+    for good_element in good_element_list:
+        purchase_order_number_list.append(get_str_list_first_not_blank_or_none(
+            good_element.xpath('.//span[@class="limingcentUrlpic"]/text()')))
+    return purchase_order_number_list
+
+
+def list_wait_pay_page_purchase_order_number(html_str: str) -> list[str]:
+    """
+    根据采购wait_pay_pag这个请求返回html代码获取采购单号列表
+    :param html_str:
+    :return:
+    """
+    tree = html.fromstring(html_str)
+    good_element_list: list[html.HtmlElement] = tree.xpath('//tr[contains(@class, "goodsId")]')
+    purchase_order_number_list = list()
+    for good_element in good_element_list:
+        purchase_order_number = get_str_list_first_not_blank_or_none(
+            good_element.xpath('.//a[@class="limingcentUrlpic"]/text()'))
+        purchase_order_number_list.append(purchase_order_number)
+    return purchase_order_number_list
+
+
+def list_purchasing_all(html_str: str) -> list[dict]:
+    """
+       根据采购全部页面html，获取采购页面详细数据列表
+       :param html_str:
+       :return:
+       """
+    tree = html.fromstring(html_str)
+    good_element_list: list[html.HtmlElement] = tree.xpath('//tr[contains(@class, "goodsId")]')
+    purchase_result = list()
+    for good_element in good_element_list:
+        purchase_id = get_str_list_first_not_blank_or_none(good_element.xpath('@id'))
+        purchase_order_number = get_str_list_first_not_blank_or_none(
+            good_element.xpath('.//a[@class="limingcentUrlpic"]/text()'))
+        ghs_id = get_str_list_first_not_blank_or_none(
+            good_element.xpath('.//span[contains(@class, "ghsHoverPrompt")]/@data-ghsid'))
+        ghs_name = get_str_list_first_not_blank_or_none(
+            good_element.xpath('.//span[contains(@class, "ghsHoverPrompt")]/span/text()'))
+        warehouse_name, purchase_info = good_element.xpath('.//td[4]/span/text()')[0].strip().split('|')
+        agent_name = purchase_info.split('：')[1]
+        # 获取兄弟元素
+        content_element = good_element.getnext()
+        # 获取商品信息
+        img = get_str_list_first_not_blank_or_none(content_element.xpath('.//img/@data-original'))
+        content_number_info = content_element.xpath('./td[2]/text()')
+        product_zl_number = None
+        purchase_number = None
+        for content_number in content_number_info:
+            content_number = content_number.strip()
+            if content_number.split('：')[0] == '商品种类':
+                product_zl_number = content_number.split('：')[1].strip()
+            elif content_number.split('：')[0] == '采购数量':
+                purchase_number = content_number.split('：')[1].strip()
+        # 解析出货款
+        total_amount = get_str_list_first_not_blank_or_none(content_element.xpath('./td[3]//input/@data-totalamount'))
+        # 运费
+        shipping_amount = get_str_list_first_not_blank_or_none(content_element.xpath('./td[3]//input/@value'))
+        source = None
+        source_list = content_element.xpath('./td[4]/span[1]')
+        if len(source_list) == 0:
+            # 说明不是淘供销
+            source_list = content_element.xpath('./td[4]/div[1]')
+
+        if len(source_list) > 0:
+            try:
+                source = source_list[0].text_content()
+                source = source.strip()
+                platform, source_str = source.split("：")
+                source = platform.strip() + ":" + source_str.strip()
+            except:
+                source = None
+        # 获取物流信息
+        track_element_list = content_element.xpath('./td[4]//a[@class="getLogisticsMsgBox"]')
+        track_list = list()
+        for track_element in track_element_list:
+            tracking_id = get_str_list_first_not_blank_or_none(track_element.xpath("@trackingid"))
+            tracking_number = get_str_list_first_not_blank_or_none(track_element.xpath("@data-trackingnumber"))
+            tracking_code = get_str_list_first_not_blank_or_none(track_element.xpath("@data-trackingcode"))
+            track_status = get_str_list_first_not_blank_or_none(
+                track_element.xpath('./span[contains(@class, "iconfont")]/@data-original-title'))
+            track_list.append({
+                "tracking_id": tracking_id,
+                "tracking_number": tracking_number,
+                "tracking_code": tracking_code,
+                "track_status": track_status
+            })
+
+        # 状态
+        status = get_str_list_first_not_blank_or_none(content_element.xpath('./td[6]/div[@class="mBottom3"]/text()'))
+        purchase_result.append({
+            "purchase_id": purchase_id,
+            "purchase_order_number": purchase_order_number,
+            "ghs_id": ghs_id,
+            "ghs_name": ghs_name,
+            "agent_name": agent_name,
+            "img": img,
+            "product_zl_number": product_zl_number,
+            "purchase_number": purchase_number,
+            "total_amount": total_amount,
+            "shipping_amount": shipping_amount,
+            "source": source,
+            "status": status,
+            'track_list': track_list
+        })
+
+    return purchase_result

{ey_commerce_lib-1.0.2 → ey_commerce_lib-1.0.4}/src/ey_commerce_lib/dxm/schemas/warehouse.py

@@ -105,6 +105,7 @@ class PurchasingAllQuery(BaseModel):
     comment_colors: str = ''
     # 仓库id
     warehouse_id: str = ''
+
     # 店铺id(或者1688账号)
     authorization_id: str = ''
     # 排序方式: 1(按创建时间) 2(按更新时间) 4(按照采购单号)5(按照供货商名)
@@ -157,5 +158,8 @@ class PurchasingAllQuery(BaseModel):
 
     model_config = ConfigDict(
         alias_generator=to_camel,
-        populate_by_name=True  # 对应旧版的 allow_population_by_field_name
-    )
+        populate_by_name=True
+    )
+
+
+

ey_commerce_lib-1.0.2/src/ey_commerce_lib/dxm/parser/purchase.py

@@ -1,40 +0,0 @@
-from lxml import html
-
-
-def list_purchasing_all(html_str: str):
-    tree = html.fromstring(html_str)
-    good_element_list: list[html.HtmlElement] = tree.xpath('//tr[contains(@class, "goodsId")]')
-    for good_element in good_element_list:
-        purchase_id = good_element.xpath('@id')[0]
-        purchase_order_number = good_element.xpath('.//a[@class="limingcentUrlpic"]/text()')[0]
-        ghs_id = good_element.xpath('.//span[contains(@class, "ghsHoverPrompt")]/@data-ghsid')[0]
-        ghs_name = good_element.xpath('.//span[contains(@class, "ghsHoverPrompt")]/span/text()')[0].strip()
-        warehouse_name, purchase_info = good_element.xpath('.//td[4]/span/text()')[0].strip().split('|')
-        # 采购员
-        agent_name = purchase_info.split('：')[1]
-        #print(purchase_order_number, ghs_id, ghs_name, warehouse_name, agent_name)
-        # 获取兄弟元素
-        content_element = good_element.getnext()
-        # 获取商品信息
-        img = content_element.xpath('.//img/@data-original')[0]
-        content_number_info = content_element.xpath('./td[2]/text()')
-        product_zl_number = None
-        purchase_number = None
-        for content_number in content_number_info:
-            content_number = content_number.strip()
-            if content_number.split('：')[0] == '商品种类':
-                product_zl_number = content_number.split('：')[1].strip()
-            elif content_number.split('：')[0] == '采购数量':
-                purchase_number = content_number.split('：')[1].strip()
-        # 解析出货款
-        total_amount = content_element.xpath('./td[3]//input/@data-totalamount')[0]
-        # 运费
-        shipping_amount = content_element.xpath('./td[3]//input/@value')[0]
-        platform_list = content_element.xpath('./td[4]/div/span')
-        if len(platform_list) > 0:
-            source = platform_list[0].text.strip()
-        else:
-            source = content_element.xpath('./td[4]/span/span/text()')[0].strip()
-            source2 = content_element.xpath('./td[4]/span/span[@class="alibabaPurchaseOrder"]/text()')[0].strip()
-            source = source + source2
-        print(source)

ey_commerce_lib-1.0.2/tests/dxm/test_order.py

@@ -1,55 +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:
-        print(await dxm.list_rule(DxmOrderRuleType.LOGISTICS))
-        # print(await dxm.get_warehouse_dict())