ey-commerce-lib 1.0.21__py3-none-any.whl → 1.0.23__py3-none-any.whl

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/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/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/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/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.dist-info → ey_commerce_lib-1.0.23.dist-info}/METADATA

@@ -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.dist-info → ey_commerce_lib-1.0.23.dist-info}/RECORD

@@ -2,8 +2,7 @@ ey_commerce_lib/__init__.py,sha256=QTYqXqSTHFRkM9TEgpDFcHvwLbvqHDqvqfQ9EiXkcAM,2
 ey_commerce_lib/model.py,sha256=0ZCE68502blzRDsQ38AIswc8kPk7H34Am5x8IiDi2DU,232
 ey_commerce_lib/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ey_commerce_lib/dxm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ey_commerce_lib/dxm/main.py,sha256=SU1e5L_rPMbS9QZJmB8I-jirBr5_rWu3I2ZQ2vNuUz0,35274
-ey_commerce_lib/dxm/order.py,sha256=hMdNm9X5h9tbvMWFnyE5hcSF4butzn7m-akGqLQUD0k,35
+ey_commerce_lib/dxm/main.py,sha256=M0HDl3pZDZRpNmHdN4AkyvbQ5DOpUXpIbsFBx7-ysIM,37258
 ey_commerce_lib/dxm/constant/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ey_commerce_lib/dxm/constant/order.py,sha256=U-2NYnkIcqukzMtOFpfqvzIktu_t7jYEms_n9LgKMlY,2213
 ey_commerce_lib/dxm/exception/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -12,6 +11,7 @@ ey_commerce_lib/dxm/parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 ey_commerce_lib/dxm/parser/common.py,sha256=srzjwl7CviDgv0vizDC3RO2cbkQG9Pl-JpQpGAO5U14,3627
 ey_commerce_lib/dxm/parser/count.py,sha256=WOrGeA6DP6_IBtiF1TEZhW528f8kHxlT2cpmg_7FKPM,1561
 ey_commerce_lib/dxm/parser/ebay_product.py,sha256=Ub6of2YhFnXQwZiFBvZa6wnTIsGbsedAKHW92dbBHIY,589
+ey_commerce_lib/dxm/parser/export_template.py,sha256=bzqBguzanQTNnea26MOLSl5iLUd-bvNnnGCxxvJp9kA,787
 ey_commerce_lib/dxm/parser/order.py,sha256=9At7M1mlTslGnCO-BfjAFXNT9SPabXtTG38dnShluKI,19448
 ey_commerce_lib/dxm/parser/purchase.py,sha256=lmcC41HtdUqCgGamFASPnzHatUziLFaenTJmazsiMm0,5750
 ey_commerce_lib/dxm/parser/tracking.py,sha256=ND7Xo31lMycmRLXIYtPAXqOh2W-tmeFE8t-f-sNDLLI,2629
@@ -20,6 +20,7 @@ ey_commerce_lib/dxm/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 ey_commerce_lib/dxm/schemas/common.py,sha256=ihCeYrh4K_-m9_4rVzHm-o8rFNqzcD5XkO0JQd2023g,234
 ey_commerce_lib/dxm/schemas/dxm_commodity_product.py,sha256=9CiMTkRFk2McFL5jiHI35furvuxhJlqBr4AWOC3hlXw,30871
 ey_commerce_lib/dxm/schemas/ebay_product.py,sha256=k8LqBCz657vYRcLRjjyPJjQYjQOSwSGBivvp2LPWuYc,3696
+ey_commerce_lib/dxm/schemas/export_package.py,sha256=azochz5FBwvCktXf78A2W46iFjwpkA54j06F9YLCCjY,1475
 ey_commerce_lib/dxm/schemas/order.py,sha256=6ps9aXFcEiRASLv1CH5uW7wnplaWzD_vTfyzvi5eLE0,7881
 ey_commerce_lib/dxm/schemas/tracking.py,sha256=ZysvY6zbgfwmeNCS-s21XugrKG5d0OPHMFTZfLYBDAc,3059
 ey_commerce_lib/dxm/schemas/warehouse.py,sha256=BT9r92DgkGKRI-HPqHPt5FKPdPJr2h-rxjfh25STR2E,5094
@@ -27,7 +28,7 @@ ey_commerce_lib/dxm/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 ey_commerce_lib/dxm/utils/dxm_commodity_product.py,sha256=OkL9Ve0lnSA2l-3DMWXF2fSj-A0uV4ucrhfEWNL2Z-Y,5398
 ey_commerce_lib/dxm/utils/mark.py,sha256=rAmofi3JmdI8gdl3s-U0ZEKcA-cn6vtS3lsXDrVXRLc,4716
 ey_commerce_lib/four_seller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ey_commerce_lib/four_seller/main.py,sha256=cqO29DRRVzJHwo_005RFOO3vyGboQcuJUli783nyQjA,13131
+ey_commerce_lib/four_seller/main.py,sha256=6f6gIpUeQZfETGeAbpM-Avyi7Mbmjj-05Qaa-RDh2pg,13232
 ey_commerce_lib/four_seller/constant/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ey_commerce_lib/four_seller/constant/response.py,sha256=UqGeRCaAV6B_IyNfJR5oJvbKW4BUF5jQGhU5JYpYP1k,163
 ey_commerce_lib/four_seller/parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -48,13 +49,13 @@ ey_commerce_lib/kogan/schemas/response/order.py,sha256=ATWks8Erv9HmW9t_UklYRMn4s
 ey_commerce_lib/kogan/schemas/response/product.py,sha256=IVC1QSHSYZyHa4lCYz20rTdtmPvpPoqJsQP88hu48S4,2773
 ey_commerce_lib/takesend/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ey_commerce_lib/takesend/config.py,sha256=doR1mzVL3hrDY8luVT1_hRIGAc2_ZaTgYS8-SBU__Js,1260
-ey_commerce_lib/takesend/main.py,sha256=kYnRQxAgLWagyKr8ilLG7XrF2sG0ANoXoVm47fAANZ8,1568
+ey_commerce_lib/takesend/main.py,sha256=x91ySyNfxUYQuuzKpA1hCW_IH7H9_Rxj-PTmYNwjs2g,1654
 ey_commerce_lib/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ey_commerce_lib/utils/close.py,sha256=-De_H1I-gryytKYhLMsC3HfW67W852XkP1ckK2gLsFs,141
 ey_commerce_lib/utils/dxm.py,sha256=jVNltK_Pm_yMzXReD0Aw5VW6kzIZ5Bn23RucS0DKBI0,1196
 ey_commerce_lib/utils/float.py,sha256=PiOMf9pRApc1DskKkhKx0LAWHAYTpAPT_G4QRZRd8ZU,905
 ey_commerce_lib/utils/list_util.py,sha256=R1w7B1m3sEXr38zSHWp-15C3xAs5ykYCCpvwmnRW4xs,545
 ey_commerce_lib/utils/str.py,sha256=939xE0y8U7KEWjwbEezMlaWJNBsfb2BSb-dBpYbOD8Q,138
-ey_commerce_lib-1.0.21.dist-info/METADATA,sha256=gy3nsyb6elHZ7EdZlmzSkyuphYwOpmK9u1OUoN1IF3k,391
-ey_commerce_lib-1.0.21.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ey_commerce_lib-1.0.21.dist-info/RECORD,,
+ey_commerce_lib-1.0.23.dist-info/METADATA,sha256=SpR-HuS_lKn3GTuGWFvpa6fPyj7REejby7icmqLtQxc,391
+ey_commerce_lib-1.0.23.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ey_commerce_lib-1.0.23.dist-info/RECORD,,

ey_commerce_lib/dxm/order.py

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