ey-commerce-lib 1.0.6__py3-none-any.whl → 1.0.7__py3-none-any.whl

ey_commerce_lib/four_seller/constant/response.py

@@ -0,0 +1,8 @@
+from enum import IntEnum
+
+
+class ResponseCodeEnum(IntEnum):
+    # 登录验证失败
+    LOGIN_VALIDATION_FAILED = 4001
+    # 操作成功
+    SUCCESS = 0

ey_commerce_lib/four_seller/main.py

@@ -0,0 +1,280 @@
+import asyncio
+import base64
+import logging
+from typing import Callable
+
+from httpx import AsyncClient, ReadTimeout
+from playwright.async_api import async_playwright, TimeoutError
+import ddddocr
+
+from ey_commerce_lib.four_seller.constant.response import ResponseCodeEnum
+from ey_commerce_lib.four_seller.parser.order import parse_order
+from ey_commerce_lib.four_seller.schemas.query.order import FourSellerOrderQueryModel
+from ey_commerce_lib.four_seller.schemas.vo.order import FourSellerOrderVO
+from ey_commerce_lib.model import Page
+from ey_commerce_lib.utils.close import safe_close
+
+logger = logging.getLogger(__name__)
+
+
+class FourSellerClient:
+
+    def __init__(self, user_name: str,
+                 password: str,
+                 user_token: str,
+                 login_success_call_back: Callable,
+                 sem: int = 10):
+        self.user_name = user_name
+        self.password = password
+        self.user_token = user_token
+        # 登录成功回调函数
+        self.login_success_call_back = login_success_call_back
+        # 信号量
+        self.__sem = asyncio.Semaphore(sem)
+        # 自动登录锁
+        self.__login_lock = asyncio.Lock()
+        # 当前登录任务的 future
+        self.__login_in_progress = None
+        # ddddocr实例
+        self.__ocr = ddddocr.DdddOcr()
+        # 异步客户端
+        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"
+                                          })
+
+    async def __auto_login_4seller(self) -> str:
+        """
+        自动登录4seller
+        :return: 登录
+        """
+        browser = None
+        context = None
+        page = None
+        try:
+            async with async_playwright() as p:
+                browser = await p.chromium.launch(
+                    headless=True,
+                    args=[
+                        '--start-maximized',
+                        '--disable-blink-features=AutomationControlled',
+                    ]
+                )
+
+                context = await browser.new_context(
+                    user_agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 "
+                               "(KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36",
+                    viewport={"width": 1920, "height": 1080},
+                    locale='zh-CN',  # 中文环境
+                    timezone_id='Asia/Shanghai',  # 中国时区
+                    geolocation={"longitude": 116.4074, "latitude": 39.9042},  # 北京位置
+                    permissions=["geolocation"]
+                )
+                page = await context.new_page()
+                await page.goto('https://www.4seller.com/login.html')
+                # 等待元素出现
+                await page.locator('.el-input__inner').first.wait_for()
+                input_locators = await page.locator('.el-input__inner').all()
+                username_input_element = input_locators[0]
+                password_input_element = input_locators[1]
+                await username_input_element.fill(self.user_name)
+                await password_input_element.fill(self.password)
+                login_button_element = page.locator('.el-button.sign_up')
+                await login_button_element.click()
+                # 获取验证码图片
+                capcha_code_img_element = page.locator('.el-input__wrapper img')
+                await capcha_code_img_element.wait_for()
+                captcha_code_input_element = page.locator('[autocomplete="new-password"]')
+                login_count = 1
+                # 只能允许一百次登录
+                while login_count <= 100:
+                    # 等图片 src 被赋值
+                    max_attempts = 10
+                    for attempt in range(max_attempts):
+                        src = await capcha_code_img_element.get_attribute("src")
+                        if src and src.strip() != "":
+                            break
+                        await page.wait_for_timeout(500)
+                    else:
+                        raise Exception("获取不到图片验证码")
+                    # 识别验证码
+                    # 如果有前缀 "data:image/xxx;base64,", 需要去掉
+                    if ',' in src:
+                        base64_str = src.split(',')[1]
+
+                    # 解码 base64 为字节流
+                    img_bytes = base64.b64decode(base64_str)
+                    captcha_code = self.__ocr.classification(img_bytes)
+                    # 回填验证码
+                    await captcha_code_input_element.fill(captcha_code)
+                    # 再次点击登录按钮
+                    await login_button_element.click()
+                    try:
+                        await page.wait_for_selector(".el-message.el-message--error", timeout=10000)
+                    except TimeoutError:
+                        # 获取userToken的cookie
+                        cookies = await context.cookies()
+                        for cookie in cookies:
+                            if cookie["name"] == "userToken":
+                                userToken = cookie["value"]
+                                # 返回token
+                                return userToken
+                    # 防止验证码切换过快
+                    await page.wait_for_timeout(2000)
+                    login_count += 1
+        except Exception as e:
+            raise e
+        finally:
+            # 不管成功与否函数都要关闭
+            for close_obj in (page, context, browser):
+                await safe_close(close_obj)
+
+    async def __refresh_user_token(self):
+        """
+        刷新token
+        :return:
+        """
+        # 如果有登录任务正在运行
+        if self.__login_in_progress is not None:
+            # 已有协程在处理登录，我们等待它完成
+            await self.__login_in_progress
+            return
+
+        # 没有登录任务，当前协程负责登录
+        self.__login_in_progress = asyncio.get_event_loop().create_future()
+        # 检测锁，确保只有一个线程在登录
+        async with self.__login_lock:
+            try:
+                user_token = await self.__auto_login_4seller()
+            except Exception as e:
+                # 如果future没有被终结掉手动设置终结future
+                if not self.__login_in_progress.done():
+                    self.__login_in_progress.set_exception(e)
+                logger.error(f'FourSeller自动登录失败 {e}')
+                raise Exception(f'FourSeller登录身份失效, 尝试自动登录失败 {e}')
+            else:
+                # 登录成功后重置token
+                self.user_token = user_token
+                # 清空原cookies
+                self.__async_client.cookies.clear()
+                # 重新设置客户端的cookie
+                self.__async_client.cookies.set('userToken', self.user_token, domain='www.4seller.com', path='/')
+                # 如果future没有被终结掉手动设置终结future,否则会抛出异常影响回调执行
+                if not self.__login_in_progress.done():
+                    self.__login_in_progress.set_result(True)
+                # 回调函数可能会失败，但是不能影响其它协程操作
+                try:
+                    await self.login_success_call_back(user_token)
+                except Exception as e:
+                    logger.error(f'FourSeller登录成功回调函数执行失败 {e}')
+                    pass
+            finally:
+                # 提示登录任务完成
+                self.__login_in_progress = None
+
+    async def __request(self, url, method, retry_count=0, **kwargs):
+        """
+        4seller基本请求
+        :param url: url路径
+        :param method: 请求方法
+        :param kwargs: 请求参数
+        :return:
+        """
+        try:
+            async with self.__sem:
+                response = await self.__async_client.request(method, url, **kwargs)
+        except ReadTimeout:
+            raise Exception(f'FourSeller请求接口超时')
+        except Exception as e:
+            logger.error(f'FourSeller请求接口失败{e}')
+            raise Exception(f'FourSeller请求接口失败{e}')
+        else:
+            try:
+                data = response.json()
+            except Exception as e:
+                logger.error(f'FourSeller请求,json序列化失败{e},原始数据{response.text}')
+                raise Exception(f'FourSeller请求,json序列化失败{e},原始数据{response.text}')
+            else:
+                if data.get('code') == ResponseCodeEnum.LOGIN_VALIDATION_FAILED:
+                    # 刷新token
+                    await self.__refresh_user_token()
+                    if retry_count < 1:
+                        # 最多重试一次
+                        return await self.__request(url, method, 1, **kwargs)
+                    else:
+                        raise Exception(f'FourSeller登录成功后,再次请求登录验证失败, 请求接口{url}，返回信息{data}')
+                return data
+
+    async def __get(self, url, **kwargs):
+        return await self.__request(url, 'GET', **kwargs)
+
+    async def __post(self, url, **kwargs):
+        return await self.__request(url, 'POST', **kwargs)
+
+    async def __put(self, url, **kwargs):
+        return await self.__request(url, 'PUT', **kwargs)
+
+    async def __delete(self, url, **kwargs):
+        return await self.__request(url, 'DELETE', **kwargs)
+
+    async def __order_page_api(self, query_params: FourSellerOrderQueryModel):
+        return await self.__post('/api/v2/order/page', json=query_params.model_dump(by_alias=True))
+
+    async def __order_page_history_api(self, query_params: FourSellerOrderQueryModel):
+        return await self.__post('/api/v2/order/history/page', json=query_params.model_dump(by_alias=True))
+
+    async def order_page(self, query_params: FourSellerOrderQueryModel) -> Page[FourSellerOrderVO]:
+        page_data = await self.__order_page_api(query_params)
+        # 能到这里说明登录验证什么的都没有问题，接口返回代码也是代表成功
+        if page_data.get('code') != ResponseCodeEnum.SUCCESS:
+            raise Exception(f'FourSeller请求接口失败, 请求接口{page_data}')
+        return parse_order(page_data.get('data'))
+
+    async def order_page_history(self, query_params: FourSellerOrderQueryModel) -> Page[FourSellerOrderVO]:
+        page_data = await self.__order_page_history_api(query_params)
+        # 能到这里说明登录验证什么的都没有问题，接口返回代码也是代表成功
+        if page_data.get('code') != ResponseCodeEnum.SUCCESS:
+            raise Exception(f'FourSeller拉取历史分页订单失败, 请求接口{page_data}')
+        return parse_order(page_data.get('data'))
+
+    async def list_order(self, query_params: FourSellerOrderQueryModel) -> list[FourSellerOrderVO]:
+        # 获取分页信息
+        order_list = list()
+        page = await self.order_page(query_params)
+        # 采用并发提高速度
+        page_order_task_list = list()
+        for page_number in range(1, page.total_page + 1):
+            page_order_task_list.append(
+                self.order_page(query_params.copy(update={"page_current": page_number}))
+            )
+        page_list = await asyncio.gather(*page_order_task_list)
+        # 所有的数据
+        for every_page in page_list:
+            # 插入数据
+            order_list.extend(every_page.records)
+        return order_list
+
+    async def list_history_order(self, query_params: FourSellerOrderQueryModel):
+        # 获取分页信息
+        order_history_list = list()
+        page = await self.order_page_history(query_params)
+        # 采用并发提高速度
+        page_order_task_list = list()
+        for page_number in range(1, page.total_page + 1):
+            page_order_task_list.append(self.order_page_history(
+                query_params.copy(update={"page_current": page_number})
+            ))
+        page_list = await asyncio.gather(*page_order_task_list)
+        # 所有的数据
+        for every_page in page_list:
+            # 插入数据
+            order_history_list.extend(every_page.records)
+        return order_history_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/four_seller/parser/order.py

@@ -0,0 +1,19 @@
+import math
+
+from ey_commerce_lib.four_seller.schemas.vo.order import FourSellerOrderVO
+from ey_commerce_lib.model import Page
+
+
+def parse_order(data: dict) -> Page[FourSellerOrderVO]:
+    # 计算total_page
+    page_size = data.get('pageSize')
+    total = data.get('total')
+    page_number = data.get('pageCurrent')
+    total_page = math.ceil(total / page_size) if total > 0 else 0
+    return Page(
+        records=[FourSellerOrderVO(**record) for record in data.get('records')],
+        total=total,
+        page_size=page_size,
+        page_number=page_number,
+        total_page=total_page
+    )

ey_commerce_lib/four_seller/schemas/query/order.py

@@ -0,0 +1,101 @@
+from pydantic import BaseModel, ConfigDict
+
+from ey_commerce_lib.utils.str import to_camel
+
+
+class FourSellerOrderQueryModel(BaseModel):
+    # 页码
+    page_current: int = 1
+    # 每页条数
+    page_size: int = 100
+    # 平台
+    platform: str = ""
+    # 店铺id列表
+    shop_id_list: list[str] = []
+    # 仓库id 页面未知来源
+    warehouse_id: str = ""
+    # 物流id 例如: 13554
+    logistics_service_id: str = ""
+    # 物流服务id映射关系父子id,id连接起来 例如: ["470", "13554"]
+    logistics_service_map: list[str] = []
+    # 单品单数: onlyOne 全部包裹类型: "" 单品多数: gtOne 多品: multiple
+    item_type: str = ""
+    """
+    打印状态  全部: "" 面单已打印: labelPrinted   面单未打印: labelUnPrinted  装箱已打印: packingPrinted   装箱未打印: packingUnPrinted 
+    拣货单已打印: pickPrinted  拣货单未打印: pickUnPrinted    
+    """
+    print_status: str = ""
+    # 买家指定
+    shipping_method: list[str] = []
+    # 搜索类型  订单号: orderNo   物流跟踪号: trackNo  其余请参考页面
+    search_type: str = "orderNo"
+    # 搜索方式  模糊: like  精确: exact
+    search_method: str = "exact"
+    # 搜索内容
+    search_value: str = ""
+    # 商品总数最小
+    item_min: str = ""
+    # 商品总数最大
+    item_max: str = ""
+    # 重量最小
+    weight_min: str = ""
+    # 重量最大
+    weight_max: str = ""
+    # 重量单位 lb oz kg g
+    weight_unit: str = "lb"
+    # 到期时间 如果是数字就是小时  如果为空字符串是全部
+    expires_hour: str | int = ""
+    hours: str = ""
+    # 平台状态 待发货: Awaiting_Shipment  待揽收: Awaiting_Collection 其它参考页面
+    platform_status: str = ""
+    # 发货地址id   如果为空字符串就是没有选择
+    ship_from_address_id: str | int = ""
+    # 国家编码 具体参考筛选页面
+    country_code: str = ""
+    # 国家名称 具体参考筛选页面
+    country_name: str = ""
+    # 省份或者洲
+    state: str = ""
+    # 买家备注 空字符串未选 有:1 无: 0
+    buyer_note: str | int = ""
+    # 卖家备注 空字符串未选 有:1 无: 0
+    seller_note: str = ""
+    # 系统备注: 空字符串未选 有:1 无: 0
+    internal_note: str = ""
+    # 平台标记 PRE_SALE: Temu预售
+    platform_marker: str = ""
+    # 下单时间 这个时间比上海时间要晚7个小时
+    date_query_create_start_time: str = ""
+    date_query_create_end_time: str = ""
+    # 付款时间
+    date_query_paid_start_time: str = ""
+    date_query_paid_end_time: str = ""
+    # 发货时间
+    date_query_ship_start_time: str = ""
+    date_query_ship_end_time: str = ""
+    # 打印面单时间
+    date_query_print_label_start_time: str = ""
+    date_query_print_label_end_time: str = ""
+    # 取消订单时间
+    date_query_cancel_start_time: str = ""
+    date_query_cancel_end_time: str = ""
+    # 标签页 具体参考筛选页面
+    tag_id_list: list[str] = []
+    # 订单状态 全部: 空字符串  未付款: un_paid 已发货: shipped  待处理: to_ship  风控中: on_hold  处理中: in_process 已签收: delivered 参考页面
+    all_order_status: str = ""
+    # 订单状态: 全部: all 已发货: shipped
+    order_status: str = "all"
+    # 排序字段
+    order_by: str = "orderPaidTime"
+    # 排序方式 asc: 升序 desc: 降序
+    desc: str = "asc"
+
+    country: str = ""
+    note_query: str = ""
+    tag_query: str = ""
+    exception_type: str = ""
+
+    model_config = ConfigDict(
+        alias_generator=to_camel,
+        populate_by_name=True
+    )

ey_commerce_lib/four_seller/schemas/vo/order.py

@@ -0,0 +1,437 @@
+from typing import Optional
+from pydantic import BaseModel, Field, ConfigDict
+
+
+class FourSellerOrderAddressVo(BaseModel):
+    # 地址 ID
+    id: int
+
+    # 收件人姓名
+    name: str
+
+    # 城市
+    city: str
+
+    # 邮编
+    postal_code: Optional[str] = Field(..., alias="postalCode")
+
+    # 完整地址
+    address: str
+
+    # 电话
+    phone: str
+
+    # 邮箱
+    email: str
+
+    # 国家代码
+    country_code: str = Field(..., alias="countryCode")
+
+    # 区/县
+    county: Optional[str]
+
+    # 地址行1
+    address1: str
+
+    # 地址行2
+    address2: Optional[str]
+
+    # 地址行3
+    address3: Optional[str] = Field(None)
+
+    # 州/省
+    state: Optional[str] = Field(None)
+
+    # 地址备注
+    msg: Optional[str] = Field(None)
+
+    # 地址备注映射
+    msg_map: Optional[dict] = Field(None, alias="msgMap")
+
+    # 是否住宅
+    residential: Optional[bool]
+
+    # 是否检查地址
+    check_address: bool = Field(..., alias="checkAddress")
+
+    model_config = ConfigDict(
+        populate_by_name=True
+    )
+
+
+class FourSellerTimeInfoVO(BaseModel):
+    # 订单支付时间
+    order_paid_time: Optional[str] = Field(..., alias="orderPaidTime")
+
+    # 订单创建时间
+    order_create_time: str = Field(..., alias="orderCreateTime")
+
+    # 最晚发货日期
+    latest_ship_date: Optional[str] = Field(..., alias="latestShipDate")
+
+    # 发货时间
+    order_shipped_time: Optional[str] = Field(..., alias="orderShippedTime")
+
+    # 最晚送达日期
+    latest_delivery_date: Optional[str] = Field(..., alias="latestDeliveryDate")
+
+    # 取消时间
+    cancel_time: Optional[str] = Field(..., alias="cancelTime")
+
+    # 剩余天数
+    leave_day: int = Field(..., alias="leaveDay")
+
+    model_config = ConfigDict(
+        populate_by_name=True
+    )
+
+
+class FourSellerPackageInfoVO(BaseModel):
+    # 重量
+    weight: Optional[float]
+
+    # 重量单位
+    weight_unit: Optional[str] = Field(None, alias="weightUnit")
+
+    # 包裹 ID
+    package_id: Optional[int] = Field(None, alias="packageId")
+
+    # 包裹类型
+    package_type: Optional[str] = Field(None, alias="packageType")
+
+    # 包裹名称
+    package_name: Optional[str] = Field(None, alias="packageName")
+
+    # 平台包裹类型
+    platform_package_type: Optional[str] = Field(None, alias="platformPackageType")
+
+    # 长度
+    length: Optional[float]
+
+    # 宽度
+    width: Optional[float]
+
+    # 高度
+    height: Optional[float]
+
+    # 尺寸单位
+    dimension_unit: Optional[str] = Field(None, alias="dimensionUnit")
+
+    model_config = ConfigDict(
+        populate_by_name=True
+    )
+
+
+class FourSellerShippingServiceInfoVO(BaseModel):
+    # 保险金额
+    insurance_amount: Optional[float] = Field(None, alias="insuranceAmount")
+
+    # 保险币种
+    insurance_currency: Optional[str] = Field(None, alias="insuranceCurrency")
+
+    # 物流服务
+    shipping_service: Optional[str] = Field(None, alias="shippingService")
+
+    # 承运商
+    carrier: Optional[str]
+
+    # 运费
+    shipping_fee: Optional[float] = Field(None, alias="shippingFee")
+
+    # 币种
+    currency: Optional[str]
+
+    # 预估送达天数
+    estimated_delivery_days: Optional[int] = Field(None, alias="estimatedDeliveryDays")
+
+    # 物流授权 ID
+    logistics_auth_id: Optional[int] = Field(None, alias="logisticsAuthId")
+
+    # 物流承运商 ID
+    logistics_carrier_id: Optional[int] = Field(None, alias="logisticsCarrierId")
+
+    # 物流承运商代码
+    logistics_carrier_code: Optional[str] = Field(None, alias="logisticsCarrierCode")
+
+    # 物流承运商名称
+    logistics_carrier_name: Optional[str] = Field(None, alias="logisticsCarrierName")
+
+    # 物流平台
+    logistics_platform: Optional[str] = Field(None, alias="logisticsPlatform")
+
+    # 物流服务 ID
+    logistics_service_id: Optional[int] = Field(None, alias="logisticsServiceId")
+
+    # 物流服务代码
+    logistics_service_code: Optional[str] = Field(None, alias="logisticsServiceCode")
+
+    # 物流服务类型
+    logistics_service_type: Optional[str] = Field(None, alias="logisticsServiceType")
+
+    # 物流服务名称
+    logistics_service_name: Optional[str] = Field(None, alias="logisticsServiceName")
+
+    # 平台物流服务 ID
+    platform_shipping_service_id: Optional[int] = Field(None, alias="platformShippingServiceId")
+
+    # 空白箱
+    blank_box: Optional[int] = Field(None, alias="blankBox")
+
+    # 阻止 AMZL
+    block_amzl: Optional[int] = Field(None, alias="blockAmzl")
+
+    # ERP 预估发货日期
+    erp_estimated_shipping_date: Optional[str] = Field(None, alias="erpEstimatedShippingDate")
+
+    # 配送确认类型
+    delivery_confirmation_type: Optional[str] = Field(None, alias="deliveryConfirmationType")
+
+    # 标签价格
+    label_price: Optional[float] = Field(None, alias="labelPrice")
+
+    # 预估运费
+    estimated_shipping_price: Optional[float] = Field(None, alias="estimatedShippingPrice")
+
+    model_config = ConfigDict(
+        populate_by_name=True
+    )
+
+
+class FourSellerOrderItemInfoVO(BaseModel):
+    # 订单商品 ID
+    order_item_id: int = Field(..., alias="orderItemId")
+
+    # 订单 ID
+    order_id: int = Field(..., alias="orderId")
+
+    # 卖家 SKU
+    seller_sku: Optional[str] = Field(..., alias="sellerSku")
+
+    # 商品标题
+    title: str
+
+    # 图片 URL
+    img_url: Optional[str] = Field(None, alias="imgUrl")
+
+    # 列表 URL
+    listing_url: Optional[str] = Field(None, alias="listingUrl")
+
+    # SKU ID
+    sku_id: Optional[int] = Field(..., alias="skuId")
+
+    # SKU
+    sku: Optional[str] = Field(None)
+
+    # 数量
+    quantity: int
+
+    # 变体属性
+    variant_attr: Optional[str] = Field(None, alias="variantAttr")
+
+    # 单价
+    item_price: Optional[float] = Field(..., alias="itemPrice")
+
+    # 币种
+    currency: Optional[str] = Field(None)
+
+    # 是否占用库存
+    occupy: Optional[bool] = Field(None)
+
+    # 商品是否未找到
+    product_not_found: bool = Field(..., alias="productNotFound")
+
+    # 地址是否有效
+    address_valid: bool = Field(..., alias="addressValid")
+
+    # 地址错误信息
+    address_error_msg: Optional[str] = Field(None, alias="addressErrorMsg")
+
+    # 来源 URL
+    source_url: Optional[str] = Field(None, alias="sourceUrl")
+
+    # 是否预售
+    pre_sale: int = Field(..., alias="preSale")
+
+    model_config = ConfigDict(
+        populate_by_name=True
+    )
+
+
+class FourSellerOrderVO(BaseModel):
+    # 订单 ID
+    order_id: int = Field(..., alias="orderId")
+
+    # 金额
+    amount: Optional[float] = Field(None)
+
+    # 币种
+    currency: Optional[str] = Field(None)
+
+    # 仓库 ID
+    warehouse_id: int = Field(..., alias="warehouseId")
+
+    # 仓库类型
+    warehouse_type: str = Field(..., alias="warehouseType")
+
+    # 仓库代码
+    warehouse_code: Optional[str] = Field(None, alias="warehouseCode")
+
+    # 平台仓名称
+    platform_warehouse_name: Optional[str] = Field(None, alias="platformWarehouseName")
+
+    # 平台物流方式
+    platform_shipment_method: Optional[str] = Field(None, alias="platformShipmentMethod")
+
+    # 支付状态
+    paid_status: Optional[str] = Field(None, alias="paidStatus")
+
+    # 订单状态
+    order_status: str = Field(..., alias="orderStatus")
+
+    # 平台订单状态
+    platform_order_status: str = Field(..., alias="platformOrderStatus")
+
+    # 取消原因
+    cancel_reason: Optional[str] = Field(None, alias="cancelReason")
+
+    # 平台
+    platform: str
+
+    # 平台订单号
+    platform_order_id: str = Field(..., alias="platformOrderId")
+
+    # 平台订单编号
+    platform_order_no: str = Field(..., alias="platformOrderNo")
+
+    # 店铺 ID
+    shop_id: int = Field(..., alias="shopId")
+
+    # 店铺名称
+    shop_name: Optional[str] = Field(None, alias="shopName")
+
+    # 包裹名称
+    package_name: Optional[str] = Field(None, alias="packageName")
+
+    # 买家备注
+    buyer_memo: Optional[str] = Field(None, alias="buyerMemo")
+
+    # 卖家备注
+    seller_memo: Optional[str] = Field(None, alias="sellerMemo")
+
+    # 内部备注
+    internal_memo: Optional[str] = Field(None, alias="internalMemo")
+
+    # 发货单号
+    shipment_no: Optional[str] = Field(None, alias="shipmentNo")
+
+    # 是否三方仓
+    third_party: bool = Field(..., alias="thirdParty")
+
+    # 是否打印标签
+    print_label: bool = Field(..., alias="printLabel")
+
+    # 是否打印装箱单
+    print_packing_slip: bool = Field(..., alias="printPackingSlip")
+
+    # 是否打印拣货单
+    print_pick: bool = Field(..., alias="printPick")
+
+    # 配送选项
+    delivery_option_type: Optional[int] = Field(None, alias="deliveryOptionType")
+
+    # 买标状态
+    buy_label_process_status: str = Field(..., alias="buyLabelProcessStatus")
+
+    # 错误信息
+    error_message: Optional[str] = Field(None, alias="errorMessage")
+
+    # 发货类型
+    shipment_type: Optional[str] = Field(..., alias="shipmentType")
+
+    # 用户设置发货类型
+    user_setting_shipment_type: str = Field(..., alias="userSettingShipmentType")
+
+    # 发货地址 ID
+    ship_from_address_id: Optional[int] = Field(None, alias="shipFromAddressId")
+
+    # 是否可拆分
+    can_split: Optional[bool] = Field(..., alias="canSplit")
+
+    # 追踪号
+    tracking_no: Optional[str] = Field(None, alias="trackingNo")
+
+    # 物流方式
+    shipping_method: str = Field(..., alias="shippingMethod")
+
+    # 标签列表
+    tag_list: Optional[list[str]] = Field(None, alias="tagList")
+
+    # 新标签列表
+    new_tag_list: Optional[list[dict]] = Field(None, alias="newTagList")
+
+    # 拆单编号
+    split_no: int = Field(..., alias="splitNo")
+
+    # 是否拆单
+    is_split: int = Field(..., alias="isSplit")
+
+    # ERP 是否标记发货
+    is_erp_mark_ship: int = Field(..., alias="isErpMarkShip")
+
+    # 标签地址
+    shipping_label_url: Optional[str] = Field(None, alias="shippingLabelUrl")
+
+    # 配送渠道类型
+    fulfillment_channel_type: int = Field(..., alias="fulfillmentChannelType")
+
+    # 标签打印时间
+    print_label_time: Optional[str] = Field(None, alias="printLabelTime")
+
+    # 拣货单打印时间
+    print_pick_time: Optional[str] = Field(None, alias="printPickTime")
+
+    # 装箱单打印时间
+    print_packing_slip_time: Optional[str] = Field(None, alias="printPackingSlipTime")
+
+    # 是否 17 物流挂号
+    is_register17: int = Field(..., alias="isRegister17")
+
+    # 第三方仓状态
+    third_party_warehouse_status: Optional[str] = Field(None, alias="thirdPartyWarehouseStatus")
+
+    # 订单类型
+    order_type: int = Field(..., alias="orderType")
+
+    # 被合并订单列表
+    be_merged_order_list: Optional[list[dict]] = Field(None, alias="beMergedOrderList")
+
+    # 买家申请取消
+    is_buyer_requested_cancel: int = Field(..., alias="isBuyerRequestedCancel")
+
+    # 是否作废
+    is_voided: int = Field(..., alias="isVoided")
+
+    # 地址信息
+    order_address_vo: Optional[FourSellerOrderAddressVo] = Field(..., alias="orderAddressVo")
+
+    # 时间信息
+    time_info: FourSellerTimeInfoVO = Field(..., alias="timeInfo")
+
+    # 包裹信息
+    package_info: FourSellerPackageInfoVO = Field(..., alias="packageInfo")
+
+    # 物流服务信息
+    shipping_service_info: FourSellerShippingServiceInfoVO = Field(..., alias="shippingServiceInfo")
+
+    # 商品列表
+    order_item_info_list: list[FourSellerOrderItemInfoVO] = Field(..., alias="orderItemInfoList")
+
+    # 是否样品订单
+    is_sample_order: int = Field(..., alias="isSampleOrder")
+
+    # 是否预售
+    pre_sale: Optional[int] = Field(..., alias="preSale")
+
+    model_config = ConfigDict(
+        populate_by_name=True
+    )

ey_commerce_lib/model.py

@@ -0,0 +1,12 @@
+from typing import Generic, TypeVar
+from pydantic import BaseModel
+
+T = TypeVar('T')
+
+
+class Page(Generic[T], BaseModel):
+    records: list[T]
+    page_number: int
+    page_size: int
+    total: int
+    total_page: int

ey_commerce_lib/utils/close.py

@@ -0,0 +1,6 @@
+async def safe_close(obj):
+    if obj is not None:
+        try:
+            await obj.close()
+        except Exception:
+            pass

{ey_commerce_lib-1.0.6.dist-info → ey_commerce_lib-1.0.7.dist-info}/METADATA

@@ -1,11 +1,13 @@
 Metadata-Version: 2.4
 Name: ey-commerce-lib
-Version: 1.0.6
+Version: 1.0.7
 Summary: eeyoung电商客户端调用封装
 Author-email: 饶奇奇 <1124393197@qq.com>
 Requires-Python: >=3.10
+Requires-Dist: ddddocr>=1.5.6
 Requires-Dist: httpx>=0.28.1
 Requires-Dist: lxml>=5.3.2
+Requires-Dist: playwright>=1.52.0
 Requires-Dist: pydantic>=2.11.3
 Requires-Dist: pytest-asyncio>=0.26.0
 Requires-Dist: pytest>=8.3.5

{ey_commerce_lib-1.0.6.dist-info → ey_commerce_lib-1.0.7.dist-info}/RECORD

@@ -1,4 +1,5 @@
 ey_commerce_lib/__init__.py,sha256=QTYqXqSTHFRkM9TEgpDFcHvwLbvqHDqvqfQ9EiXkcAM,23
+ey_commerce_lib/model.py,sha256=uL_xo6Zi2B4t44UB0HALv8On3NIV9cgHay00F_Gkecs,230
 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=GeUqUoOV9CMBjMucoIWQNhF-Idi2JSk9J0DF8M-AyJ0,21033
@@ -16,10 +17,22 @@ 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/order.py,sha256=uzhSgW0d7Z3L1yYb0meZ2AEF1OosnVM408W2-wZVriE,7802
 ey_commerce_lib/dxm/schemas/warehouse.py,sha256=kHxNMgkVHCILfAWuDhLN0Q5pDtb3Nd5qexnJowCSnrI,5082
+ey_commerce_lib/four_seller/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ey_commerce_lib/four_seller/main.py,sha256=Mz_Z0Vs-v0UmegOU_lo8eIpXmrWcL7_paRgBrm1s9_o,13131
+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
+ey_commerce_lib/four_seller/parser/order.py,sha256=Od8s86eQmq6LzB4nqOWKgF1jN4p2HeyNpBQNYZQ_Sf4,619
+ey_commerce_lib/four_seller/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ey_commerce_lib/four_seller/schemas/query/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ey_commerce_lib/four_seller/schemas/query/order.py,sha256=XV7by4RT9NWvei4C__cQsLTjMMZKLbK73N1GAU7RL7o,3714
+ey_commerce_lib/four_seller/schemas/vo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ey_commerce_lib/four_seller/schemas/vo/order.py,sha256=aNpnXSaXeUVbBz_7JtP8p6mWIWgUwejUhtYoa3gf4Po,12133
 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/list_util.py,sha256=R1w7B1m3sEXr38zSHWp-15C3xAs5ykYCCpvwmnRW4xs,545
 ey_commerce_lib/utils/str.py,sha256=939xE0y8U7KEWjwbEezMlaWJNBsfb2BSb-dBpYbOD8Q,138
-ey_commerce_lib-1.0.6.dist-info/METADATA,sha256=g-djWVYXp7FIvhyeBL04rw_6qJsX4LYf7tQvt2ovCZ8,326
-ey_commerce_lib-1.0.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ey_commerce_lib-1.0.6.dist-info/RECORD,,
+ey_commerce_lib-1.0.7.dist-info/METADATA,sha256=duPYCCK5-AgFPfWgoizwIJEQKmaz15fdTy6U_sH0Bzw,390
+ey_commerce_lib-1.0.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ey_commerce_lib-1.0.7.dist-info/RECORD,,