ey-commerce-lib 1.0.14__tar.gz → 1.0.15__tar.gz

{ey_commerce_lib-1.0.14 → ey_commerce_lib-1.0.15}/PKG-INFO

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

{ey_commerce_lib-1.0.14 → ey_commerce_lib-1.0.15}/pyproject.toml

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

{ey_commerce_lib-1.0.14 → ey_commerce_lib-1.0.15}/src/ey_commerce_lib/dxm/main.py

@@ -1,6 +1,8 @@
 import asyncio
+import time
 
 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
@@ -24,7 +26,8 @@ class DxmClient:
         self.__headers = headers
         self.__sem = asyncio.Semaphore(sem)
         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,
+        self.__base_url = 'https://www.dianxiaomi.com'
+        self.__async_client = AsyncClient(base_url=self.__base_url, cookies=cookies, headers=headers,
                                           timeout=timeout)
 
     async def page_order_base_async(self, query: DxmOrderSearchForm):
@@ -694,6 +697,42 @@ class DxmClient:
                 data=data)
             return ViewDxmCommodityProductResponse.model_validate(view_dxm_commodity_product_res.json())
 
+    async def update_dxm_commodity_front_sku(self, proid: str, front_sku: str):
+        """
+        更新店小秘 仓库-商品详情中的平台sku
+        :param proid:
+        :param front_sku:
+        :return:
+        """
+        # 打开浏览器
+        try:
+            async with async_playwright() as p:
+                browser = await p.chromium.launch(headless=True)
+                context = await browser.new_context()
+                # 设置cookie和headers
+                await context.add_cookies([
+                    {
+                        "name": name,  # cookie 名称
+                        "value": value,  # cookie 值
+                        "domain": ".dianxiaomi.com",  # 替换为你的目标域名
+                        "path": "/",  # cookie 路径
+                    }
+                    for name, value in self.__cookies.items()
+                ])
+                page = await context.new_page()
+                # 访问
+                await page.goto(f'{self.__base_url}/dxmCommodityProduct/openEditModal.htm?id={proid}&editOrCopy=0')
+                # 输入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()
+        except Exception as e:
+            raise Exception(f'更新店小秘 仓库-商品详情中的平台sku失败-失败原因:{e}')
+
     async def __aenter__(self):
         return self
 

{ey_commerce_lib-1.0.14 → ey_commerce_lib-1.0.15}/src/ey_commerce_lib/dxm/parser/order.py

@@ -39,7 +39,7 @@ def get_single_order_item_list(order_element: html.HtmlElement):
         try:
             float(price.replace(',', ''))
         except:
-            raise Exception(f'价格格式错误, sku是{sku}')
+            raise Exception(f'价格格式错误, sku是{sku}--价格是{price}')
         sku_list.append({
             'sku': sku,
             'quantity': int(quantity),

{ey_commerce_lib-1.0.14 → ey_commerce_lib-1.0.15}/src/ey_commerce_lib/dxm/schemas/dxm_commodity_product.py

@@ -285,7 +285,7 @@ class DxmCommodityProduct(BaseModel):
     current_sku_count: int = Field(0, alias="currentSkuCount", description="当前SKU计数")
     reference_by_group: int = Field(0, alias="referenceByGroup", description="按组引用")
     agent_name: Optional[str] = Field(None, alias="agentName", description="代理商名称")
-    development_name: str = Field(..., alias="developmentName", description="开发人员名称")
+    development_name: Optional[str] = Field(..., alias="developmentName", description="开发人员名称")
     sales_name: Optional[str] = Field(None, alias="salesName", description="销售人员名称")
     productuu_id: Optional[str] = Field(None, alias="productuuId", description="商品UUID")
     auth_id: Optional[str] = Field(None, alias="authId", description="授权ID")
@@ -335,12 +335,12 @@ class ProductDTO(BaseModel):
                                                             description="DXM商品列表")
     spu: Optional[str] = Field(None, alias="spu", description="SPU编码")
     dxm_product_packs: List[Any] = Field(..., alias="dxmProductPacks", description="DXM商品包装列表")
-    supplier_product_relation_map_list: List[SupplierProductRelation] = Field(...,
+    supplier_product_relation_map_list: Optional[List[SupplierProductRelation]] = Field(...,
                                                                               alias="supplierProductRelationMapList",
                                                                               description="供应商商品关系映射列表")
-    dxm_warehouse_product_list: List[DxmWarehouseProduct] = Field(..., alias="dxmWarehouseProductList",
+    dxm_warehouse_product_list: Optional[List[DxmWarehouseProduct]] = Field(..., alias="dxmWarehouseProductList",
                                                                   description="DXM仓库商品列表")
-    count: int = Field(0, alias="count", description="计数")
+    count: Optional[int] = Field(0, alias="count", description="计数")
 
     model_config = ConfigDict(populate_by_name=True)
 
@@ -377,7 +377,7 @@ class EditDxmCommodityProduct(BaseModel):
     width: int
     height: int
     qc_type: int = Field(..., alias="qcType")
-    product_status: str = Field(..., alias="productStatus")
+    product_status: int = Field(..., alias="productStatus")
     child_ids: str = Field("", alias="childIds")
     child_nums: str = Field("", alias="childNums")
     process_fee: int = Field(..., alias="processFee")
@@ -408,8 +408,8 @@ class EditSupplierProductRelationMap(BaseModel):
 
 
 class EditObj(BaseModel):
-    dxm_commodity_product: DxmCommodityProduct = Field(..., alias="dxmCommodityProduct")
-    dxm_product_customs: DxmProductCustoms = Field(..., alias="dxmProductCustoms")
+    dxm_commodity_product: EditDxmCommodityProduct = Field(..., alias="dxmCommodityProduct")
+    dxm_product_customs: EditDxmProductCustoms = Field(..., alias="dxmProductCustoms")
     warehouse_id_list: str = Field("", alias="warehouseIdList")
     supplier_product_relation_map_list: List[EditSupplierProductRelationMap] = Field(..., alias="supplierProductRelationMapList")
     dxm_product_packs: List = Field(..., alias="dxmProductPacks")

{ey_commerce_lib-1.0.14 → ey_commerce_lib-1.0.15}/src/ey_commerce_lib/dxm/utils/dxm_commodity_product.py

@@ -1,4 +1,7 @@
+import json
+
 from ey_commerce_lib.dxm.schemas.dxm_commodity_product import ViewDxmCommodityProductResponse, EditObj
+from ey_commerce_lib.utils.float import truncate_decimal_str
 
 
 def get_edit_commodity_product_by_view_dxm_response(data: ViewDxmCommodityProductResponse):
@@ -14,7 +17,7 @@ def get_edit_commodity_product_by_view_dxm_response(data: ViewDxmCommodityProduc
     name_en = dxm_commodity_product.name_en
     sku_code = dxm_commodity_product.sku_code
     sku = dxm_commodity_product.sku
-    product_variation_str = dxm_commodity_product.product_variation_str
+    product_variation_str = ','.join(dxm_commodity_product.product_variation_str_list)
     sbm_id = dxm_commodity_product.sbm_id
     agent_id = dxm_commodity_product.agent_id
     development_id = dxm_commodity_product.development_id
@@ -46,7 +49,7 @@ def get_edit_commodity_product_by_view_dxm_response(data: ViewDxmCommodityProduc
     name_cn_bg = dxm_product_customs.name_cn
     name_en_bg = dxm_product_customs.name_en
     weight_bg = dxm_product_customs.weight
-    price_bg = dxm_commodity_product.price_bg
+    price_bg = dxm_product_customs.price
     material_bg = dxm_commodity_product.material_bg
     purpose_bg = dxm_commodity_product.purpose_bg
     hgbm_bg = dxm_commodity_product.hgbm_bg
@@ -54,7 +57,7 @@ def get_edit_commodity_product_by_view_dxm_response(data: ViewDxmCommodityProduc
 
     warehouse_id_list = data.product_dto.warehouse_id_list
 
-    supplier_product_relation_map_list = data.product_dto.supplier_product_relation_map_list
+    supplier_product_relation_map_list = data.product_dto.supplier_product_relation_map_list or []
     new_supplier_product_relation_map_list = []
     for supplier_product_relation_map in supplier_product_relation_map_list:
         supplier_id = supplier_product_relation_map.supplier_id
@@ -65,22 +68,22 @@ def get_edit_commodity_product_by_view_dxm_response(data: ViewDxmCommodityProduc
         })
 
     dxm_product_packs = data.product_dto.dxm_product_packs
-
+    # sbmId 必须为字符串
     return EditObj.model_validate({
         'dxmCommodityProduct': {
-            'productId': product_id,
+            'productId': str(product_id),
             'name': name,
             'nameEn': name_en,
             'skuCode': sku_code,
             'sku': sku,
             'productVariationStr': product_variation_str,
-            'sbmId': sbm_id,
-            'agentId': agent_id,
-            'developmentId': development_id,
-            'salesId': sales_id,
-            'weight': weight,
-            'allowWeightError': allow_weight_error,
-            'price': price,
+            'sbmId': sbm_id if sbm_id is not None else '',
+            'agentId': str(agent_id),
+            'developmentId': str(development_id),
+            'salesId': str(sales_id),
+            'weight': truncate_decimal_str(weight),
+            'allowWeightError': '',
+            'price': truncate_decimal_str(price),
             'sourceUrl': source_url,
             'imgUrl': img_url,
             'isUsed': is_used,
@@ -90,29 +93,30 @@ def get_edit_commodity_product_by_view_dxm_response(data: ViewDxmCommodityProduc
             'width': width,
             'height': height,
             'qcType': qc_type,
-            'productStatus': product_status,
-            'childIds': child_ids,
-            'childNums': child_nums,
+            'productStatus': 1,
+            'childIds': child_ids if child_ids is not None else '',
+            'childNums': child_nums if child_nums is not None else '',
             'processFee': process_fee,
-            'qcContent': qc_content,
+            'qcContent': qc_content if qc_content is not None else '',
             'qcImgNum': qc_img_num,
-            'groupState': group_state,
-            'ncm': ncm,
-            'cest': cest,
-            'unit': unit,
-            'origin': origin
+            'groupState': str(group_state),
+            'ncm': ncm if ncm is not None else '',
+            'cest': cest if cest is not None else '',
+            'unit': unit if unit is not None else '',
+            'origin': origin if origin is not None else '0'
         },
         'dxmProductCustoms': {
             'nameCnBg': name_cn_bg,
             'nameEnBg': name_en_bg,
-            'weightBg': weight_bg,
-            'priceBg': price_bg,
-            'materialBg': material_bg,
-            'purposeBg': purpose_bg,
-            'hgbmBg': hgbm_bg,
-            'dangerDesBg': danger_des_bg
+            'weightBg': truncate_decimal_str(weight_bg),
+            'priceBg': truncate_decimal_str(price_bg, 4),
+            'materialBg': material_bg if material_bg is not None else '',
+            'purposeBg': purpose_bg if purpose_bg is not None else '',
+            'hgbmBg': hgbm_bg if hgbm_bg is not None else '',
+            'dangerDesBg': danger_des_bg if danger_des_bg is not None else '0'
         },
-        'warehouseIdList': warehouse_id_list,
+        'warehouseIdList': warehouse_id_list if warehouse_id_list is not None else '',
         'supplierProductRelationMapList': new_supplier_product_relation_map_list,
         'dxmProductPacks': dxm_product_packs
     }).model_dump_json(by_alias=True)
+

ey_commerce_lib-1.0.15/src/ey_commerce_lib/utils/float.py

@@ -0,0 +1,30 @@
+from decimal import Decimal, ROUND_DOWN
+
+
+def truncate_decimal(number, digits=2):
+    """
+    截断保留指定位数的小数（不四舍五入），并保留末尾的 0
+    :param number: 输入的数字（int/float）
+    :param digits: 保留的小数位数（默认2位）
+    :return: 返回字符串形式，确保末尾 0 不省略
+    """
+    if isinstance(number, int):
+        return f"{number}.{'0' * digits}"
+
+    decimal_num = Decimal(str(number))
+    truncated = decimal_num.quantize(
+        Decimal('0.' + '0' * digits),
+        rounding=ROUND_DOWN
+    )
+    return format(truncated, f".{digits}f")  # 强制保留末尾 0
+
+
+def truncate_decimal_str(number, digits=2):
+    """
+    使用decimal模块实现（最精确的方式）
+    """
+    return str(truncate_decimal(number, digits))
+
+
+if __name__ == '__main__':
+    print(truncate_decimal(200.000, 4))

ey_commerce_lib-1.0.15/tests/dxm/test_purchase.py

@@ -0,0 +1,91 @@
+import json
+
+import pytest
+
+from ey_commerce_lib.dxm.constant.order import ORDER_SEARCH_APPROVAL_BASE_FORM, \
+    ORDER_SEARCH_PENDING_PROCESSING_BASE_FORM, ORDER_SEARCH_SELF_WAREHOUSE_BASE_FORM, \
+    ORDER_SEARCH_OUT_OF_STOCK_BASE_FORM, ORDER_SEARCH_HAVE_GOODS_BASE_FORM
+from ey_commerce_lib.dxm.main import DxmClient
+from ey_commerce_lib.dxm.schemas.warehouse import WarehouseProductQuery
+from ey_commerce_lib.dxm.utils.mark import get_custom_mark_content_list_by_data_custom_mark, \
+    generate_add_or_update_user_comment_data_by_content_list
+from ey_commerce_lib.four_seller.main import FourSellerClient
+from ey_commerce_lib.four_seller.schemas.query.order import FourSellerOrderQueryModel
+from ey_commerce_lib.takesend.main import TakeSendClient
+import ey_commerce_lib.dxm.utils.dxm_commodity_product as dxm_commodity_product_util
+
+
+async def login_success(user_token: str):
+    print(f'user_token: {user_token}')
+    pass
+
+
+@pytest.mark.asyncio
+async def test_auto_login_4seller():
+    # user_token = await auto_login_4seller(user_name="sky@eeyoung.com", password="ey010203@@")
+    # print(user_token)
+    async with FourSellerClient(
+            user_name="xxxxx",
+            password="xxxxxx",
+            login_success_call_back=login_success,
+            user_token="xxxxxx") as four_seller_client:
+        await four_seller_client.list_history_order(FourSellerOrderQueryModel())
+
+
+cookies = {
+    'dxm_i': 'MTAyNzg5NiFhVDB4TURJM09EazIhZjc5ZTMxMjZmN2Q3NTk5OGZlMDg4YjQzNzNlNzlmOWY',
+    'dxm_t': 'MTcxNDk2NDU4MiFkRDB4TnpFME9UWTBOVGd5IWIzZWRjYTc3YTdjYWE0MmIxMWYwNjFhOTlmMDgxZjY5',
+    'dxm_c': 'TWVOMVpiclYhWXoxTlpVNHhXbUp5VmchNmM5MmM5ODc1MDBkODVjOWJmOTFlMzdhNGJiNWI3Njk',
+    'dxm_w': 'ZDc3NWVhOTdkOTEyNGE4ZmRkODBmYzc2YmFlOGVjZjEhZHoxa056YzFaV0U1TjJRNU1USTBZVGhtWkdRNE1HWmpOelppWVdVNFpXTm1NUSFmZWZiZGZiMTEwMzhlN2M4M2MzYjZmYjAxYTcxMjViMw',
+    'dxm_s': 'aMHO7LWKAQe6NzFrV3O4cceXkBriLGNmwondOR7INWs',
+    'MYJ_MKTG_fapsc5t4tc': 'JTdCJTdE',
+    'MYJ_fapsc5t4tc': 'JTdCJTIyZGV2aWNlSWQlMjIlM0ElMjJkMGRlYzNkYi00MTNlLTQyZjktOWIxNC0xYzBhZTY4MTk4ZmIlMjIlMkMlMjJ1c2VySWQlMjIlM0ElMjIxMDI3ODk2JTIyJTJDJTIycGFyZW50SWQlMjIlM0ElMjIyNTg2MzQlMjIlMkMlMjJzZXNzaW9uSWQlMjIlM0ExNzMxMDU5MDc1MjU0JTJDJTIyb3B0T3V0JTIyJTNBZmFsc2UlMkMlMjJsYXN0RXZlbnRUaW1lJTIyJTNBMTczMTA1OTA3NTQyNCUyQyUyMmxhc3RFdmVudElkJTIyJTNBMTE2JTdE',
+    'MYJ_fapsc5t4tc': 'JTdCJTIyZGV2aWNlSWQlMjIlM0ElMjJkMGRlYzNkYi00MTNlLTQyZjktOWIxNC0xYzBhZTY4MTk4ZmIlMjIlMkMlMjJ1c2VySWQlMjIlM0ElMjIxMDI3ODk2JTIyJTJDJTIycGFyZW50SWQlMjIlM0ElMjIyNTg2MzQlMjIlMkMlMjJzZXNzaW9uSWQlMjIlM0ExNzMxMDU5MDc1MTEwJTJDJTIyb3B0T3V0JTIyJTNBZmFsc2UlMkMlMjJsYXN0RXZlbnRUaW1lJTIyJTNBMTczMTA1OTA3NTk5NiUyQyUyMmxhc3RFdmVudElkJTIyJTNBMTE2JTdE',
+    '_dxm_ad_client_id': '7AEFA0B78CE1B35075D391C5226612CED',
+    'Hm_lvt_f8001a3f3d9bf5923f780580eb550c0b': '1731459796,1731547149,1731590878,1731893161',
+    'HMACCOUNT': 'F266E8F609D8D8B1',
+    'MYJ_fapsc5t4tc': 'JTdCJTIyZGV2aWNlSWQlMjIlM0ElMjJkMGRlYzNkYi00MTNlLTQyZjktOWIxNC0xYzBhZTY4MTk4ZmIlMjIlMkMlMjJ1c2VySWQlMjIlM0ElMjIxMDI3ODk2JTIyJTJDJTIycGFyZW50SWQlMjIlM0ElMjIyNTg2MzQlMjIlMkMlMjJzZXNzaW9uSWQlMjIlM0ExNzMxOTAxNDMzMTk3JTJDJTIyb3B0T3V0JTIyJTNBZmFsc2UlMkMlMjJsYXN0RXZlbnRJZCUyMiUzQTExNiU3RA==',
+    'Hm_lpvt_f8001a3f3d9bf5923f780580eb550c0b': '1731901433',
+    'JSESSIONID': 'CD9C8372185D453012E5EEFBA64E2C9C',
+}
+
+headers = {
+    'accept': 'text/html, */*; q=0.01',
+    'accept-language': 'zh-CN,zh;q=0.9',
+    'cache-control': 'no-cache',
+    'content-type': 'application/x-www-form-urlencoded; charset=UTF-8',
+    'origin': 'https://www.dianxiaomi.com',
+    'pragma': 'no-cache',
+    'priority': 'u=1, i',
+    'referer': 'https://www.dianxiaomi.com/sys/index.htm?go=m420',
+    'sec-ch-ua': '"Google Chrome";v="131", "Chromium";v="131", "Not_A Brand";v="24"',
+    'sec-ch-ua-mobile': '?0',
+    'sec-ch-ua-platform': '"Windows"',
+    'sec-fetch-dest': 'empty',
+    'sec-fetch-mode': 'cors',
+    'sec-fetch-site': 'same-origin',
+    'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
+    'x-requested-with': 'XMLHttpRequest',
+}
+
+
+@pytest.mark.asyncio
+async def test_dxm_api():
+    async with (DxmClient(headers=headers, cookies=cookies) as dxm_client):
+        # data = await dxm_client.list_order_detail_async(query=ORDER_SEARCH_HAVE_GOODS_BASE_FORM)
+        # for order in data:
+        #     for pair_info in order.get('detail').get('pair_info_list'):
+        #         print(pair_info.get('proid'))
+        data = await dxm_client.update_dxm_commodity_front_sku('17773195771232287', 'fuck112')
+
+
+@pytest.mark.asyncio
+async def test_warehouse():
+    async with (DxmClient(headers=headers, cookies=cookies) as dxm_client):
+        print(await dxm_client.page_warehouse_product(WarehouseProductQuery()))
+
+
+@pytest.mark.asyncio
+async def test_tasksend_api():
+    async with (TakeSendClient(username="", password="") as tasksend_client):
+        await tasksend_client.login()

ey_commerce_lib-1.0.14/tests/dxm/test_purchase.py

@@ -1,57 +0,0 @@
-import json
-
-import pytest
-
-from ey_commerce_lib.dxm.constant.order import ORDER_SEARCH_APPROVAL_BASE_FORM, \
-    ORDER_SEARCH_PENDING_PROCESSING_BASE_FORM, ORDER_SEARCH_SELF_WAREHOUSE_BASE_FORM, \
-    ORDER_SEARCH_OUT_OF_STOCK_BASE_FORM, ORDER_SEARCH_HAVE_GOODS_BASE_FORM
-from ey_commerce_lib.dxm.main import DxmClient
-from ey_commerce_lib.dxm.schemas.warehouse import WarehouseProductQuery
-from ey_commerce_lib.dxm.utils.mark import get_custom_mark_content_list_by_data_custom_mark, \
-    generate_add_or_update_user_comment_data_by_content_list
-from ey_commerce_lib.four_seller.main import FourSellerClient
-from ey_commerce_lib.four_seller.schemas.query.order import FourSellerOrderQueryModel
-from ey_commerce_lib.takesend.main import TakeSendClient
-import ey_commerce_lib.dxm.utils.dxm_commodity_product as dxm_commodity_product_util
-
-
-async def login_success(user_token: str):
-    print(f'user_token: {user_token}')
-    pass
-
-
-@pytest.mark.asyncio
-async def test_auto_login_4seller():
-    # user_token = await auto_login_4seller(user_name="sky@eeyoung.com", password="ey010203@@")
-    # print(user_token)
-    async with FourSellerClient(
-            user_name="xxxxx",
-            password="xxxxxx",
-            login_success_call_back=login_success,
-            user_token="xxxxxx") as four_seller_client:
-        await four_seller_client.list_history_order(FourSellerOrderQueryModel())
-
-
-
-
-
-@pytest.mark.asyncio
-async def test_dxm_api():
-    async with (DxmClient(headers=headers, cookies=cookies) as dxm_client):
-        # data = await dxm_client.list_order_detail_async(query=ORDER_SEARCH_HAVE_GOODS_BASE_FORM)
-        # for order in data:
-        #     for pair_info in order.get('detail').get('pair_info_list'):
-        #         print(pair_info.get('proid'))
-        data = await dxm_client.view_dxm_commodity_product('17773195770895797')
-        print(json.dumps(dxm_commodity_product_util.get_edit_commodity_product_by_view_dxm_response(data)))
-
-@pytest.mark.asyncio
-async def test_warehouse():
-    async with (DxmClient(headers=headers, cookies=cookies) as dxm_client):
-        print(await dxm_client.page_warehouse_product(WarehouseProductQuery()))
-
-
-@pytest.mark.asyncio
-async def test_tasksend_api():
-    async with (TakeSendClient(username="", password="") as tasksend_client):
-        await tasksend_client.login()