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

ey_commerce_lib/dxm/main.py

@@ -9,7 +9,7 @@ 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.order import list_order_base_by_html, list_order_rule, get_rule_detail, \
-    get_order_detail_by_html
+    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, \
     list_wait_pay_page_purchase_order_number
 from ey_commerce_lib.dxm.parser.tracking import parse_tracking_page
@@ -28,7 +28,7 @@ class DxmClient:
         self.__cookies = cookies
         self.__headers = headers
         self.__sem = asyncio.Semaphore(sem)
-        timeout = Timeout(connect=5.0, read=20.0, write=10.0, pool=10.0)
+        timeout = Timeout(connect=60.0, read=60.0, write=60.0, pool=30.0)
         self.__base_url = 'https://www.dianxiaomi.com'
         self.__async_client = AsyncClient(base_url=self.__base_url, cookies=cookies, headers=headers,
                                           timeout=timeout)
@@ -847,6 +847,38 @@ class DxmClient:
             })
             return order_prior_or_ban_ship_response.json()
 
+    async def reply_msg(self, package_id: str, content: str):
+        """
+        回复消息
+        """
+        data = f'packageId={package_id}&content={content}'
+        async with self.__sem:
+            reply_msg_response = await self.__async_client.post('/replyMsg/reply.json', content=data)
+            return reply_msg_response.json()
+
+    async def get_authid_like_keyword(self, keyword: str) -> dict:
+        """
+        获取店小秘物流方式id,通过关键字模糊查询
+        :param keyword: 关键字
+        :return:
+        """
+        async with self.__sem:
+            data = {
+                'state': '',
+                'isVoided': '-1',
+                'isOversea': '-1',
+                'commitPlatform': '',
+                'prefixCount': '200',
+                'newVersion': '0',
+                'history': '',
+                'isBatch': '-1',
+                'isFree': '-1',
+            }
+
+            response = await self.__async_client.post('/package/commSearchList.htm', data=data)
+            comm_search_list_html = response.text
+            return parse_comm_search_list_html_get_authid_dict(comm_search_list_html, keyword)
+
     async def __aenter__(self):
         return self
 

ey_commerce_lib/dxm/parser/order.py

@@ -26,11 +26,16 @@ 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()'))
@@ -47,6 +52,7 @@ def get_single_order_item_list(order_element: html.HtmlElement):
             'currency': currency,
             'img': img,
             'variants': variant_list,
+            'origin_variants': origin_variants,
             'source_list': source_presentation_element_list
         })
     # 订单金额
@@ -176,6 +182,16 @@ def list_order_base_by_html(html_str: str) -> list[dict]:
                 logistics_info['track_number'] = get_str_list_first_not_blank_or_none(
                     order_first_element.xpath('.//td[6]//span[contains(@class, "limingcentUrlpicson")]/a/text()'))
                 logistics_info['logistics'] = logistics
+                # 称重重量
+                weight_element_list = order_first_element.xpath('.//td[6]//span[@class="gray-c"]/text()')
+                weight = None
+                for weight_element in weight_element_list:
+                    if '称重重量' in weight_element:
+                        # 如果包含了称重重量的话，获取完整的数字部分
+                        weight = float(re.search(r'\d+(?:\.\d+)?', weight_element).group())
+                # 设置重量部分
+                logistics_info['weight'] = weight
+
         # 状态
         if has_logistics:
             status = get_str_list_first_not_blank_or_none(order_first_element.xpath('.//td[7]/text()'))
@@ -328,7 +344,8 @@ def get_order_detail_by_html(html_str: str):
         # 获取可用库存
         warehouse_available_quantity_element_list = pair_info_element.xpath(
             './/div[contains(@class, "normalDiv")]/p[2]/span[2]/text()')
-        warehouse_available_quantity_str = get_str_list_first_not_blank_or_none(warehouse_available_quantity_element_list)
+        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('+'):
@@ -360,3 +377,21 @@ def get_order_detail_by_html(html_str: str):
         'pair_info_list': pair_info_list,
         'storage_id': storage_id
     }
+
+
+def parse_comm_search_list_html_get_authid_dict(html_str: str, keyword: str):
+    """
+    解析网页获取物流方式id字典
+    :param html_str:
+    :param keyword:
+    :return:
+    """
+    tree = html.fromstring(html_str)
+    logistics_authid_dict = {}
+    logistics_method_element_list = tree.xpath('//select[@id="advancedAuthSelect"]/option')
+    for logistics_method in logistics_method_element_list:
+        logistics_authid_text = str(logistics_method.xpath('text()')[0])
+        logistics_authid_value = logistics_method.xpath('@value')[0]
+        if keyword in logistics_authid_text:
+            logistics_authid_dict[logistics_authid_text] = logistics_authid_value
+    return logistics_authid_dict

ey_commerce_lib/kogan/main.py

@@ -11,7 +11,7 @@ class KoganClient:
     def __init__(self, seller_id: str, seller_token: str):
         self.seller_id = seller_id
         self.seller_token = seller_token
-        timeout = Timeout(connect=5.0, read=60.0, write=10.0, pool=10.0)
+        timeout = Timeout(connect=60.0, read=60.0, write=60.0, pool=30.0)
 
         # 异步客户端
         self.__async_client = AsyncClient(base_url="https://nimda.kogan.com",

ey_commerce_lib/takesend/main.py

@@ -6,7 +6,7 @@ from ey_commerce_lib.takesend.config import LOGIN_HEADERS, EDIT_HEADERS
 class TakeSendClient(object):
 
     def __init__(self, username: str, password: str):
-        timeout = Timeout(connect=5.0, read=20.0, write=10.0, pool=10.0)
+        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)
@@ -30,7 +30,7 @@ class TakeSendClient(object):
         }
         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):
         """
         修改泰嘉产品上传重量数据
         :param excel_data:

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

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

{ey_commerce_lib-1.0.19.dist-info → ey_commerce_lib-1.0.21.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=bSOdWpdeZ4CKglp5KWk-BbUHwdsAwhqXeUkXnjugf0Y,34029
+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/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=ApFa02xFovrrJ4JHPL9NEJisKQO5v8NV485TpfmKgYA,17901
+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
 ey_commerce_lib/dxm/parser/warehouse.py,sha256=oQVojPX8VKHUphdV1KY5ZK1PCFtOY2zwkyLNUeJ3JT0,3310
@@ -38,7 +38,7 @@ ey_commerce_lib/four_seller/schemas/query/order.py,sha256=XV7by4RT9NWvei4C__cQsL
 ey_commerce_lib/four_seller/schemas/vo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ey_commerce_lib/four_seller/schemas/vo/order.py,sha256=c-Z6KQRugsJmxQJEztsH1nzqrg3KvK4Q5xm6xEyjbJM,12135
 ey_commerce_lib/kogan/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ey_commerce_lib/kogan/main.py,sha256=wkjaTv1d0lxYDUT9R0rnFpg1g4KW4ZLYW227xrs4ooM,2216
+ey_commerce_lib/kogan/main.py,sha256=4Kh6M_fIjxXrV3HjuXC7JB3cYfhxJh1rpdteQAKDAGg,2217
 ey_commerce_lib/kogan/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ey_commerce_lib/kogan/schemas/query/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ey_commerce_lib/kogan/schemas/query/order.py,sha256=ajqO992fiorUDg3-YPPpK2Dgmdy2LoHfz4IatBz1Mro,574
@@ -48,13 +48,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=Omz7Wmo0bBzQvMA-_zVQG1sH-W-RsX5AeetFE2a1S0M,1569
+ey_commerce_lib/takesend/main.py,sha256=kYnRQxAgLWagyKr8ilLG7XrF2sG0ANoXoVm47fAANZ8,1568
 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.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,,
+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,,