From 02fb5e406abcda2534ed1f2505c5226027c13473 Mon Sep 17 00:00:00 2001 From: zepengdev <lzpsmith@outlook.com> Date: Mon, 23 Jun 2025 00:57:32 +0800 Subject: [PATCH] fix:调整字段 --- oying-system/src/main/java/com/oying/modules/pc/store/domain/Store.java | 69 +++++++++++++++++++++++++--------- 1 files changed, 50 insertions(+), 19 deletions(-) diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/domain/Store.java b/oying-system/src/main/java/com/oying/modules/pc/store/domain/Store.java index 4542f86..8eb184c 100644 --- a/oying-system/src/main/java/com/oying/modules/pc/store/domain/Store.java +++ b/oying-system/src/main/java/com/oying/modules/pc/store/domain/Store.java @@ -3,10 +3,14 @@ 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; +import com.oying.modules.pc.product.domain.Product; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; +import lombok.Getter; +import lombok.Setter; import org.springframework.data.geo.Point; import javax.validation.constraints.NotBlank; @@ -14,18 +18,19 @@ import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalTime; -import java.time.ZonedDateTime; +import java.util.List; /** * @author lzp * @date 2025-04-21 **/ -@Data +@Getter +@Setter @TableName("pc_store") -public class Store implements Serializable { +public class Store extends BaseEntity implements Serializable { @TableId(value = "store_id", type = IdType.AUTO) - @ApiModelProperty(value = "唯一标识") + @ApiModelProperty(value = "店铺ID") private Long storeId; @NotNull @@ -51,16 +56,20 @@ private String businessScope; @NotNull - @ApiModelProperty(value = "状态:1000-草稿 1002-正常 1003-暂停营业 1004-关闭") + @ApiModelProperty(value = "状态") private Integer status; - @NotBlank @ApiModelProperty(value = "店铺logo图片") private Long logoImageId; - @NotBlank + @ApiModelProperty(value = "店铺logo图片Url") + private String logoImageUrl; + @ApiModelProperty(value = "店铺封面图") private Long coverImageId; + + @ApiModelProperty(value = "店铺封面图Url") + private String coverImageUrl; @ApiModelProperty(value = "店铺描述") private String description; @@ -113,21 +122,43 @@ @ApiModelProperty(value = "营业半径(米)") private Integer radius; - @NotNull - @ApiModelProperty(value = "创建人") - private Long createBy; + @ApiModelProperty(value = "是否支持退货") + private Integer returns; + + @ApiModelProperty(value = "是否支持自提") + private Integer selfPickup; @NotNull - @ApiModelProperty(value = "创建日期") - private ZonedDateTime createTime; + @ApiModelProperty(value = "版本号") + private Long version; - @NotNull - @ApiModelProperty(value = "修改人") - private Long updateBy; + @TableField(exist = false) + @ApiModelProperty(value = "评分") + private Double score = 0d; - @NotNull - @ApiModelProperty(value = "修改时间") - private ZonedDateTime updateTime; + @TableField(exist = false) + @ApiModelProperty(value = "配送距离") + private Integer deliveryDuration = 0; + + @TableField(exist = false) + @ApiModelProperty(value = "配送时长") + private Integer deliveryTime = 0; + + @TableField(exist = false) + @ApiModelProperty(value = "销量") + private Integer totalUnitsSold = 0; + + @TableField(exist = false) + @ApiModelProperty(value = "月销售量") + private Integer monthlyUnitsSold = 0; + + @TableField(exist = false) + @ApiModelProperty(value = "资质") + private List<StoreQualification> qualifications; + + @TableField(exist = false) + @ApiModelProperty(value = "商品") + private List<Product> products; public void copy(Store source) { BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true)); -- Gitblit v1.9.3