From f6239d1029da4c51ba3b2cec790f7399a210a3df Mon Sep 17 00:00:00 2001 From: zepengdev <lzpsmith@outlook.com> Date: Sat, 19 Jul 2025 16:13:27 +0800 Subject: [PATCH] feat: 优化商品和店铺 --- oying-system/src/main/java/com/oying/modules/pc/product/domain/Product.java | 39 ++++++++++++++++++++++++++++++++++----- 1 files changed, 34 insertions(+), 5 deletions(-) diff --git a/oying-system/src/main/java/com/oying/modules/pc/product/domain/Product.java b/oying-system/src/main/java/com/oying/modules/pc/product/domain/Product.java index eca49de..2c5e76f 100644 --- a/oying-system/src/main/java/com/oying/modules/pc/product/domain/Product.java +++ b/oying-system/src/main/java/com/oying/modules/pc/product/domain/Product.java @@ -2,6 +2,8 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.oying.base.BaseEntity; @@ -13,6 +15,7 @@ import javax.validation.constraints.NotNull; import java.io.Serializable; import java.math.BigDecimal; +import java.util.List; /** * @author lzp @@ -23,7 +26,7 @@ @TableName("pc_product") public class Product extends BaseEntity implements Serializable { - @TableId(value = "product_id") + @TableId(value = "product_id", type = IdType.AUTO) @ApiModelProperty(value = "ID") private Long productId; @@ -52,15 +55,19 @@ private Long secondCategoryId; @NotNull - @ApiModelProperty(value = "状态:1000-草稿 1001上架 1002下架") + @ApiModelProperty(value = "状态") private Integer status; + + @ApiModelProperty(value = "上架状态") + private Integer shelfStatus; @NotBlank @ApiModelProperty(value = "主图片") - private String mainImage; + private String mainImageId; - @ApiModelProperty(value = "详情图片") - private String detailImage; + @NotBlank + @ApiModelProperty(value = "主图地址") + private String mainImageUrl; @ApiModelProperty(value = "商品描述") private String description; @@ -92,6 +99,20 @@ @ApiModelProperty(value = "高度(单位:厘米)") private Integer height; + @ApiModelProperty(value = "是否支持退货") + private Integer returns; + + @ApiModelProperty(value = "是否支持自提") + private Integer selfPickup; + + @TableField(exist = false) + @ApiModelProperty(value = "销量") + private Integer totalUnitsSold = 0; + + @TableField(exist = false) + @ApiModelProperty(value = "月销售量") + private Integer monthlyUnitsSold = 0; + @NotNull @ApiModelProperty(value = "是否删除") private Integer deletedFlag; @@ -100,6 +121,14 @@ @ApiModelProperty(value = "版本号") private Long version; + @TableField(exist = false) + @ApiModelProperty(value = "图片") + private List<ProductImage> images; + + @TableField(exist = false) + @ApiModelProperty(value = "标签") + private List<ProductLabel> labels; + public void copy(Product source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -- Gitblit v1.9.3