ey-commerce-lib 1.0.14__py3-none-any.whl → 1.0.16__py3-none-any.whl

ey_commerce_lib/dxm/main.py

@@ -1,6 +1,8 @@
 import asyncio
+import traceback
 
 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,51 @@ 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,
+                    args=[
+                        '--start-maximized',
+                        '--disable-blink-features=AutomationControlled',
+                    ]
+                )
+                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')
+                # 关闭模态框
+                await page.locator('#theNewestModalLabel > div.modal-dialog > div > div.modal-header > button').click()
+                # 输入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失败-失败原因:{traceback.format_exc()}')
+
     async def __aenter__(self):
         return self
 

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/dxm/schemas/dxm_commodity_product.py

@@ -1,5 +1,6 @@
 from datetime import datetime
-from typing import List, Optional, Dict, Any
+from typing import List, Optional, Any
+
 from pydantic import BaseModel, Field, ConfigDict
 
 
@@ -285,7 +286,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 +336,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 +378,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 +409,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/dxm/utils/dxm_commodity_product.py

@@ -1,4 +1,5 @@
 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 +15,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 +47,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 +55,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 +66,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 +91,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/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.14.dist-info → ey_commerce_lib-1.0.16.dist-info}/METADATA

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

{ey_commerce_lib-1.0.14.dist-info → ey_commerce_lib-1.0.16.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=Hawru6vR4QUn_bK_YsgFTUMjbtoBNzJVkxNdl9_Niis,26995
+ey_commerce_lib/dxm/main.py,sha256=l37Byi4P6nxdMRQSdmcgjjxCKa3_FATQ3seqCgfiKQA,29208
 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,17 +12,17 @@ ey_commerce_lib/dxm/parser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 ey_commerce_lib/dxm/parser/common.py,sha256=-xfnaYhMStuvR-XEJTWAgTN2H88xflGtWXIrxDqbq0Q,3037
 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=wJexOS7oXluJ5ySK7GrLSOexQLIcM8-KVhisCVLcinw,17954
+ey_commerce_lib/dxm/parser/order.py,sha256=vnu5jqea8IoTGk_kFlDcUnrZF5NKuBIQUGAYaxQVSg4,17972
 ey_commerce_lib/dxm/parser/purchase.py,sha256=lmcC41HtdUqCgGamFASPnzHatUziLFaenTJmazsiMm0,5750
 ey_commerce_lib/dxm/parser/warehouse.py,sha256=oQVojPX8VKHUphdV1KY5ZK1PCFtOY2zwkyLNUeJ3JT0,3310
 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/dxm_commodity_product.py,sha256=CGM-wSKvkTBTcoYM631e7v7-A7GQcPy1-jXZjzNWzZw,30827
+ey_commerce_lib/dxm/schemas/dxm_commodity_product.py,sha256=9CiMTkRFk2McFL5jiHI35furvuxhJlqBr4AWOC3hlXw,30871
 ey_commerce_lib/dxm/schemas/ebay_product.py,sha256=k8LqBCz657vYRcLRjjyPJjQYjQOSwSGBivvp2LPWuYc,3696
 ey_commerce_lib/dxm/schemas/order.py,sha256=6ps9aXFcEiRASLv1CH5uW7wnplaWzD_vTfyzvi5eLE0,7881
 ey_commerce_lib/dxm/schemas/warehouse.py,sha256=BT9r92DgkGKRI-HPqHPt5FKPdPJr2h-rxjfh25STR2E,5094
 ey_commerce_lib/dxm/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ey_commerce_lib/dxm/utils/dxm_commodity_product.py,sha256=tQ7sjHwXb5EY9WW0GtvV3jqXkizXtwp3NU_ZFQPy1dU,4777
+ey_commerce_lib/dxm/utils/dxm_commodity_product.py,sha256=OkL9Ve0lnSA2l-3DMWXF2fSj-A0uV4ucrhfEWNL2Z-Y,5398
 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=cqO29DRRVzJHwo_005RFOO3vyGboQcuJUli783nyQjA,13131
@@ -50,8 +50,9 @@ ey_commerce_lib/takesend/main.py,sha256=Omz7Wmo0bBzQvMA-_zVQG1sH-W-RsX5AeetFE2a1
 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.14.dist-info/METADATA,sha256=2s9TCOT0sndWzFHflvL8-0xw2VN1t6uO2cf6DxI5eZ0,391
-ey_commerce_lib-1.0.14.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ey_commerce_lib-1.0.14.dist-info/RECORD,,
+ey_commerce_lib-1.0.16.dist-info/METADATA,sha256=rDYDrnrc962sMDr66d9JP6oYHIkWALNSCbnYeKCzHkQ,391
+ey_commerce_lib-1.0.16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ey_commerce_lib-1.0.16.dist-info/RECORD,,