ey-commerce-lib 1.0.18__tar.gz → 1.0.20__tar.gz

{ey_commerce_lib-1.0.18 → ey_commerce_lib-1.0.20}/PKG-INFO

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

{ey_commerce_lib-1.0.18 → ey_commerce_lib-1.0.20}/pyproject.toml

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

{ey_commerce_lib-1.0.18 → ey_commerce_lib-1.0.20}/src/ey_commerce_lib/dxm/main.py

@@ -822,6 +822,31 @@ class DxmClient:
                 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-1.0.18 → ey_commerce_lib-1.0.20}/src/ey_commerce_lib/dxm/parser/order.py

@@ -26,27 +26,33 @@ def get_single_order_item_list(order_element: html.HtmlElement):
         variants = sku_element.xpath(
             './/p[@class="pairProInfoName orderPairNameIsOverlength"]/span[@class="isOverLengThHide"]/text()')
         variant_list = list()
+        # 原来的变种
+        origin_variants = []
         for variant in variants:
-            variant_list.append({
-                'name': variant.split('：')[0].strip(),
-                'value': variant.split('：')[1].strip()
-            })
+            if len(variant.split('：')) == 2:
+                variant_list.append({
+                    'name': variant.split('：')[0].strip(),
+                    'value': variant.split('：')[1].strip()
+                })
+            else:
+                origin_variants.append(variant)
         # 获取来源数据
         source_presentation_element_list = (sku_element.
                                             xpath('.//ul[@id="dropSourceUrl"]/li[@role="presentation"]/a/text()'))
         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,
+            'origin_variants': origin_variants,
             'source_list': source_presentation_element_list
         })
     # 订单金额
@@ -319,21 +325,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,