ey-commerce-lib 1.0.8__py3-none-any.whl → 1.0.10__py3-none-any.whl

ey_commerce_lib/dxm/main.py

@@ -10,7 +10,7 @@ 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.order import DxmOrderSearchForm, DxmJsonResponse, DxmCheckProcessResponse, DxmOrderRule
 from ey_commerce_lib.dxm.schemas.warehouse import WarehouseProduct, WarehouseProductQuery, PurchasingAllQuery
-from httpx import AsyncClient
+from httpx import AsyncClient, Timeout
 
 
 class DxmClient:
@@ -19,7 +19,9 @@ class DxmClient:
         self.__cookies = cookies
         self.__headers = headers
         self.__sem = asyncio.Semaphore(sem)
-        self.__async_client = AsyncClient(base_url="https://www.dianxiaomi.com", cookies=cookies, headers=headers)
+        timeout = Timeout(connect=5.0, read=20.0, write=10.0, pool=10.0)
+        self.__async_client = AsyncClient(base_url="https://www.dianxiaomi.com", cookies=cookies, headers=headers,
+                                          timeout=timeout)
 
     async def page_order_base_async(self, query: DxmOrderSearchForm):
         """
@@ -549,6 +551,85 @@ class DxmClient:
             })
             return submit_audit_res.json()
 
+    async def get_order_mark_content(self):
+        """
+        获取订单标记内容列表
+        :return: 订单标记内容列表
+        """
+        async with self.__sem:
+            get_order_mark_content_res = await self.__async_client.get('/package/getOrderMarkContent.json')
+            get_order_mark_content_data = get_order_mark_content_res.json()
+            if get_order_mark_content_data.get('code') != 0:
+                raise Exception(f'获取订单标记数据失败错误原因{get_order_mark_content_data.get('msg')}')
+            data = get_order_mark_content_data.get('data', {})
+            result = []
+            for key in data.keys():
+                val = data.get(key)
+                val['key'] = key
+                result.append(val)
+            return result
+
+    async def add_or_update_user_comment(self, data):
+        """
+        添加或修改订单自定义标记
+        :param data:
+        :return:
+        """
+        async with self.__sem:
+            add_or_update_user_comment_res = await self.__async_client.post('/package/addOrUpdateUserComment.json',
+                                                                            data=data)
+            return add_or_update_user_comment_res.json()
+
+    async def get_picking_comment_by_pack_id(self, package_id: str):
+        """
+        获取订单备注(只有拣货说明)
+        :param package_id:
+        :return: 没有返回None 有返回字典数据
+        """
+        async with self.__sem:
+            data = {
+                'packageId': package_id,
+            }
+            get_comment_by_pack_id_res = await self.__async_client.post('/dxmPackageComment/getByPackId.json',
+                                                                        data=data)
+            data = get_comment_by_pack_id_res.json()
+            if data.get('code') != 0:
+                raise Exception(f'获取订单标记数据失败错误原因{data.get("msg")}')
+            return data.get('dxmPackageComment')
+
+    async def add_comment(self, pacakge_id: str, comment_type: str, content: str, color: str, comment_id: str = '',
+                          history: str = ''):
+        """
+        添加订单标记
+        :param pacakge_id:
+        :param comment_type: 备注类型 sys_picking(拣货备注)  sys_service(客服v备注)
+        :param content: 备注内容
+        :param color: 颜色值
+        :param comment_id: 备注id(只有)
+        :param history:
+        :return:
+        """
+        if comment_type not in ['sys_picking', 'sys_service']:
+            raise Exception(f'备注类型只能是拣货说明和客服备注，当前是{comment_type}')
+        data = {
+            'packageId': pacakge_id,
+            'commentType': comment_type,
+            'content': content,
+            'color': color,
+            'history': history
+        }
+        if comment_type == 'sys_service':
+            if str(comment_id).strip() == '':
+                raise Exception(f'客服备注必须指定备注id')
+            # 修改客服备注要指定备注id
+            data['commentId'] = comment_id
+        async with self.__sem:
+            add_comment_res = await self.__async_client.post('/dxmPackageComment/add.json', data=data)
+            data = add_comment_res.json()
+            if data.get('code') != 0:
+                raise Exception(f'添加订单标记数据失败错误原因{add_comment_res.json().get("msg")}')
+            return data
+
     async def __aenter__(self):
         return self
 

ey_commerce_lib/dxm/parser/order.py

@@ -30,13 +30,19 @@ def get_single_order_item_list(order_element: html.HtmlElement):
                 'name': variant.split('：')[0].strip(),
                 'value': variant.split('：')[1].strip()
             })
+        # 获取来源数据
+        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]
         sku_list.append({
             'sku': sku,
             'quantity': int(quantity),
             'price': float(price.replace(',', '')),
             'currency': currency,
             'img': img,
-            'variants': variant_list
+            'variants': variant_list,
+            'source_list': source_presentation_element_list
         })
     # 订单金额
     currency, price = order_element.xpath('./td[2]/text()')[0].strip().split(' ')
@@ -142,6 +148,8 @@ def list_order_base_by_html(html_str: str) -> list[dict]:
         package_id = good_element.xpath('.//input[@class="input1"]/@value')[0]
         # authid 物流方式的id
         auth_id = good_element.xpath(f'.//input[@id="dxmAuthId{package_id}"]/@value')[0]
+        # data-custom-mark标记
+        data_custom_mark = get_str_list_first_not_blank_or_none(good_element.xpath('@data-custom-mark'))
         buyer_select_provider = get_order_buyer_select_provider(good_element)
         order_form_source = good_element.xpath('.//span[contains(@class, "order-form-source")]/text()')[0]
         platform, shop = order_form_source.replace('「', '').replace('」', '').split('：')
@@ -179,6 +187,7 @@ def list_order_base_by_html(html_str: str) -> list[dict]:
             'package_id': package_id,
             'auth_id': auth_id,
             'package_number': package_number,
+            'data_custom_mark': data_custom_mark,
             'buyer_select_provider': buyer_select_provider,
             'platform': platform,
             'shop': shop,

ey_commerce_lib/dxm/utils/mark.py

@@ -0,0 +1,109 @@
+def get_power_indices(n: int) -> list:
+    """
+    输入一个整数 n，返回一个列表，列表中的每个数字代表 n 的二进制表示中对应为1的位的幂次（从0开始计数）
+
+    例如：
+      - n = 5（二进制 101），返回 [0, 2]
+      - n = 32（二进制 100000），返回 [5]
+    """
+    result = []
+    power = 0
+    while n:
+        # 判断当前最低位是否为1
+        if n & 1:
+            result.append(power)
+        n >>= 1  # 右移一位，相当于除以2
+        power += 1
+    return result
+
+
+# 定义店小秘的标记颜色
+CUSTOMER_ORDER_MARK_COLORS = ['isGreen', 'isYellow', 'isOrange', 'isRed', 'isViolet', 'isBlue', 'cornflowerBlue',
+                              'pink', 'teal', 'turquoise']
+
+
+def get_custom_mark_content_list_by_data_custom_mark(data_custom_mark: str, custom_mark_config: list):
+    """
+    根据店小秘订单标记数据，返回一个列表，列表中的每个元素代表一个标记的内容
+    :param custom_mark_config: 标记配置
+    :param data_custom_mark: 店小秘订单标记数据，html中data_custom_mark的值
+    :return:
+    """
+    mark_content_list = []
+    for index, mkv in enumerate(data_custom_mark.split(',')):
+        color_value = int(mkv)
+        # 根据CUSTOMER_ORDER_MARK_COLORS的位置一一判断
+        for color_number in get_power_indices(color_value):
+            # 拿到运算后颜色序号值 列入isGreen_1 的序号值
+            # 自定义标记的key
+            mark_key = f'{CUSTOMER_ORDER_MARK_COLORS[index]}_{color_number}'
+            for config in custom_mark_config:
+                if config['key'] == mark_key:
+                    mark_content_list.append(config['content'])
+                    break
+    return mark_content_list
+
+
+def lowercase_first_letter(s):
+    if not s:
+        return s
+    return s[0].lower() + s[1:]
+
+
+def generate_add_or_update_user_comment_data_by_content_list(package_id: str, content_list: list,
+                                                             custom_mark_config: list,
+                                                             history: str = ''
+                                                             ):
+    """
+    根据内容列表生成店小秘新增或者修改自定义标志的接口数据
+    :param history: 是否为历史订单 默认值不是
+    :param package_id: 店小秘包裹id
+    :param custom_mark_config: 自定义标注配置
+    :param content_list: 标注内容列表
+    :return:
+    """
+    data = {}
+    # 先对content_list去重,防止生成重复标记
+    content_list = list(set(content_list))
+    #============================================================
+    # 计算标记颜色值start
+    #============================================================
+    # 准备计算标记的颜色值字典
+    ready_calc_color_dict = {}
+    # 在根据内容列表去计算颜色值
+    for content in content_list:
+        for config in custom_mark_config:
+            # 内容匹配上并且颜色是要带生成最终计算数值的二进制索引的key
+            mark_key_list = config['key'].split('_')
+            # 设置标注的内容匹配上了，并且是带有计算二进制位数的
+            if config['content'] == content and len(mark_key_list) == 2:
+                color = config['color']
+                if ready_calc_color_dict.get(color) is None:
+                    ready_calc_color_dict[color] = []
+                # 添加颜色对应的索引值
+                ready_calc_color_dict[color].append(int(mark_key_list[1]))
+                break
+    # 计算颜色值
+    for index, color in enumerate(CUSTOMER_ORDER_MARK_COLORS):
+        color_keys = ready_calc_color_dict.keys()
+        if color in color_keys:
+            # 计算索引位置的二进制值
+            data[color] = sum([2 ** i for i in ready_calc_color_dict[color]])
+        else:
+            # 没有设置颜色值取0
+            data[color] = 0
+    # ============================================================
+    # 计算标记颜色值end
+    # ============================================================
+
+    #生成颜色对应内容
+    for color in CUSTOMER_ORDER_MARK_COLORS:
+        for config in custom_mark_config:
+            # 如果标记值和颜色常量匹配上
+            if config['key'] == color:
+                color_content_key = f"{lowercase_first_letter(color.replace('is', ''))}Content"
+                data[color_content_key] = config['content']
+                break
+    data['history'] = history
+    data['orderId'] = package_id
+    return data

ey_commerce_lib/kogan/main.py

@@ -1,4 +1,4 @@
-from httpx import AsyncClient
+from httpx import AsyncClient, Timeout
 
 from ey_commerce_lib.kogan.schemas.query.order import KoganOrderQuery
 from ey_commerce_lib.kogan.schemas.query.product import KoganProductQuery
@@ -11,13 +11,17 @@ 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=20.0, write=10.0, pool=10.0)
+
         # 异步客户端
         self.__async_client = AsyncClient(base_url="https://nimda.kogan.com",
                                           headers={
                                               'Accept': 'application/json',
                                               'SellerId': self.seller_id,
                                               'SellerToken': self.seller_token
-                                          })
+                                          },
+                                          timeout=timeout
+                                          )
 
     async def orders(self, query_params: KoganOrderQuery):
         # 设置查询参数
@@ -31,6 +35,7 @@ class KoganClient:
                                                      params=query_params.model_dump(by_alias=True,
                                                                                     exclude_none=True
                                                                                     ))
+
         return ProductResponse(**products_res.json())
 
     async def __aenter__(self):

{ey_commerce_lib-1.0.8.dist-info → ey_commerce_lib-1.0.10.dist-info}/METADATA

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

{ey_commerce_lib-1.0.8.dist-info → ey_commerce_lib-1.0.10.dist-info}/RECORD

@@ -2,7 +2,7 @@ ey_commerce_lib/__init__.py,sha256=QTYqXqSTHFRkM9TEgpDFcHvwLbvqHDqvqfQ9EiXkcAM,2
 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
+ey_commerce_lib/dxm/main.py,sha256=aNYkE3HA3OrhnfN-RLq24Sha7fm-9d2uytRM_6wSLqI,24726
 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
@@ -10,13 +10,15 @@ ey_commerce_lib/dxm/exception/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 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=-3OwoGsuHpugFS96OAzimZTXLkH7qZqmNvP-kvVSndM,3035
-ey_commerce_lib/dxm/parser/order.py,sha256=tOvMuP_Ld8muL6sBoqGXtgaLPBiBW8Xeu5WSDIhzEXY,16580
+ey_commerce_lib/dxm/parser/order.py,sha256=_MIkdXkgi8clZuGoc8BJe3qMh2kmfCKLLG20zyoC1vU,17248
 ey_commerce_lib/dxm/parser/purchase.py,sha256=7ULQHAIqUuUcpvWM1ut7uqCQhwE-DcQ7K3qftsfNlK8,5768
 ey_commerce_lib/dxm/parser/warehouse.py,sha256=LfmqVixV5IcnPvr6Ma4XYoWUdXixQ16xzPP07bJrWb0,3192
 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/order.py,sha256=uzhSgW0d7Z3L1yYb0meZ2AEF1OosnVM408W2-wZVriE,7802
 ey_commerce_lib/dxm/schemas/warehouse.py,sha256=kHxNMgkVHCILfAWuDhLN0Q5pDtb3Nd5qexnJowCSnrI,5082
+ey_commerce_lib/dxm/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ey_commerce_lib/dxm/utils/mark.py,sha256=rAmofi3JmdI8gdl3s-U0ZEKcA-cn6vtS3lsXDrVXRLc,4716
 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
@@ -29,7 +31,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=aNpnXSaXeUVbBz_7JtP8p6mWIWgUwejUhtYoa3gf4Po,12133
 ey_commerce_lib/kogan/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ey_commerce_lib/kogan/main.py,sha256=hHW-R3CYwzyFGFO7nzLHhwnFsz06a0hPE2cwdsiwwSM,2025
+ey_commerce_lib/kogan/main.py,sha256=fROFOUd80qtsnggz5XR3vyoSAcb6PqFD1_rqSbAtYhE,2216
 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
@@ -42,6 +44,6 @@ ey_commerce_lib/utils/close.py,sha256=-De_H1I-gryytKYhLMsC3HfW67W852XkP1ckK2gLsF
 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.8.dist-info/METADATA,sha256=pwSNg0XUKe41gqcoJgdBmvqdZtH4E0BGjE4Ban1CLY4,390
-ey_commerce_lib-1.0.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ey_commerce_lib-1.0.8.dist-info/RECORD,,
+ey_commerce_lib-1.0.10.dist-info/METADATA,sha256=fLcVW4n7xGfi1eKRTmNZQH29q8J0KCc0gTo-mYOSfHc,391
+ey_commerce_lib-1.0.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ey_commerce_lib-1.0.10.dist-info/RECORD,,