ey-commerce-lib 1.0.17__py3-none-any.whl → 1.0.19__py3-none-any.whl

ey_commerce_lib/dxm/main.py

@@ -6,17 +6,19 @@ from httpx import AsyncClient, Timeout
 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
+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.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, list_1688_purchase_order_number, \
     list_wait_pay_page_purchase_order_number
+from ey_commerce_lib.dxm.parser.tracking import parse_tracking_page
 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.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
 
 
@@ -710,10 +712,12 @@ class DxmClient:
         try:
             async with async_playwright() as p:
                 browser = await p.chromium.launch(
-                    headless=False,
+                    headless=True,
                     args=[
                         '--start-maximized',
                         '--disable-blink-features=AutomationControlled',
+                        '--no-sandbox',
+                        '--disable-dev-shm-usage'
                     ]
                 )
                 context = await browser.new_context()
@@ -729,21 +733,119 @@ class DxmClient:
                 ])
                 page = await context.new_page()
                 # 访问
-                await page.goto(f'{self.__base_url}/dxmCommodityProduct/openEditModal.htm?id={proid}&editOrCopy=0')
+                await page.goto(f'{self.__base_url}/dxmCommodityProduct/openEditModal.htm?id={proid}&editOrCopy=0',
+                                timeout=60000)
                 # 关闭模态框
-                await page.locator('#theNewestModalLabel > div.modal-dialog > div > div.modal-header > button').click()
+                try:
+                    await page.locator(
+                        '#theNewestModalLabel > div.modal-dialog > div > div.modal-header > button').click()
+                except:
+                    pass
                 # 输入sku
                 await page.locator('input.variationValue.ui-autocomplete-input').fill(front_sku)
                 # 失去焦点
                 await page.locator('input.variationValue.ui-autocomplete-input').press('Tab')
-                # 休眠两秒
-                await asyncio.sleep(2)
-                # 点击保存
-                await page.locator('.button.btn-orange.m-left10').first.click()
-                # 获取保存成功文本
-                await page.wait_for_selector('.alert-successGreen')
+                try:
+                    # 休眠两秒
+                    error_text = await page.text_content(selector='div.alert-dangerRed span', timeout=2000)
+                    return {
+                        'code': 500,
+                        'msg': error_text
+                    }
+                except Exception as e:
+                    # 创建监听任务
+                    async def wait_for_api1():
+                        async with page.expect_response(
+                                f"{self.__base_url}/dxmCommodityProduct/editCommodityProduct.json") as response_info:
+                            pass
+                        return await response_info.value
+
+                    async def wait_for_api2():
+                        async with page.expect_response(
+                                f"{self.__base_url}/dxmCommodityProduct/editCommodityProductGroup.json") as response_info:
+                            pass
+                        return await response_info.value
+
+                    # 创建并发任务
+                    task1 = asyncio.create_task(wait_for_api1())
+                    task2 = asyncio.create_task(wait_for_api2())
+                    # 点击保存按钮
+                    await page.locator('.button.btn-orange.m-left10').first.click()
+                    # 等待任何一个请求完成
+                    done, pending = await asyncio.wait(
+                        [task1, task2],
+                        return_when=asyncio.FIRST_COMPLETED
+                    )
+                    # 取消其他未完成的任务
+                    for task in pending:
+                        task.cancel()
+                    # 获取完成的请求结果
+                    completed_task = list(done)[0]
+                    response = await completed_task
+                    return await response.json()
         except Exception as e:
-            raise Exception(f'更新店小秘 仓库-商品详情中的平台sku失败-失败原因:{traceback.format_exc()}')
+            return {
+                'code': 500,
+                'msg': traceback.format_exc()
+            }
+
+    async def tracking_page_list(self, query: TrackingPageListQuery) -> Page[TrackingPageListItem]:
+        """
+        分页查询物流追踪页表
+        :param query:
+        :return:
+        """
+        async with self.__sem:
+            tracking_page_list_response = await self.__async_client.post('/tracking/pageList.htm',
+                                                                         data=query.model_dump(by_alias=True))
+            tracking_page_list_html = tracking_page_list_response.text
+            page = get_tracking_page_info(tracking_page_list_html)
+            page.records = parse_tracking_page(tracking_page_list_html)
+            return page
+
+    async def tracking_list(self, query: TrackingPageListQuery) -> list[TrackingPageListItem]:
+        async with self.__sem:
+            query.page_no = '1'
+            tracking_page_list_response = await self.__async_client.post('/tracking/pageList.htm',
+                                                                         data=query.model_dump(by_alias=True))
+            tracking_page_list_html = tracking_page_list_response.text
+            # 获取分页数据
+            page = get_tracking_page_info(tracking_page_list_html)
+            # 获取总页数
+            total_page = page.total_page
+            # 最终记录
+            result = parse_tracking_page(tracking_page_list_html)
+            for page_num in range(2, total_page + 1):
+                query.page_no = str(page_num)
+                # 获取分页数据
+                page_data = await self.tracking_page_list(query)
+                result.extend(page_data.records)
+            return result
+
+    async def tracking_show_detail(self, tracking_number: str, carrier_code: str):
+        """
+        物流追踪详情信息
+        """
+        async with self.__sem:
+            tracking_show_detail_response = await self.__async_client.post('/tracking/showDetail.json', data={
+                "trackingNumber": tracking_number,
+                "carrierCode": carrier_code
+            })
+            return tracking_show_detail_response.json()
+
+    async def order_prior_or_ban_ship(self, package_id: str, type_value: str):
+        """
+        禁运或优先发货
+        :param package_id:
+        :param type_value:
+        :return:
+        """
+        async with self.__sem:
+            order_prior_or_ban_ship_response = await self.__async_client.post('/order/orderPriorOrBanShip.json', data={
+                'packageId': package_id,
+                'type': type_value,
+            })
+            return order_prior_or_ban_ship_response.json()
 
     async def __aenter__(self):
         return self

ey_commerce_lib/dxm/parser/common.py

@@ -4,6 +4,7 @@ from typing import TypedDict
 from lxml import html
 
 from ey_commerce_lib.dxm.exception.common import PageInfoNotFoundException
+from ey_commerce_lib.model import Page
 
 
 class PageInfo(TypedDict):
@@ -92,3 +93,19 @@ def get_purchasing_page_info(html_str: str):
         'total_size': total_size,
         'page_number': page_number
     }
+
+
+def get_tracking_page_info(html_str: str):
+    tree = html.fromstring(html_str)
+    total = int(tree.xpath('//input[@id="totalSizeOrder"]/@value')[0])
+    page_size = int(tree.xpath('//input[@id="pageSizeOrder"]/@value')[0])
+    page_number = int(tree.xpath('//input[@id="pageNoOrder"]/@value')[0])
+    total_page = int(tree.xpath('//input[@id="totalPageOrder"]/@value')[0])
+    return Page(
+        total=total,
+        page_size=page_size,
+        page_number=page_number,
+        total_page=total_page,
+        records=[]
+    )
+

ey_commerce_lib/dxm/parser/order.py

@@ -37,13 +37,13 @@ def get_single_order_item_list(order_element: html.HtmlElement):
         source_presentation_element_list = [source_presentation_element.strip().split('：')[1]
                                             for source_presentation_element in source_presentation_element_list]
         try:
-            float(price.replace(',', ''))
-        except:
-            raise Exception(f'价格格式错误, sku是{sku}--价格是{price}')
+            price = float(price.replace(',', ''))
+        except Exception:
+            price = None
         sku_list.append({
             'sku': sku,
             'quantity': int(quantity),
-            'price': float(price.replace(',', '')),
+            'price': price,
             'currency': currency,
             'img': img,
             'variants': variant_list,
@@ -319,21 +319,23 @@ def get_order_detail_by_html(html_str: str):
         pair_info_sku = pair_info_element.xpath('.//span[@class="pairProInfoSku"]/text()')[0].split(' x')[0].strip()
         pair_info_sku_quantity = int(pair_info_element.xpath('.//span[@class="pairProInfoSku"]/span/text()')[0].strip())
         proid = get_str_list_first_not_blank_or_none(pair_info_element.xpath('.//input[@proid]/@proid'))
-        # warehouse_sku, warehouse_sku_quantity = pair_info_element.xpath(
-        #     './/div[contains(@class, "normalDiv")]/p[1]/text()')[0].split(' x ')
         warehouse_sku_info_list = pair_info_element.xpath('.//div[contains(@class, "normalDiv")]/p[1]/text()')
         warehouse_sku, warehouse_sku_quantity = None, None
         if len(warehouse_sku_info_list) > 0:
             warehouse_sku_info = warehouse_sku_info_list[0]
             warehouse_sku, warehouse_sku_quantity = warehouse_sku_info.split(' x ')
 
+        # 获取可用库存
         warehouse_available_quantity_element_list = pair_info_element.xpath(
             './/div[contains(@class, "normalDiv")]/p[2]/span[2]/text()')
-        warehouse_available_quantity_str = warehouse_available_quantity_element_list[0].strip()
-        if warehouse_available_quantity_str.endswith('+'):
-            warehouse_available_quantity_str = warehouse_available_quantity_str[:-1]
-        warehouse_available_quantity = int(warehouse_available_quantity_str) if len(
-            warehouse_available_quantity_element_list) > 0 else None
+        warehouse_available_quantity_str = get_str_list_first_not_blank_or_none(warehouse_available_quantity_element_list)
+        # 获取到可用库存节点
+        if warehouse_available_quantity_str is not None:
+            if warehouse_available_quantity_str.endswith('+'):
+                warehouse_available_quantity_str = warehouse_available_quantity_str[:-1]
+            warehouse_available_quantity = int(warehouse_available_quantity_str)
+        else:
+            warehouse_available_quantity = None
         pair_info_list.append({
             'pair_info_sku': pair_info_sku,
             'pair_info_sku_quantity': pair_info_sku_quantity,

ey_commerce_lib/dxm/parser/tracking.py

@@ -0,0 +1,56 @@
+from lxml import html
+
+from ey_commerce_lib.dxm.schemas.tracking import TrackingPageListItem
+from ey_commerce_lib.utils.list_util import get_str_list_first_not_blank_or_none
+
+
+def parse_tracking_page(html_content: str):
+    tree = html.fromstring(html_content)
+    # 物流追踪节点列表
+    tracking_element_list = tree.xpath('//tbody[@id="dhSysMsg"]/tr[@class="content"]')
+    tracking_list = []
+    for tracking_element in tracking_element_list:
+        # 获取包裹号
+        package_number = tracking_element.xpath('@data-tracknum')[0].strip()
+        # 获取订单id
+        order_id = tracking_element.xpath('@data-orderid')[0].strip()
+        # 获取收件人姓名
+        receiver_name = tracking_element.xpath('./td[3]/text()')[0].strip()
+        # 获取国家
+        country = get_str_list_first_not_blank_or_none(tracking_element.xpath('./td[3]/span/text()'))
+        # 获取物流方式
+        logistics_method = tracking_element.xpath('./td[4]/text()')[0].strip()
+        # 物流状态
+        logistics_status = tracking_element.xpath('./td[4]/span/@title')[0].replace('「', '').replace('」', '')
+        # 物流单号
+        logistics_number = tracking_element.xpath('./td[4]//span[@class="limingcentUrlpic"]/text()')[0].strip()
+        # carrierCode
+        carrier_code = get_str_list_first_not_blank_or_none(tracking_element.xpath('./td[5]/a/@data-carriercode'))
+        # 最新消息
+        latest_message = get_str_list_first_not_blank_or_none(tracking_element.xpath('./td[5]/text()'))
+        # 运输信息
+        transport_info = tracking_element.xpath('./td[6]/text()')[0].strip()
+        # 平台和店铺
+        platform, shop = tracking_element.xpath('./td[7]')[0].text_content().split('：')
+        time_list = []
+        # 获取时间
+        for time in tracking_element.xpath('./td[8]')[0].text_content().strip().split('\n'):
+            time_list.append(time.strip())
+        platform = platform.strip()
+        shop = shop.strip()
+        tracking_list.append(TrackingPageListItem(
+            package_number=package_number,
+            order_id=order_id,
+            receiver_name=receiver_name,
+            country=country,
+            logistics_method=logistics_method,
+            logistics_status=logistics_status,
+            logistics_number=logistics_number,
+            latest_message=latest_message,
+            transport_info=transport_info,
+            platform=platform,
+            shop=shop,
+            time_list=time_list,
+            carrier_code=carrier_code
+        ))
+    return tracking_list

ey_commerce_lib/dxm/schemas/tracking.py

@@ -0,0 +1,45 @@
+from typing import Optional
+
+from pydantic import BaseModel, Field, ConfigDict
+
+
+class TrackingPageListQuery(BaseModel):
+    page_no: str = Field('1', alias='pageNo', description='页码')
+    state_type: str = Field('all', alias='stateType', description='状态类型，默认 all(全部)')
+    platform: str = Field('', alias='platform', description='平台渠道')
+    shop_id: str = Field('-1', alias="shopId", description='店铺 ID')
+    country: str = Field('', alias="country", description="国家")
+    auth_id: str = Field('-1', alias="authId", description="物流方式")
+    ship_start_time: str = Field('', alias="shipStartTime", description="发货开始时间")
+    ship_end_time: str = Field('', alias="shipEndTime", description="发货结束时间")
+    track_start_time: str = Field('-1', alias='trackStartTime', description='运输天数')
+    track_end_time: str = Field('-1', alias='trackEndTime', description='运输天数')
+    is_comm: str = Field('', alias='isComm', description='备注')
+    order_field: str = Field('shipped_time', alias='orderField', description='排序方式')
+    is_desc: str = Field('1', alias='isDesc', description='排序方式')
+    search_type: str = Field('orderId', alias='searchType', description='搜索类型 orderId(订单id)')
+    search_value: str = Field('', alias="searchValue", description="搜索关键字")
+    is_del: str = Field('0', alias="isDel", description="是否删除，0 否 1 是")
+    history: str = Field('', alias="history", description="历史记录标志")
+    is_stop: str = Field('0', alias='isStop', description='是否暂停，0 正常追踪 1 暂停追踪')
+    no_update_days: str = Field('0', alias="noUpdateDays", description="异常类型 无更新天数")
+
+    model_config = ConfigDict(populate_by_name=True)
+
+
+class TrackingPageListItem(BaseModel):
+    package_number: str = Field(..., alias='packageNumber', description='包裹号')
+    order_id: str = Field(..., alias='orderId', description='订单号')
+    receiver_name: str = Field(..., alias='receiverName', description='收件人姓名')
+    country: Optional[str] = Field(..., alias='country', description='国家')
+    logistics_method: str = Field(..., alias='logisticsMethod', description='物流方式')
+    logistics_status: str = Field(..., alias='logisticsStatus', description='物流状态')
+    logistics_number: str = Field(..., alias='logisticsNumber', description='物流单号')
+    carrier_code: Optional[str] = Field(..., alias='carrierCode', description='物流公司编码')
+    latest_message: Optional[str] = Field(..., alias='latestMessage', description='最新物流信息')
+    transport_info: str = Field(..., alias='transportInfo', description='运输信息')
+    platform: str = Field(..., alias='platform', description='平台渠道')
+    shop: str = Field(..., alias='shop', description='店铺')
+    time_list: list[str] = Field([], alias='timeList', description='时间列表')
+
+    model_config = ConfigDict(populate_by_name=True)

{ey_commerce_lib-1.0.17.dist-info → ey_commerce_lib-1.0.19.dist-info}/METADATA

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

{ey_commerce_lib-1.0.17.dist-info → ey_commerce_lib-1.0.19.dist-info}/RECORD

@@ -2,24 +2,26 @@ 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=eSeZNRW5yyjYxPpubPBZxYWznk8NLHP6yizUDy2til8,29335
+ey_commerce_lib/dxm/main.py,sha256=bSOdWpdeZ4CKglp5KWk-BbUHwdsAwhqXeUkXnjugf0Y,34029
 ey_commerce_lib/dxm/order.py,sha256=hMdNm9X5h9tbvMWFnyE5hcSF4butzn7m-akGqLQUD0k,35
 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
 ey_commerce_lib/dxm/exception/common.py,sha256=DM5vItHdZCGK2Piqp2S5TFxPm3pioMzzlV-1RTxty00,159
 ey_commerce_lib/dxm/parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ey_commerce_lib/dxm/parser/common.py,sha256=-xfnaYhMStuvR-XEJTWAgTN2H88xflGtWXIrxDqbq0Q,3037
+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/order.py,sha256=vnu5jqea8IoTGk_kFlDcUnrZF5NKuBIQUGAYaxQVSg4,17972
+ey_commerce_lib/dxm/parser/order.py,sha256=ApFa02xFovrrJ4JHPL9NEJisKQO5v8NV485TpfmKgYA,17901
 ey_commerce_lib/dxm/parser/purchase.py,sha256=lmcC41HtdUqCgGamFASPnzHatUziLFaenTJmazsiMm0,5750
+ey_commerce_lib/dxm/parser/tracking.py,sha256=ND7Xo31lMycmRLXIYtPAXqOh2W-tmeFE8t-f-sNDLLI,2629
 ey_commerce_lib/dxm/parser/warehouse.py,sha256=oQVojPX8VKHUphdV1KY5ZK1PCFtOY2zwkyLNUeJ3JT0,3310
 ey_commerce_lib/dxm/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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/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
 ey_commerce_lib/dxm/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ey_commerce_lib/dxm/utils/dxm_commodity_product.py,sha256=OkL9Ve0lnSA2l-3DMWXF2fSj-A0uV4ucrhfEWNL2Z-Y,5398
@@ -53,6 +55,6 @@ ey_commerce_lib/utils/dxm.py,sha256=jVNltK_Pm_yMzXReD0Aw5VW6kzIZ5Bn23RucS0DKBI0,
 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.17.dist-info/METADATA,sha256=eBuSrosk2QW4clVeMWFVSs7KGrAuClEpMYz77F7hEzw,391
-ey_commerce_lib-1.0.17.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ey_commerce_lib-1.0.17.dist-info/RECORD,,
+ey_commerce_lib-1.0.19.dist-info/METADATA,sha256=7jzqPSilBEag4mOkYasADvKEZd3i3PsxjuszRyxmWso,391
+ey_commerce_lib-1.0.19.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ey_commerce_lib-1.0.19.dist-info/RECORD,,