From 286cc762f4f522cc29705be2b385721fc5e640d0 Mon Sep 17 00:00:00 2001
From: zepengdev <lzpsmith@outlook.com>
Date: Wed, 04 Jun 2025 18:32:06 +0800
Subject: [PATCH] 继承BaseBaseEntity
---
oying-system/src/main/java/com/oying/modules/pc/store/domain/Store.java | 33 ++++-------
oying-system/src/main/java/com/oying/modules/pc/store/domain/StoreQualification.java | 39 ++++--------
oying-system/src/main/java/com/oying/modules/pc/product/domain/Product.java | 36 +++--------
oying-system/src/main/java/com/oying/modules/pc/store/domain/StoreCategory.java | 29 +++------
4 files changed, 46 insertions(+), 91 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 9a7c28f..eca49de 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
@@ -1,25 +1,27 @@
package com.oying.modules.pc.product.domain;
-import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
-import java.sql.Timestamp;
-import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.oying.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
/**
-* @description /
* @author lzp
* @date 2025-04-30
**/
-@Data
+@Getter
+@Setter
@TableName("pc_product")
-public class Product implements Serializable {
+public class Product extends BaseEntity implements Serializable {
@TableId(value = "product_id")
@ApiModelProperty(value = "ID")
@@ -93,22 +95,6 @@
@NotNull
@ApiModelProperty(value = "是否删除")
private Integer deletedFlag;
-
- @NotNull
- @ApiModelProperty(value = "创建人")
- private Long createBy;
-
- @NotNull
- @ApiModelProperty(value = "创建时间")
- private Timestamp createTime;
-
- @NotNull
- @ApiModelProperty(value = "修改人")
- private Long updateBy;
-
- @NotNull
- @ApiModelProperty(value = "修改时间")
- private Timestamp updateTime;
@NotNull
@ApiModelProperty(value = "版本号")
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..db9261d 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
@@ -5,8 +5,11 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.oying.base.BaseEntity;
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,15 +17,15 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalTime;
-import java.time.ZonedDateTime;
/**
* @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 = "唯一标识")
@@ -54,13 +57,17 @@
@ApiModelProperty(value = "状态：1000-草稿 1002-正常 1003-暂停营业 1004-关闭")
private Integer status;
- @NotBlank
@ApiModelProperty(value = "店铺logo图片")
private Long logoImageId;
- @NotBlank
+ @ApiModelProperty(value = "店铺logo图片Url")
+ private Long logoImageUrl;
+
@ApiModelProperty(value = "店铺封面图")
private Long coverImageId;
+
+ @ApiModelProperty(value = "店铺封面图Url")
+ private Long coverImageUrl;
@ApiModelProperty(value = "店铺描述")
private String description;
@@ -112,22 +119,6 @@
@ApiModelProperty(value = "营业半径(米)")
private Integer radius;
-
- @NotNull
- @ApiModelProperty(value = "创建人")
- private Long createBy;
-
- @NotNull
- @ApiModelProperty(value = "创建日期")
- private ZonedDateTime createTime;
-
- @NotNull
- @ApiModelProperty(value = "修改人")
- private Long updateBy;
-
- @NotNull
- @ApiModelProperty(value = "修改时间")
- private ZonedDateTime updateTime;
public void copy(Store source) {
BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/domain/StoreCategory.java b/oying-system/src/main/java/com/oying/modules/pc/store/domain/StoreCategory.java
index 9c68dbb..1831436 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/domain/StoreCategory.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/domain/StoreCategory.java
@@ -1,24 +1,27 @@
package com.oying.modules.pc.store.domain;
-import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
-import java.sql.Timestamp;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.oying.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
/**
* @description /
* @author lzp
* @date 2025-04-27
**/
-@Data
+@Getter
+@Setter
@TableName("pc_store_category")
-public class StoreCategory implements Serializable {
+public class StoreCategory extends BaseEntity implements Serializable {
@TableId(value = "category_id")
@ApiModelProperty(value = "ID")
@@ -51,18 +54,6 @@
@ApiModelProperty(value = "是否启用(0-否 1-是)")
private Integer active;
-
- @ApiModelProperty(value = "创建人")
- private Long createBy;
-
- @ApiModelProperty(value = "创建时间")
- private Timestamp createTime;
-
- @ApiModelProperty(value = "更新人")
- private Long updateBy;
-
- @ApiModelProperty(value = "更新时间")
- private Timestamp updateTime;
public void copy(StoreCategory source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/domain/StoreQualification.java b/oying-system/src/main/java/com/oying/modules/pc/store/domain/StoreQualification.java
index 069b7c8..ab2c65a 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/domain/StoreQualification.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/domain/StoreQualification.java
@@ -1,27 +1,27 @@
package com.oying.modules.pc.store.domain;
-import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
-import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.oying.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalTime;
-import java.time.ZonedDateTime;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
/**
-* @description /
* @author lzp
* @date 2025-04-22
**/
-@Data
+@Getter
+@Setter
@TableName("pc_store_qualification")
-public class StoreQualification implements Serializable {
+public class StoreQualification extends BaseEntity implements Serializable {
@TableId(value = "qualification_id", type = IdType.AUTO)
@ApiModelProperty(value = "资质ID")
@@ -44,6 +44,9 @@
@ApiModelProperty(value = "资质图片")
private String qualificationImageId;
+ @ApiModelProperty(value = "资质图片")
+ private String qualificationImageUrl;
+
@ApiModelProperty(value = "有效期开始日期")
private LocalTime startDate;
@@ -52,22 +55,6 @@
@ApiModelProperty(value = "状态：1000-草稿 1001-有效 1002-无效")
private Integer status;
-
- @NotNull
- @ApiModelProperty(value = "创建人")
- private Long createBy;
-
- @NotNull
- @ApiModelProperty(value = "创建日期")
- private ZonedDateTime createTime;
-
- @NotNull
- @ApiModelProperty(value = "修改人")
- private Long updateBy;
-
- @NotNull
- @ApiModelProperty(value = "修改时间")
- private ZonedDateTime updateTime;
public void copy(StoreQualification source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
--
Gitblit v1.9.3