diff --git a/app/models/merchant_product.py b/app/models/merchant_product.py index 2031459..63c85be 100644 --- a/app/models/merchant_product.py +++ b/app/models/merchant_product.py @@ -23,7 +23,6 @@ class MerchantProductDB(Base): sale_price = Column(Float, nullable=False) # 售价 settlement_amount = Column(DECIMAL(10,2), nullable=False) # 商家结算金额 tags = Column(String(200)) # 标签,逗号分隔 - max_deduct_points = Column(DECIMAL(10,2), default=0) # 最高可抵扣积分 create_time = Column(DateTime(timezone=True), server_default=func.now()) update_time = Column(DateTime(timezone=True), onupdate=func.now()) status = Column(Enum(ProductStatus), nullable=False, default=ProductStatus.UNLISTING) @@ -38,7 +37,6 @@ class MerchantProductCreate(BaseModel): sale_price: float = Field(..., gt=0) settlement_amount: float = Field(..., gt=0) tags: str = Field("", max_length=200) - max_deduct_points: float = Field(0.0, ge=0) status: ProductStatus = ProductStatus.UNLISTING class MerchantProductUpdate(BaseModel): @@ -48,7 +46,6 @@ class MerchantProductUpdate(BaseModel): sale_price: Optional[float] = Field(None, gt=0) settlement_amount: Optional[float] = Field(None, gt=0) tags: Optional[str] = Field(None, max_length=200) - max_deduct_points: Optional[float] = Field(None, ge=0) status: Optional[ProductStatus] = None class MerchantProductInfo(BaseModel): @@ -61,7 +58,6 @@ class MerchantProductInfo(BaseModel): sale_price: float settlement_amount: float tags: str - max_deduct_points: float create_time: datetime update_time: Optional[datetime] status: ProductStatus