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

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/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-1.0.18.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.18
+Version: 1.0.19
 Summary: eeyoung电商客户端调用封装
 Author-email: 饶奇奇 <1124393197@qq.com>
 Requires-Python: >=3.10

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

@@ -2,7 +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=XJ_n9aiLK9QOJ6b-eypwk3slbdV4C5d-vs9ceGG3zfI,33048
+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
@@ -12,7 +12,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/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
@@ -55,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.18.dist-info/METADATA,sha256=izsvwLI_75aS7a_ZkpSmdGrXiRO4aXE2yMyMMAkJj3U,391
-ey_commerce_lib-1.0.18.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ey_commerce_lib-1.0.18.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,,