diff --git a/buyer-api/src/main/java/cn/lili/BuyerApiApplication.java b/buyer-api/src/main/java/cn/lili/BuyerApiApplication.java index 41ee3d9e3..fd8fe5d7c 100644 --- a/buyer-api/src/main/java/cn/lili/BuyerApiApplication.java +++ b/buyer-api/src/main/java/cn/lili/BuyerApiApplication.java @@ -6,7 +6,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Primary; import org.springframework.core.task.TaskExecutor; -import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; @@ -17,7 +16,6 @@ * @since 2020/11/16 10:03 下午 */ @SpringBootApplication -@EnableJpaAuditing @EnableCaching @EnableAsync public class BuyerApiApplication { diff --git a/buyer-api/src/main/resources/application.yml b/buyer-api/src/main/resources/application.yml index 63bd8c228..0874300fa 100644 --- a/buyer-api/src/main/resources/application.yml +++ b/buyer-api/src/main/resources/application.yml @@ -34,11 +34,6 @@ spring: max-request-size: 20MB cache: type: redis - #JPA - jpa: - # 自动生成表结构 - generate-ddl: true - open-in-view: false #jackson json解析 jackson: time-zone: GMT+8 diff --git a/buyer-api/src/test/resources/application.yml b/buyer-api/src/test/resources/application.yml index 8309640a4..cf4681d9c 100644 --- a/buyer-api/src/test/resources/application.yml +++ b/buyer-api/src/test/resources/application.yml @@ -40,10 +40,6 @@ spring: #amqp # rabbitmq: # host: 192.168.0.116 - jpa: - # 自动生成表结构 - generate-ddl: true - open-in-view: false # Redis redis: host: 192.168.0.116 diff --git a/common-api/src/main/resources/application.yml b/common-api/src/main/resources/application.yml index dea7746a1..8f456df00 100644 --- a/common-api/src/main/resources/application.yml +++ b/common-api/src/main/resources/application.yml @@ -39,11 +39,6 @@ spring: # replica-set-name: mongoreplset cache: type: redis - - jpa: - # 自动生成表结构 - generate-ddl: true - open-in-view: false # Redis redis: host: 127.0.0.1 diff --git a/config/application.yml b/config/application.yml index 7f0fc0b98..59d96d8da 100644 --- a/config/application.yml +++ b/config/application.yml @@ -37,10 +37,6 @@ spring: # replica-set-name: mongoreplset cache: type: redis - jpa: - # 自动生成表结构 - generate-ddl: true - open-in-view: false # Redis redis: host: 192.168.0.116 diff --git a/consumer/src/main/resources/application.yml b/consumer/src/main/resources/application.yml index 6cf94c371..ed3853a66 100644 --- a/consumer/src/main/resources/application.yml +++ b/consumer/src/main/resources/application.yml @@ -42,11 +42,6 @@ spring: # replica-set-name: mongoreplset cache: type: redis - - jpa: - # 自动生成表结构 - generate-ddl: true - open-in-view: false # Redis redis: host: 127.0.0.1 diff --git a/framework/pom.xml b/framework/pom.xml index 9568b25df..cc6a99fc4 100644 --- a/framework/pom.xml +++ b/framework/pom.xml @@ -63,11 +63,6 @@ org.springframework.boot spring-boot-starter-data-mongodb - - - org.springframework.boot - spring-boot-starter-data-jpa - @@ -102,26 +97,6 @@ knife4j-spring-boot-starter ${knife4j.version} - - - - - - - - - - - - - - - - - - - - com.github.xiaoymin swagger-bootstrap-ui @@ -156,22 +131,6 @@ beetl ${beetl-version} - - - io.minio - minio - ${minio-version} - - - jsr305 - com.google.code.findbugs - - - guava - com.google.guava - - - com.aliyun @@ -229,13 +188,6 @@ org.springframework.boot spring-boot-starter-test - - - - - - - diff --git a/framework/src/main/java/cn/lili/common/security/token/SecretKeyUtil.java b/framework/src/main/java/cn/lili/common/security/token/SecretKeyUtil.java index e5fe970cc..ebec6b385 100644 --- a/framework/src/main/java/cn/lili/common/security/token/SecretKeyUtil.java +++ b/framework/src/main/java/cn/lili/common/security/token/SecretKeyUtil.java @@ -1,8 +1,8 @@ package cn.lili.common.security.token; -import com.google.api.client.repackaged.org.apache.commons.codec.binary.Base64; import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.security.Keys; +import org.apache.commons.codec.binary.Base64; import javax.crypto.SecretKey; diff --git a/framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchConfig.java b/framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchConfig.java index 0c78f88ad..a91bae414 100644 --- a/framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchConfig.java +++ b/framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchConfig.java @@ -18,7 +18,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.data.elasticsearch.config.AbstractElasticsearchConfiguration; -import javax.annotation.Nonnull; import javax.annotation.PreDestroy; import java.io.IOException; import java.util.List; @@ -40,7 +39,6 @@ public class ElasticsearchConfig extends AbstractElasticsearchConfiguration { @Override @Bean - @Nonnull public RestHighLevelClient elasticsearchClient() { RestClientBuilder restBuilder = RestClient .builder(this.getHttpHosts()); diff --git a/framework/src/main/java/cn/lili/modules/connect/entity/Connect.java b/framework/src/main/java/cn/lili/modules/connect/entity/Connect.java index 2851df9c0..b10465694 100644 --- a/framework/src/main/java/cn/lili/modules/connect/entity/Connect.java +++ b/framework/src/main/java/cn/lili/modules/connect/entity/Connect.java @@ -1,5 +1,6 @@ package cn.lili.modules.connect.entity; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -13,10 +14,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import java.io.Serializable; import java.util.Date; @@ -24,22 +21,13 @@ * @author Chopper */ @Data -@Entity -@Table(name = "li_connect") @TableName("li_connect") @ApiModel(value = "联合登陆") @NoArgsConstructor -public class Connect implements Serializable { +public class Connect extends IdEntity { private static final long serialVersionUID = 1L; - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; - @CreatedBy @TableField(fill = FieldFill.INSERT) @@ -48,7 +36,7 @@ public class Connect implements Serializable { @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime; diff --git a/framework/src/main/java/cn/lili/modules/connect/entity/ConnectConfig.java b/framework/src/main/java/cn/lili/modules/connect/entity/ConnectConfig.java index a6c1bd3e7..4ca741db7 100644 --- a/framework/src/main/java/cn/lili/modules/connect/entity/ConnectConfig.java +++ b/framework/src/main/java/cn/lili/modules/connect/entity/ConnectConfig.java @@ -8,8 +8,6 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Entity; -import javax.persistence.Table; import java.util.HashMap; import java.util.Map; @@ -17,8 +15,6 @@ * @author Chopper */ @Data -@Entity -@Table(name = "li_connect_config") @TableName("li_connect_config") @ApiModel(value = "联合登陆配置") @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java index 8014ae87c..282176fd3 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java @@ -10,8 +10,6 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; @@ -22,10 +20,8 @@ * @since 2020-03-14 23:04:56 */ @Data -@Entity @ApiModel(value = "分销员") @TableName("li_distribution") -@Table(name = "li_distribution") @NoArgsConstructor public class Distribution extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java index 4d33d442c..b648f323a 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java @@ -12,8 +12,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Entity; -import javax.persistence.Table; import java.util.Date; /** @@ -23,8 +21,6 @@ * @since 2020-03-14 23:04:56 */ @Data -@Entity -@Table(name = "li_distribution_cash") @TableName("li_distribution_cash") @ApiModel(value = "分销佣金") @NoArgsConstructor @@ -48,7 +44,7 @@ public class DistributionCash extends BaseEntity { @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "支付时间") private Date payTime; diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionGoods.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionGoods.java index 67f6361c0..50c96f7e9 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionGoods.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionGoods.java @@ -3,9 +3,9 @@ import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import cn.lili.modules.goods.entity.dos.GoodsSku; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -17,10 +17,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import javax.validation.constraints.Max; import javax.validation.constraints.NotNull; import java.util.Date; @@ -33,22 +29,13 @@ * @since 2020-03-14 23:04:56 */ @Data -@Entity @ApiModel(value = "分销商品") -@Table(name = "li_distribution_goods") @TableName("li_distribution_goods") @NoArgsConstructor -public class DistributionGoods { +public class DistributionGoods extends IdEntity { private static final long serialVersionUID = 1L; - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; - @CreatedBy @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建者", hidden = true) @@ -56,7 +43,7 @@ public class DistributionGoods { @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime; @@ -73,7 +60,6 @@ public class DistributionGoods { private String skuId; @ApiModelProperty(value = "规格信息json", hidden = true) - @Column(columnDefinition = "TEXT") @JsonIgnore private String specs; diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java index 5500a256c..8d04dfb0c 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java @@ -2,6 +2,7 @@ import cn.lili.modules.distribution.entity.enums.DistributionOrderStatusEnum; import cn.lili.modules.order.order.entity.dos.StoreFlow; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -14,10 +15,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import java.util.Date; /** @@ -27,19 +24,15 @@ * @since 2020-03-14 23:04:56 */ @Data -@Entity @ApiModel(value = "分销订单") @TableName("li_distribution_order") -@Table(name = "li_distribution_order") @NoArgsConstructor -public class DistributionOrder { +public class DistributionOrder extends IdEntity { private static final long serialVersionUID = 501799944909496507L; - @Id @TableId @TableField - @Column(columnDefinition = "bigint(20)") @ApiModelProperty(value = "唯一标识", hidden = true) private String id; @@ -84,7 +77,6 @@ public class DistributionOrder { @ApiModelProperty(value = "货品ID") private String skuId; @ApiModelProperty(value = "规格") - @Column(columnDefinition = "TEXT") private String specs; @ApiModelProperty(value = "图片") private String image; diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionSelectedGoods.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionSelectedGoods.java index 37887f1b1..c60fa9961 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionSelectedGoods.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionSelectedGoods.java @@ -1,5 +1,6 @@ package cn.lili.modules.distribution.entity.dos; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -8,10 +9,6 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; /** * 分销员已选择分销商品 @@ -20,21 +17,12 @@ * @since 2020-03-14 23:04:56 */ @Data -@Entity @ApiModel(value = "分销商已选择分销商品") -@Table(name = "li_distribution_selected_goods") @TableName("li_distribution_selected_goods") @NoArgsConstructor -public class DistributionSelectedGoods { +public class DistributionSelectedGoods extends IdEntity { - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; - @ApiModelProperty(value = "分销员ID") private String distributionId; diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionGoodsVO.java b/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionGoodsVO.java index a7a786ea2..e6987b2b6 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionGoodsVO.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionGoodsVO.java @@ -5,7 +5,6 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; import java.util.Date; /** @@ -23,7 +22,6 @@ public class DistributionGoodsVO { @ApiModelProperty(value = "商品名称") private String goodsName; - @Column(columnDefinition = "TEXT") @ApiModelProperty(value = "规格") private String specs; @@ -52,7 +50,7 @@ public class DistributionGoodsVO { private Double commission; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "添加时间") private Date createTime; diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionOrderSearchParams.java b/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionOrderSearchParams.java index a2343493d..77b86059d 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionOrderSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionOrderSearchParams.java @@ -30,7 +30,7 @@ public class DistributionOrderSearchParams extends PageVO { @ApiModelProperty(value = "订单sn") private String orderSn; - @ApiModelProperty(value = "分销员ID",hidden = true) + @ApiModelProperty(value = "分销员ID", hidden = true) private String distributionId; @ApiModelProperty(value = "分销订单状态") @@ -40,12 +40,12 @@ public class DistributionOrderSearchParams extends PageVO { private String storeId; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "开始时间") private Date startTime; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "结束时间") private Date endTime; diff --git a/framework/src/main/java/cn/lili/modules/file/entity/File.java b/framework/src/main/java/cn/lili/modules/file/entity/File.java index 453f8c0cb..fcb7c32f7 100644 --- a/framework/src/main/java/cn/lili/modules/file/entity/File.java +++ b/framework/src/main/java/cn/lili/modules/file/entity/File.java @@ -8,8 +8,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 文件系统 @@ -18,8 +16,6 @@ * @since 2020/11/26 15:35 */ @Data -@Entity -@Table(name = "li_file") @TableName("li_file") @ApiModel(value = "文件") public class File extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Brand.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Brand.java index 8c2d51f8e..9fd66c05c 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Brand.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Brand.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotEmpty; /** @@ -17,8 +15,6 @@ * @since 2020-02-18 15:18:56 */ @Data -@Entity -@Table(name = "li_brand") @TableName("li_brand") @ApiModel(value = "商品品牌") public class Brand extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java index d35e73df6..2e15f315e 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java @@ -8,8 +8,6 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.math.BigDecimal; @@ -22,8 +20,6 @@ * @since 2020-02-18 15:18:56 */ @Data -@Entity -@Table(name = "li_category") @TableName("li_category") @ApiModel(value = "商品分类") @AllArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryBrand.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryBrand.java index b724c696f..d6b74b779 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryBrand.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryBrand.java @@ -1,8 +1,8 @@ package cn.lili.modules.goods.entity.dos; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -13,11 +13,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import java.io.Serializable; import java.util.Date; @@ -28,22 +23,13 @@ * @since 2020-03-02 09:34:02 */ @Data -@Entity -@Table(name = "li_category_brand") @TableName("li_category_brand") -@ApiModel(value = "商品分类品牌") +@ApiModel(value = "商品分类品牌关联") @NoArgsConstructor -public class CategoryBrand implements Serializable { +public class CategoryBrand extends IdEntity { private static final long serialVersionUID = 3315719881926878L; - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; - @CreatedBy @TableField(fill = FieldFill.INSERT) @@ -52,7 +38,7 @@ public class CategoryBrand implements Serializable { @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime; @@ -70,8 +56,8 @@ public class CategoryBrand implements Serializable { @ApiModelProperty(value = "品牌id") private String brandId; - public CategoryBrand(String categoryId,String brandId){ - this.categoryId=categoryId; - this.brandId=brandId; + public CategoryBrand(String categoryId, String brandId) { + this.categoryId = categoryId; + this.brandId = brandId; } } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryParameterGroup.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryParameterGroup.java index f88d6359c..41514b4fa 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryParameterGroup.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryParameterGroup.java @@ -7,8 +7,6 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -19,8 +17,6 @@ * @since 2020-02-26 10:34:02 */ @Data -@Entity -@Table(name = "li_category_parameter_group") @TableName("li_category_parameter_group") @ApiModel(value = "分类绑定参数组") public class CategoryParameterGroup extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategorySpecification.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategorySpecification.java index 7efbb5311..c13623733 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategorySpecification.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategorySpecification.java @@ -9,9 +9,6 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Entity; -import javax.persistence.Table; - /** * 分类参数组关联 * @@ -19,8 +16,6 @@ * @since 2020-02-26 10:34:02 */ @Data -@Entity -@Table(name = "li_category_specification") @TableName("li_category_specification") @NoArgsConstructor @AllArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Commodity.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Commodity.java index 41ce6c9b7..c11d2374f 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Commodity.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Commodity.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 小程序直播商品 @@ -16,10 +14,8 @@ * */ @Data -@Entity @ApiModel(value = "Commodity", description = "直播商品") @TableName("li_commodity") -@Table(name = "li_commodity") public class Commodity extends BaseEntity { @ApiModelProperty(value = "图片") diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java index b1c6880d7..c8e0fe3b6 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java @@ -11,9 +11,6 @@ import lombok.NoArgsConstructor; import org.hibernate.validator.constraints.Length; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.Max; /** @@ -23,8 +20,6 @@ * @since 2020-02-23 9:14:33 */ @Data -@Entity -@Table(name = "li_draft_goods") @TableName("li_draft_goods") @ApiModel(value = "草稿商品") @AllArgsConstructor @@ -134,19 +129,15 @@ public class DraftGoods extends BaseEntity { @ApiModelProperty(value = "草稿商品保存类型") private String saveType; - @Column(columnDefinition = "TEXT") @ApiModelProperty(value = "分类名称JSON") private String categoryNameJson; - @Column(columnDefinition = "TEXT") @ApiModelProperty(value = "商品参数JSON") private String goodsParamsListJson; - @Column(columnDefinition = "TEXT") @ApiModelProperty(value = "商品图片JSON") private String goodsGalleryListJson; - - @Column(columnDefinition = "TEXT") + @ApiModelProperty(value = "sku列表JSON") private String skuListJson; diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java index cd73c2d99..0e81ddd3f 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java @@ -16,9 +16,6 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.Max; import java.util.Map; @@ -29,8 +26,6 @@ * @since 2020-02-23 9:14:33 */ @Data -@Entity -@Table(name = "li_goods") @TableName("li_goods") @ApiModel(value = "商品") public class Goods extends BaseEntity { @@ -198,7 +193,6 @@ public class Goods extends BaseEntity { private String goodsType; @ApiModelProperty(value = "商品参数json", hidden = true) - @Column(columnDefinition = "TEXT") @JsonIgnore private String params; diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsGallery.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsGallery.java index c63b23422..0d010e3de 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsGallery.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsGallery.java @@ -1,5 +1,6 @@ package cn.lili.modules.goods.entity.dos; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -9,10 +10,6 @@ import lombok.Data; import org.springframework.data.annotation.CreatedBy; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import java.io.Serializable; /** @@ -22,18 +19,9 @@ * @since 2020-02-23 9:14:33 */ @Data -@Entity -@Table(name = "li_goods_gallery") @TableName("li_goods_gallery") @ApiModel(value = "商品相册") -public class GoodsGallery implements Serializable { - - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; +public class GoodsGallery extends IdEntity { @CreatedBy diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java index beff2494c..8bba8288c 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java @@ -10,9 +10,6 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.Max; import java.util.Date; @@ -23,8 +20,6 @@ * @since 2020-02-23 9:14:33 */ @Data -@Entity -@Table(name = "li_goods_sku") @TableName("li_goods_sku") @ApiModel(value = "商品sku对象") public class GoodsSku extends BaseEntity { @@ -35,7 +30,6 @@ public class GoodsSku extends BaseEntity { private String goodsId; @ApiModelProperty(value = "规格信息json", hidden = true) - @Column(columnDefinition = "TEXT") @JsonIgnore private String specs; @@ -80,7 +74,6 @@ public class GoodsSku extends BaseEntity { private String marketEnable; @ApiModelProperty(value = "商品详情") - @Column(columnDefinition = "TEXT") private String intro; @Max(value = 99999999, message = "价格不能超过99999999") @@ -147,7 +140,6 @@ public class GoodsSku extends BaseEntity { private Boolean selfOperated; @ApiModelProperty(value = "商品移动端详情") - @Column(columnDefinition = "TEXT") private String mobileIntro; @ApiModelProperty(value = "商品视频") diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsUnit.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsUnit.java index e0685a017..ce7693760 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsUnit.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsUnit.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotEmpty; /** @@ -17,8 +15,6 @@ * @since: 2020/11/26 16:08 */ @Data -@Entity -@Table(name = "li_goods_unit") @TableName("li_goods_unit") @ApiModel(value = "商品计量单位") public class GoodsUnit extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsWords.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsWords.java index 073ffd8c5..eff940460 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsWords.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsWords.java @@ -7,9 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Entity; -import javax.persistence.Table; - /** * 商品关键字 @@ -18,8 +15,6 @@ * @since 2020/10/15 */ @Data -@Entity -@Table(name = "li_goods_words") @TableName("li_goods_words") @ApiModel(value = "商品关键字") @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Parameters.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Parameters.java index 776891c80..4d4d5a7e5 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Parameters.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Parameters.java @@ -7,8 +7,6 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.Max; import javax.validation.constraints.Min; import javax.validation.constraints.NotEmpty; @@ -21,8 +19,6 @@ * @since 2020-02-23 9:14:33 */ @Data -@Entity -@Table(name = "li_parameters") @TableName("li_parameters") @ApiModel(value = "商品参数") public class Parameters extends IdEntity { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Specification.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Specification.java index f57a7707c..3e98392c1 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Specification.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Specification.java @@ -7,9 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotEmpty; /** @@ -19,8 +16,6 @@ * @since 2020-02-18 15:18:56 */ @Data -@Entity -@Table(name = "li_specification") @TableName("li_specification") @ApiModel(value = "规格项") public class Specification extends IdEntity { @@ -46,7 +41,6 @@ public class Specification extends IdEntity { * 规格值名字 */ @TableField(value = "spec_value") - @Column(columnDefinition = "TEXT") @ApiModelProperty(value = "规格值名字, 《,》分割") private String specValue; diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Studio.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Studio.java index a0809f517..969af83d7 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Studio.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Studio.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 小程序直播间 @@ -16,10 +14,8 @@ * @since: 2021/5/17 9:47 上午 */ @Data -@Entity @ApiModel(value = "直播间") @TableName("li_studio") -@Table(name = "li_studio") public class Studio extends BaseEntity { /** diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/StudioCommodity.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/StudioCommodity.java index c041b4c61..924696ae6 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/StudioCommodity.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/StudioCommodity.java @@ -1,5 +1,6 @@ package cn.lili.modules.goods.entity.dos; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -8,10 +9,6 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; /** * 直播商品 @@ -20,19 +17,10 @@ * @since: 2021/5/18 5:42 下午 */ @Data -@Entity @ApiModel(value = "直播商品") @TableName("li_studio_commodity") -@Table(name = "li_studio_commodity") @NoArgsConstructor -public class StudioCommodity { - - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; +public class StudioCommodity extends IdEntity { @ApiModelProperty(value = "房间ID") private Integer roomId; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/FootPrint.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/FootPrint.java index f87f04723..7b42ea3fa 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/FootPrint.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/FootPrint.java @@ -8,8 +8,6 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 浏览历史 @@ -18,8 +16,6 @@ * @since 2020/11/17 7:22 下午 */ @Data -@Entity -@Table(name = "li_foot_print") @TableName("li_foot_print") @ApiModel(value = "浏览历史") @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/GoodsCollection.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/GoodsCollection.java index d05694751..65ec0d31b 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/GoodsCollection.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/GoodsCollection.java @@ -1,5 +1,6 @@ package cn.lili.modules.member.entity.dos; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -12,10 +13,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import java.util.Date; /** @@ -25,23 +22,14 @@ * @since 2020/11/18 3:31 下午 */ @Data -@Entity @NoArgsConstructor @ApiModel(value = "会员商品收藏") @TableName("li_goods_collection") -@Table(name = "li_goods_collection") -public class GoodsCollection { - - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; +public class GoodsCollection extends IdEntity { @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java index 06d2c01aa..9ae986020 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java @@ -10,8 +10,6 @@ import lombok.NoArgsConstructor; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.Min; import javax.validation.constraints.NotEmpty; import java.util.Date; @@ -23,8 +21,6 @@ * @since 2020-02-25 14:10:16 */ @Data -@Entity -@Table(name = "li_member") @TableName("li_member") @ApiModel(value = "会员") @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberAddress.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberAddress.java index 115ea94eb..4b53c23b3 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberAddress.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberAddress.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; @@ -19,8 +17,6 @@ * @since 2020-02-25 14:10:16 */ @Data -@Entity -@Table(name = "li_member_address") @TableName("li_member_address") @ApiModel(value = "会员地址") public class MemberAddress extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java index c6b3bd18d..6de9383f9 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java @@ -13,8 +13,6 @@ import lombok.NoArgsConstructor; import org.springframework.beans.BeanUtils; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotNull; /** @@ -24,8 +22,6 @@ * @since 2020-02-25 14:10:16 */ @Data -@Entity -@Table(name = "li_member_evaluation") @TableName("li_member_evaluation") @ApiModel(value = "会员商品评价") @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberGrade.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberGrade.java index 1048a6ec6..601d823bb 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberGrade.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberGrade.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotNull; /** @@ -17,8 +15,6 @@ * @since 2021/5/14 5:43 下午 */ @Data -@Entity -@Table(name = "li_member_grade") @TableName("li_member_grade") @ApiModel(value = "会员等级") public class MemberGrade extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNotice.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNotice.java index 4ca4513a5..3f5ca9616 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNotice.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNotice.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 会员站内信 @@ -16,8 +14,6 @@ * @since 2020-02-25 14:10:16 */ @Data -@Entity -@Table(name = "li_member_notice") @TableName("li_member_notice") @ApiModel(value = "会员站内信") public class MemberNotice extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeLog.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeLog.java index 1bc250a07..3343e1c8c 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeLog.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeLog.java @@ -8,9 +8,6 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.util.Date; /** @@ -20,55 +17,32 @@ * @since 2020-02-25 14:10:16 */ @Data -@Entity -@Table(name = "li_member_notice_log") @TableName("li_member_notice_log") @ApiModel(value = "会员消息") public class MemberNoticeLog extends BaseEntity { private static final long serialVersionUID = 1L; - /** - * 标题 - */ - @Column(name = "title") + @ApiModelProperty(value = "标题") private String title; - /** - * 消息内容 - */ - @Column(name = "content") + @ApiModelProperty(value = "消息内容") private String content; - /** - * 会员id - */ - @Column(name = "member_ids") + @ApiModelProperty(value = "会员id") private String memberIds; - /** - * 管理员id - */ - @Column(name = "admin_id") + @ApiModelProperty(value = "管理员id") private String adminId; - /** - * 管理员名称 - */ - @Column(name = "admin_name") + @ApiModelProperty(value = "管理员名称") private String adminName; - /** - * 发送时间 - */ - @Column(name = "send_time") + @ApiModelProperty(value = "发送时间") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private Date sendTime; - /** - * 发送类型 - */ - @Column(name = "send_type") + @ApiModelProperty(value = "发送类型,0全站，1指定会员") private Integer sendType; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeSenter.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeSenter.java index b7196abaa..7e62e2a97 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeSenter.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeSenter.java @@ -6,9 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 会员消息 @@ -17,33 +14,27 @@ * @since 2020-02-25 14:10:16 */ @Data -@Entity -@Table(name = "li_member_notice_senter") @TableName("li_member_notice_senter") @ApiModel(value = "会员消息") public class MemberNoticeSenter extends BaseEntity { /** * 标题 */ - @Column(name = "title") @ApiModelProperty(value = "标题") private String title; /** * 消息内容 */ - @Column(name = "content") @ApiModelProperty(value = "消息内容") private String content; /** * 会员id */ - @Column(name = "member_ids") @ApiModelProperty(value = "会员id") private String memberIds; /** * 发送类型 */ - @Column(name = "send_type") @ApiModelProperty(value = "发送类型,ALL 全站，SELECT 指定会员") private String sendType; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java index 8728889ea..0d0bbe122 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java @@ -1,6 +1,7 @@ package cn.lili.modules.member.entity.dos; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -13,10 +14,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import java.util.Date; /** @@ -26,21 +23,12 @@ * @since 2020-02-25 14:10:16 */ @Data -@Entity -@Table(name = "li_member_points_history") @TableName("li_member_points_history") @ApiModel(value = "会员积分历史") -public class MemberPointsHistory { +public class MemberPointsHistory extends IdEntity { private static final long serialVersionUID = 1L; - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; - @CreatedBy @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建者", hidden = true) diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberReceipt.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberReceipt.java index a912ce41a..84c1833fb 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberReceipt.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberReceipt.java @@ -1,5 +1,6 @@ package cn.lili.modules.member.entity.dos; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -11,10 +12,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import java.util.Date; /** @@ -24,18 +21,14 @@ * @since 2021-03-29 14:10:16 */ @Data -@Entity -@Table(name = "li_member_receipt") @TableName("li_member_receipt") @ApiModel(value = "会员发票") -public class MemberReceipt { +public class MemberReceipt extends IdEntity { private static final long serialVersionUID = -8210927482915675995L; - @Id @TableId @TableField - @Column(columnDefinition = "bigint(20)") @ApiModelProperty(value = "唯一标识", hidden = true) private String id; @@ -70,7 +63,7 @@ public class MemberReceipt { @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberSign.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberSign.java index aa27d31c4..d15511eec 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberSign.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberSign.java @@ -1,5 +1,6 @@ package cn.lili.modules.member.entity.dos; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -11,10 +12,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import java.util.Date; /** @@ -24,24 +21,15 @@ * @since 2020-02-25 14:10:16 */ @Data -@Entity -@Table(name = "li_member_sign") @TableName("li_member_sign") @ApiModel(value = "会员签到") -public class MemberSign { +public class MemberSign extends IdEntity { private static final long serialVersionUID = 1L; - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; - @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWallet.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWallet.java index e83edce2e..9b7dab44d 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWallet.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWallet.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 会员预存款 @@ -16,8 +14,6 @@ * @since 2020-02-25 14:10:16 */ @Data -@Entity -@Table(name = "li_member_wallet") @TableName("li_member_wallet") @ApiModel(value = "会员预存款") public class MemberWallet extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWithdrawApply.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWithdrawApply.java index c5ab2f1ad..02ca45971 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWithdrawApply.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWithdrawApply.java @@ -10,8 +10,6 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Entity; -import javax.persistence.Table; import java.util.Date; /** @@ -21,8 +19,6 @@ * @since 2020-02-25 14:10:16 */ @Data -@Entity -@Table(name = "li_member_withdraw_apply") @TableName("li_member_withdraw_apply") @ApiModel(value = "会员提现申请") public class MemberWithdrawApply extends BaseEntity { @@ -44,13 +40,13 @@ public class MemberWithdrawApply extends BaseEntity { @ApiModelProperty(value = "审核备注") private String inspectRemark; - @ApiModelProperty(value="审核时间") + @ApiModelProperty(value = "审核时间") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) private Date inspectTime; - @ApiModelProperty(value="sn") + @ApiModelProperty(value = "sn") private String sn; } diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/StoreCollection.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/StoreCollection.java index e00ce3b24..452a227d1 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/StoreCollection.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/StoreCollection.java @@ -8,8 +8,6 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 会员店铺收藏 @@ -18,8 +16,6 @@ * @since 2020/11/18 3:32 下午 */ @Data -@Entity -@Table(name = "li_store_collection") @TableName("li_store_collection") @ApiModel(value = "会员收藏") @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java index d2a854897..2134f1660 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 会员接受消息对象 @@ -17,8 +15,6 @@ * @since 2020-02-25 14:10:16 */ @Data -@Entity -@Table(name = "li_member_message") @TableName("li_member_message") @ApiModel(value = "会员消息") public class MemberMessage extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/Message.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/Message.java index 48dabf496..d373c049e 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/Message.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/Message.java @@ -9,9 +9,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; /** * 管理段发送消息对象 @@ -20,8 +17,6 @@ */ @Data -@Entity -@Table(name = "li_message") @TableName("li_message") @ApiModel(value = "消息") public class Message extends BaseEntity { @@ -46,12 +41,10 @@ public class Message extends BaseEntity { @ApiModelProperty(value = "发送客户端 商家或者会员") private String messageClient; - @Transient @TableField(exist = false) @ApiModelProperty(value = "发送指定用户id") private String[] userIds; - @Transient @TableField(exist = false) @ApiModelProperty(value = "发送指定用户名称") private String[] userNames; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/NoticeMessage.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/NoticeMessage.java index 65eab23dc..ca0a00209 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/NoticeMessage.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/NoticeMessage.java @@ -6,9 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; - /** * 通知类站内信模版对象 * @@ -17,8 +14,6 @@ * @since 2020/12/8 9:46 */ @Data -@Entity -@Table(name = "li_notice_message") @TableName("li_notice_message") @ApiModel(value = "通知类消息模板") public class NoticeMessage extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/ShortLink.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/ShortLink.java index 46abf9126..ca35ecaa5 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/ShortLink.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/ShortLink.java @@ -6,15 +6,12 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; /** + * 短链接/暂时只用于小程序二维码业务 * @author Chopper */ @Data -@Entity -@Table(name = "li_short_link") @TableName("li_short_link") @ApiModel(value = "短链接/暂时只用于小程序二维码业务") public class ShortLink extends IdEntity { diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsReach.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsReach.java index 5398a0e21..170548925 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsReach.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsReach.java @@ -1,5 +1,6 @@ package cn.lili.modules.message.entity.dos; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -11,9 +12,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import java.util.Date; @@ -24,17 +22,9 @@ * @since 2021/1/30 4:13 下午 */ @Data -@Entity -@Table(name = "li_sms_reach") @TableName("li_sms_reach") @ApiModel(value = "短信任务") -public class SmsReach { - - @Id - @TableId - @TableField - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; +public class SmsReach extends IdEntity { @ApiModelProperty(value = "签名名称", required = true) private String signName; @@ -56,7 +46,7 @@ public class SmsReach { @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java index 86011ac45..3d894fd35 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java @@ -7,11 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - /** * 短信签名 @@ -20,19 +15,10 @@ * @since 2021/1/30 4:13 下午 */ @Data -@Entity -@Table(name = "li_sms_sign") @TableName("li_sms_sign") @ApiModel(value = "短信签名") public class SmsSign { - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; - @ApiModelProperty(value = "签名名称", required = true) private String signName; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsTemplate.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsTemplate.java index 2d8cd6abc..41f9e8155 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsTemplate.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsTemplate.java @@ -1,5 +1,6 @@ package cn.lili.modules.message.entity.dos; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -7,11 +8,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; - /** * 短信模板 @@ -20,18 +16,9 @@ * @since 2021/1/30 4:13 下午 */ @Data -@Entity -@Table(name = "li_sms_template") @TableName("li_sms_template") @ApiModel(value = "短信模板") -public class SmsTemplate { - - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; +public class SmsTemplate extends IdEntity { @ApiModelProperty(value = "模板名称", required = true) private String templateName; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/StoreMessage.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/StoreMessage.java index 28f8f60d5..47103f031 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/StoreMessage.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/StoreMessage.java @@ -1,6 +1,7 @@ package cn.lili.modules.message.entity.dos; import cn.lili.modules.message.entity.enums.MessageStatusEnum; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -13,30 +14,21 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.*; import java.util.Date; /** * 店铺接收消息对象 + * * @author Chopper * @since 2021/1/30 4:13 下午 */ @Data -@Entity -@Table(name = "li_store_message") @TableName("li_store_message") @ApiModel(value = "店铺消息") -public class StoreMessage { +public class StoreMessage extends IdEntity { private static final long serialVersionUID = 1L; - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; - @CreatedBy @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建者", hidden = true) @@ -44,7 +36,7 @@ public class StoreMessage { @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime; @@ -65,12 +57,10 @@ public class StoreMessage { private String status = MessageStatusEnum.UN_READY.name(); - @Transient @TableField(exist = false) @ApiModelProperty(value = "消息标题") private String title; - @Transient @TableField(exist = false) @ApiModelProperty(value = "消息内容") private String content; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMPMessage.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMPMessage.java index 5ea4771af..3150f70e1 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMPMessage.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMPMessage.java @@ -6,15 +6,11 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; - /** + * 微信小程序消息订阅 * @author Chopper */ @Data -@Entity -@Table(name = "li_wechat_mp_message") @TableName("li_wechat_mp_message") @ApiModel(value = "微信小程序消息订阅") public class WechatMPMessage extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMessage.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMessage.java index 983a79924..adbff5eb9 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMessage.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMessage.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 微信消息 @@ -17,8 +15,6 @@ * @since 2020/12/10 17:02 */ @Data -@Entity -@Table(name = "li_wechat_message") @TableName("li_wechat_message") @ApiModel(value = "微信消息") public class WechatMessage extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSale.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSale.java index 8f3366b99..55ddb87a1 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSale.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSale.java @@ -8,9 +8,6 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.util.Date; /** @@ -20,8 +17,6 @@ * @since 2020/11/17 7:30 下午 */ @Data -@Entity -@Table(name = "li_after_sale") @TableName("li_after_sale") @ApiModel(value = "售后") public class AfterSale extends BaseEntity { @@ -68,7 +63,6 @@ public class AfterSale extends BaseEntity { private String goodsName; @ApiModelProperty(value = "规格json") - @Column(columnDefinition = "TEXT") private String specs; @ApiModelProperty(value = "实际金额") private Double flowPrice; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSaleReason.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSaleReason.java index c5f4f9de2..37e188756 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSaleReason.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSaleReason.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotNull; /** @@ -17,8 +15,6 @@ * @since: 2021/7/9 1:39 上午 */ @Data -@Entity -@Table(name = "li_after_sale_reason") @TableName("li_after_sale_reason") @ApiModel(value = "售后原因") public class AfterSaleReason extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java index eee4edbcb..ebc48cf56 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java @@ -22,9 +22,6 @@ import lombok.NoArgsConstructor; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.util.Date; import java.util.Optional; @@ -35,8 +32,6 @@ * @since 2020/11/17 7:30 下午 */ @Data -@Entity -@Table(name = "li_order") @TableName("li_order") @ApiModel(value = "订单") @NoArgsConstructor @@ -86,7 +81,7 @@ public class Order extends BaseEntity { private String paymentMethod; @ApiModelProperty(value = "支付时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date paymentTime; @@ -185,7 +180,6 @@ public class Order extends BaseEntity { @ApiModelProperty(value = "订单促销类型") private String orderPromotionType; - @Column(columnDefinition = "TEXT") @ApiModelProperty(value = "价格详情") private String priceDetail; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaint.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaint.java index f3386494f..86e39260d 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaint.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaint.java @@ -8,8 +8,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; import java.util.Date; /** @@ -19,8 +17,6 @@ * @since 2020/12/4 **/ @Data -@Entity -@Table(name = "li_order_complaint") @TableName("li_order_complaint") @ApiModel(value = "订单交易投诉") public class OrderComplaint extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaintCommunication.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaintCommunication.java index bc8dcd49a..58b44f6a5 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaintCommunication.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaintCommunication.java @@ -8,8 +8,6 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 交易投诉通信 @@ -18,8 +16,6 @@ * @since 2020/12/5 **/ @Data -@Entity -@Table(name = "li_order_complaint_communication") @TableName("li_order_complaint_communication") @ApiModel(value = "订单交易投诉通信") @AllArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java index 06d95d24d..631bc5fed 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java @@ -20,9 +20,6 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.util.stream.Collectors; /** @@ -32,8 +29,6 @@ * @since 2020/11/17 7:30 下午 */ @Data -@Entity -@Table(name = "li_order_item") @TableName("li_order_item") @ApiModel(value = "子订单") @NoArgsConstructor @@ -79,7 +74,6 @@ public class OrderItem extends BaseEntity { private String snapshotId; @ApiModelProperty(value = "规格json") - @Column(columnDefinition = "TEXT") private String specs; @ApiModelProperty(value = "促销类型") @@ -106,7 +100,6 @@ public class OrderItem extends BaseEntity { @ApiModelProperty(value = "售后状态") private String afterSaleStatus; - @Column(columnDefinition = "TEXT") @ApiModelProperty(value = "价格详情") private String priceDetail; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Receipt.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Receipt.java index 60c8ec849..11e56e3db 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Receipt.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Receipt.java @@ -6,9 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 发票 @@ -17,8 +14,6 @@ * @since 2020/11/28 11:38 */ @Data -@Entity -@Table(name = "li_receipt") @TableName("li_receipt") @ApiModel(value = "发票") public class Receipt extends BaseEntity { @@ -55,7 +50,6 @@ public class Receipt extends BaseEntity { @ApiModelProperty(value = "发票状态 0未开 1已开") private Integer receiptStatus; - @Column(columnDefinition = "TEXT") @ApiModelProperty(value = "发票详情") private String receiptDetail; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/StoreFlow.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/StoreFlow.java index 7123dcb03..f9c0f2098 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/StoreFlow.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/StoreFlow.java @@ -1,6 +1,7 @@ package cn.lili.modules.order.order.entity.dos; import cn.lili.modules.order.order.entity.enums.FlowTypeEnum; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -12,10 +13,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import java.util.Date; /** @@ -25,18 +22,9 @@ * @since 2020/11/17 7:31 下午 */ @Data -@Entity -@Table(name = "li_store_flow") @TableName("li_store_flow") @ApiModel(value = "商家订单流水") -public class StoreFlow { - - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; +public class StoreFlow extends IdEntity { private static final long serialVersionUID = -5998757398902747939L; @@ -81,7 +69,6 @@ public class StoreFlow { private String categoryId; @ApiModelProperty(value = "规格json") - @Column(columnDefinition = "TEXT") private String specs; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Trade.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Trade.java index 0e014b4b0..dbde25c5f 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Trade.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Trade.java @@ -10,8 +10,6 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 交易 @@ -20,8 +18,6 @@ * @since 2020/11/17 7:34 下午 */ @Data -@Entity -@Table(name = "li_trade") @TableName("li_trade") @ApiModel(value = "交易") @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java index 067b44f52..f32eaf3e9 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java @@ -77,17 +77,17 @@ public class OrderSearchParams extends PageVO { private String paymentMethod; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "支付时间") private Date paymentTime; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "下单开始时间") private Date startDate; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "下单结束时间") private Date endDate; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/ReceiptDTO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/ReceiptDTO.java index 9d28d0f49..f52ab6d1c 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/ReceiptDTO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/ReceiptDTO.java @@ -3,7 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Column; /** * 发票子内容 @@ -21,7 +20,6 @@ public class ReceiptDTO { private String goodsName; @ApiModelProperty(value = "规格") - @Column(columnDefinition = "TEXT") private String specs; @ApiModelProperty(value = "数量") diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleSearchParams.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleSearchParams.java index 5c934af08..1da922460 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleSearchParams.java @@ -56,11 +56,11 @@ public class AfterSaleSearchParams extends PageVO { @ApiModelProperty(value = "售后单状态", allowableValues = "APPLY,PASS,REFUSE,BUYER_RETURN,SELLER_RE_DELIVERY,BUYER_CONFIRM,SELLER_CONFIRM,COMPLETE") private String serviceStatus; - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "开始时间") private Date startDate; - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "结束时间") private Date endDate; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/PaymentLog.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/PaymentLog.java index ae9037581..d06c7d874 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/PaymentLog.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/PaymentLog.java @@ -9,7 +9,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; import java.util.Date; /** @@ -19,7 +18,7 @@ * @since 2020/11/17 7:30 下午 */ @Data -@Entity + @ApiModel(value = "订单") public class PaymentLog extends BaseEntity { @@ -78,8 +77,4 @@ public class PaymentLog extends BaseEntity { @ApiModelProperty(value = "订单类型") private String orderType; - - public PaymentLog() { - - } } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/AfterSaleLog.java b/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/AfterSaleLog.java index e0b56d163..cbb2b342d 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/AfterSaleLog.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/AfterSaleLog.java @@ -1,6 +1,7 @@ package cn.lili.modules.order.trade.entity.dos; import cn.lili.common.security.enums.UserEnums; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -14,10 +15,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import java.util.Date; /** @@ -27,19 +24,10 @@ * @since 2020-03-25 2:30 下午 */ @Data -@Entity -@Table(name = "li_after_sale_log") @TableName("li_after_sale_log") @ApiModel(value = "售后日志") @NoArgsConstructor -public class AfterSaleLog { - - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; +public class AfterSaleLog extends IdEntity { @CreatedBy @TableField(fill = FieldFill.INSERT) @@ -48,7 +36,7 @@ public class AfterSaleLog { @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime; diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/OrderLog.java b/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/OrderLog.java index 0bdfbd916..8878aff3d 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/OrderLog.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/OrderLog.java @@ -2,6 +2,7 @@ import cn.lili.common.security.enums.UserEnums; import cn.lili.common.utils.StringUtils; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -15,10 +16,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import java.util.Date; /** @@ -28,21 +25,13 @@ * @since 2020-03-25 2:30 下午 */ @Data -@Entity -@Table(name = "li_order_log") @TableName("li_order_log") @ApiModel(value = "订单日志") @NoArgsConstructor -public class OrderLog { +public class OrderLog extends IdEntity { private static final long serialVersionUID = -1599270944927160096L; - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; @CreatedBy @TableField(fill = FieldFill.INSERT) @@ -51,7 +40,7 @@ public class OrderLog { @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime; diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/Recharge.java b/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/Recharge.java index 8adcb9fd5..c646b2db7 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/Recharge.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/Recharge.java @@ -1,6 +1,7 @@ package cn.lili.modules.order.trade.entity.dos; import cn.lili.modules.order.order.entity.enums.PayStatusEnum; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -15,10 +16,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import javax.validation.constraints.NotEmpty; import java.util.Date; @@ -29,23 +26,14 @@ * @since 2020-02-25 14:10:16 */ @Data -@Entity -@Table(name = "li_recharge") @TableName("li_recharge") @ApiModel(value = "预存款充值记录") @AllArgsConstructor @NoArgsConstructor -public class Recharge { +public class Recharge extends IdEntity { private static final long serialVersionUID = -1529240544327161096L; - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; - @CreatedBy @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建者", hidden = true) @@ -53,7 +41,7 @@ public class Recharge { @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime; @@ -86,7 +74,7 @@ public class Recharge { @ApiModelProperty(value = "支付时间") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date payTime; diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/WalletLog.java b/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/WalletLog.java index 786bf409f..45956e206 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/WalletLog.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/WalletLog.java @@ -1,5 +1,6 @@ package cn.lili.modules.order.trade.entity.dos; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -13,10 +14,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import java.util.Date; /** @@ -26,22 +23,13 @@ * @since 2020-02-25 14:10:16 */ @Data -@Entity -@Table(name = "li_wallet_log") @TableName("li_wallet_log") @ApiModel(value = "钱包变动日志") @NoArgsConstructor -public class WalletLog { +public class WalletLog extends IdEntity { private static final long serialVersionUID = -1599270544927161096L; - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; - /** * 会员id */ @@ -81,7 +69,7 @@ public class WalletLog { @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime; diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dos/Article.java b/framework/src/main/java/cn/lili/modules/page/entity/dos/Article.java index f15908ff7..c1a89b9a3 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/dos/Article.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/dos/Article.java @@ -8,8 +8,6 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -20,8 +18,6 @@ * @since 2020/12/10 17:42 */ @Data -@Entity -@Table(name = "li_article") @TableName("li_article") @ApiModel(value = "文章") public class Article extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dos/ArticleCategory.java b/framework/src/main/java/cn/lili/modules/page/entity/dos/ArticleCategory.java index bff665fd4..c2f3ec115 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/dos/ArticleCategory.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/dos/ArticleCategory.java @@ -9,8 +9,6 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotEmpty; /** @@ -21,8 +19,6 @@ * @since 2020/12/10 17:42 */ @Data -@Entity -@Table(name = "li_article_category") @TableName("li_article_category") @ApiModel(value = "文章分类") @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dos/Feedback.java b/framework/src/main/java/cn/lili/modules/page/entity/dos/Feedback.java index 03beb9832..2143b8c92 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/dos/Feedback.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/dos/Feedback.java @@ -1,6 +1,7 @@ package cn.lili.modules.page.entity.dos; import cn.lili.modules.page.entity.enums.FeedbackTypeEnum; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -13,10 +14,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import javax.validation.constraints.NotEmpty; import java.io.Serializable; import java.util.Date; @@ -28,23 +25,15 @@ * @since 2020/12/10 17:42 */ @Data -@Entity -@Table(name = "li_feedback") @TableName("li_feedback") @ApiModel(value = "意见反馈") -public class Feedback implements Serializable { +public class Feedback extends IdEntity { private static final long serialVersionUID = 1L; - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime; diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dos/PageData.java b/framework/src/main/java/cn/lili/modules/page/entity/dos/PageData.java index 0238878bb..df4e596b2 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/dos/PageData.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/dos/PageData.java @@ -11,8 +11,6 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 页面数据DO @@ -21,8 +19,6 @@ * @since 2020/12/10 17:42 */ @Data -@Entity -@Table(name = "li_page_data") @TableName("li_page_data") @ApiModel(value = "页面数据DO") @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dos/Special.java b/framework/src/main/java/cn/lili/modules/page/entity/dos/Special.java index 8a9500652..c536e2a9f 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/dos/Special.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/dos/Special.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 专题活动 @@ -17,8 +15,6 @@ * @since 2020/12/10 17:42 */ @Data -@Entity -@Table(name = "li_special") @TableName("li_special") @ApiModel(value = "专题活动") public class Special extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/payment/entity/RefundLog.java b/framework/src/main/java/cn/lili/modules/payment/entity/RefundLog.java index 6fc6c9a31..024bfd6dd 100644 --- a/framework/src/main/java/cn/lili/modules/payment/entity/RefundLog.java +++ b/framework/src/main/java/cn/lili/modules/payment/entity/RefundLog.java @@ -1,5 +1,6 @@ package cn.lili.modules.payment.entity; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -14,10 +15,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import java.util.Date; /** @@ -27,21 +24,12 @@ * @since 2021/1/28 09:21 */ @Data -@Entity -@Table(name = "li_refund_log") @TableName("li_refund_log") @Builder @NoArgsConstructor @AllArgsConstructor @ApiModel(value = "退款日志") -public class RefundLog { - - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; +public class RefundLog extends IdEntity { @ApiModelProperty(value = "会员ID") private String memberId; @@ -59,7 +47,7 @@ public class RefundLog { private Double payPrice; @ApiModelProperty(value = "是否已退款") - private Boolean isRefund ; + private Boolean isRefund; @ApiModelProperty(value = "退款方式") private String paymentName; @@ -83,7 +71,7 @@ public class RefundLog { @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime; diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/AdminUser.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/AdminUser.java index 83c4885a5..2ab76c5c5 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/AdminUser.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/AdminUser.java @@ -6,9 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 管理员类 @@ -17,8 +14,6 @@ * @since 2020/11/19 11:42 */ @Data -@Entity -@Table(name = "li_admin_user") @TableName("li_admin_user") @ApiModel(value = "管理员") public class AdminUser extends BaseEntity { @@ -26,7 +21,6 @@ public class AdminUser extends BaseEntity { private static final long serialVersionUID = 2918352800205024873L; @ApiModelProperty(value = "用户名") - @Column(unique = true, nullable = false, columnDefinition = "varchar(200)") private String username; @ApiModelProperty(value = "密码") @@ -42,7 +36,6 @@ public class AdminUser extends BaseEntity { private String email; @ApiModelProperty(value = "用户头像") - @Column(length = 1000) private String avatar = "https://i.loli.net/2020/11/19/LyN6JF7zZRskdIe.png"; @ApiModelProperty(value = "是否是超级管理员 超级管理员/普通管理员") diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Department.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Department.java index b490b05a2..aa8d7348f 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Department.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Department.java @@ -6,9 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.math.BigDecimal; @@ -19,8 +16,6 @@ * @since 2020/11/19 11:57 */ @Data -@Entity -@Table(name = "li_department") @TableName("li_department") @ApiModel(value = "部门") public class Department extends BaseEntity { @@ -34,6 +29,5 @@ public class Department extends BaseEntity { private String parentId; @ApiModelProperty(value = "排序值") - @Column(precision = 10, scale = 2) - private BigDecimal sortOrder; + private Double sortOrder; } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/DepartmentRole.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/DepartmentRole.java index cae231291..ba182b03f 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/DepartmentRole.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/DepartmentRole.java @@ -8,8 +8,6 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 角色部门绑定关系 @@ -18,8 +16,6 @@ * @since 2020/11/19 12:18 */ @Data -@Entity -@Table(name = "li_department_role") @TableName("li_department_role") @ApiModel(value = "角色部门") @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java index ba84452c3..6d4d1c8c3 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java @@ -6,9 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.math.BigDecimal; /** @@ -18,8 +15,6 @@ * @since 2020/11/19 12:12 */ @Data -@Entity -@Table(name = "li_menu") @TableName("li_menu") @ApiModel(value = "菜单权限") public class Menu extends BaseEntity { @@ -45,8 +40,7 @@ public class Menu extends BaseEntity { private String parentId = "0"; @ApiModelProperty(value = "排序值") - @Column(precision = 10, scale = 2) - private BigDecimal sortOrder; + private Double sortOrder; @ApiModelProperty(value = "权限URL，*号模糊匹配，逗号分割") private String permission; diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Role.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Role.java index 9beb00a44..4057bcde7 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Role.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Role.java @@ -7,8 +7,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 角色 @@ -18,8 +16,6 @@ */ @EqualsAndHashCode(callSuper = true) @Data -@Entity -@Table(name = "li_role") @TableName("li_role") @ApiModel(value = "角色") public class Role extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/RoleMenu.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/RoleMenu.java index 4b777c4c4..571e62f56 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/RoleMenu.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/RoleMenu.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 角色权限绑定关系 @@ -16,8 +14,6 @@ * @since 2020/11/19 12:18 */ @Data -@Entity -@Table(name = "li_role_menu") @TableName("li_role_menu") @ApiModel(value = "角色权限") public class RoleMenu extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/UserRole.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/UserRole.java index 9bd4585a0..9cd86a31f 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/UserRole.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/UserRole.java @@ -6,9 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; - /** * 用户角色 * @@ -16,8 +13,6 @@ * @since 2020/11/19 12:18 */ @Data -@Entity -@Table(name = "li_user_role") @TableName("li_user_role") @ApiModel(value = "用户角色") public class UserRole extends IdEntity { diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dto/AdminUserDTO.java b/framework/src/main/java/cn/lili/modules/permission/entity/dto/AdminUserDTO.java index dcb6698b9..b6ad8e7e4 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dto/AdminUserDTO.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dto/AdminUserDTO.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Column; import javax.validation.constraints.NotEmpty; /** @@ -22,7 +21,6 @@ public class AdminUserDTO extends BaseEntity { @ApiModelProperty(value = "用户名") @NotEmpty(message = "用户名不能为空") - @Column(unique = true, nullable = false) private String username; @NotEmpty(message = "密码不能为空") diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Coupon.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Coupon.java index 209610710..63bb9a3f7 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Coupon.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Coupon.java @@ -6,9 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 优惠券活动实体类 @@ -17,8 +14,6 @@ * @since 2020-03-19 10:44 上午 */ @Data -@Entity -@Table(name = "li_coupon") @TableName("li_coupon") @ApiModel(value = "优惠券实体类") public class Coupon extends BasePromotion { @@ -51,7 +46,6 @@ public class Coupon extends BasePromotion { private Double couponDiscount; @ApiModelProperty(value = "范围关联的id") - @Column(columnDefinition = "TEXT") private String scopeId; /** diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivity.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivity.java index 7288d9691..2584a13eb 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivity.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivity.java @@ -8,8 +8,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotNull; /** @@ -19,8 +17,6 @@ * @since 2020-03-19 10:44 上午 */ @Data -@Entity -@Table(name = "li_coupon_activity") @TableName("li_coupon_activity") @ApiModel(value = "优惠券活动实体类") public class CouponActivity extends BasePromotion { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivityItem.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivityItem.java index 26bb84416..78b9bfdb4 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivityItem.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivityItem.java @@ -6,9 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; - /** * 优惠券活动实体类 * @@ -16,8 +13,6 @@ * @since 2020-03-19 10:44 上午 */ @Data -@Entity -@Table(name = "li_coupon_activity_item") @TableName("li_coupon_activity_item") @ApiModel(value = "优惠券活动-优惠券关联实体类") public class CouponActivityItem extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/FullDiscount.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/FullDiscount.java index ad43788b4..42cfa140f 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/FullDiscount.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/FullDiscount.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.DecimalMax; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -19,8 +17,6 @@ * @since 2020-03-19 10:44 上午 */ @Data -@Entity -@Table(name = "li_full_discount") @TableName("li_full_discount") @ApiModel(value = "满优惠活动") public class FullDiscount extends BasePromotion { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivity.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivity.java index 9c8ab06d3..88f79ea95 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivity.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivity.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 砍价活动参与实体类 @@ -17,8 +15,6 @@ * @date 2020-7-1 10:44 上午 */ @Data -@Entity -@Table(name = "li_kanjia_activity") @TableName("li_kanjia_activity") @ApiModel(value = "砍价活动参与对象") public class KanjiaActivity extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivityGoods.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivityGoods.java index 5244441cf..4c87dd863 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivityGoods.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivityGoods.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotEmpty; /** @@ -17,8 +15,6 @@ * @date 2020-7-1 10:44 上午 */ @Data -@Entity -@Table(name = "li_kanjia_activity_goods") @TableName("li_kanjia_activity_goods") @ApiModel(value = "砍价活动商品对象") public class KanjiaActivityGoods extends BasePromotion { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivityLog.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivityLog.java index 1b0e5157e..0f2ac5db3 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivityLog.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivityLog.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 砍价活动商品实体类 @@ -16,8 +14,6 @@ * @date 2020-7-1 10:44 上午 */ @Data -@Entity -@Table(name = "li_kanjia_activity_log") @TableName("li_kanjia_activity_log") @ApiModel(value = "砍价活动日志对象") public class KanjiaActivityLog extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/MemberCoupon.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/MemberCoupon.java index 16b643120..b1246c1d9 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/MemberCoupon.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/MemberCoupon.java @@ -12,9 +12,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.util.Date; /** @@ -24,8 +21,6 @@ * @since 2020-03-19 10:44 上午 */ @Data -@Entity -@Table(name = "li_member_coupon") @TableName("li_member_coupon") @ApiModel(value = "会员优惠券") public class MemberCoupon extends BaseEntity { @@ -72,7 +67,6 @@ public class MemberCoupon extends BaseEntity { @ApiModelProperty(value = "范围关联的id") - @Column(columnDefinition = "TEXT") private String scopeId; @ApiModelProperty(value = "使用起始时间") diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Pintuan.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Pintuan.java index 5736f4ab3..a61acf891 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Pintuan.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Pintuan.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.Max; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; @@ -19,8 +17,6 @@ * @since 2020-03-19 10:44 上午 */ @Data -@Entity -@Table(name = "li_pintuan") @TableName("li_pintuan") @ApiModel(value = "拼团") public class Pintuan extends BasePromotion { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoods.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoods.java index b302ca6aa..87916a777 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoods.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoods.java @@ -8,8 +8,6 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 积分商品实体类 @@ -18,8 +16,6 @@ * @since 2020-03-19 10:44 上午 **/ @Data -@Entity -@Table(name = "li_points_goods") @TableName("li_points_goods") @ApiModel(value = "积分商品") @AllArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoodsCategory.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoodsCategory.java index 80016d0f4..1457b3f2f 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoodsCategory.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoodsCategory.java @@ -8,8 +8,6 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotEmpty; import java.math.BigDecimal; @@ -20,8 +18,6 @@ * @since 2020-03-19 10:44 上午 **/ @Data -@Entity -@Table(name = "li_points_goods_category") @TableName("li_points_goods_category") @ApiModel(value = "积分商品分类") @AllArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PromotionGoods.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PromotionGoods.java index e6691aa8d..08c89d9e6 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PromotionGoods.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PromotionGoods.java @@ -12,8 +12,6 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Entity; -import javax.persistence.Table; import java.util.Date; /** @@ -23,8 +21,6 @@ * @since 2020-03-19 10:44 上午 */ @Data -@Entity -@Table(name = "li_promotion_goods") @TableName("li_promotion_goods") @ApiModel(value = "促销商品") @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java index 942d43f17..ee65fa79a 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java @@ -12,8 +12,6 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotNull; import java.util.Date; @@ -24,8 +22,6 @@ * @since 2020-03-19 10:44 上午 */ @Data -@Entity -@Table(name = "li_seckill") @TableName("li_seckill") @ApiModel(value = "秒杀活动活动") @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/SeckillApply.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/SeckillApply.java index adc10e958..6254efea8 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/SeckillApply.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/SeckillApply.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.Min; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -19,8 +17,6 @@ * @since 2020-03-19 10:44 上午 */ @Data -@Entity -@Table(name = "li_seckill_apply") @TableName("li_seckill_apply") @ApiModel(value = "秒杀活动申请") public class SeckillApply extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java index 01ac39f8e..77cd3be00 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java @@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.MappedSuperclass; import javax.validation.constraints.NotEmpty; import java.util.Date; @@ -17,7 +16,6 @@ * @since 2020-03-19 10:44 上午 */ @Data -@MappedSuperclass public class BasePromotion extends BaseEntity { private static final long serialVersionUID = 7814832369110695758L; diff --git a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrder.java b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrder.java index 28d2c8775..5ab54c6c6 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrder.java +++ b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrder.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; import java.util.Date; /** @@ -18,10 +16,8 @@ * @since 2020-03-14 23:04:56 */ @Data -@Entity @ApiModel(value = "供求单") @TableName("li_purchase_order") -@Table(name = "li_purchase_order") public class PurchaseOrder extends BaseEntity { @ApiModelProperty(value = "标题") diff --git a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrderItem.java b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrderItem.java index 4e47ae62d..3bae74b51 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrderItem.java +++ b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrderItem.java @@ -1,5 +1,6 @@ package cn.lili.modules.purchase.entity.dos; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -11,10 +12,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import java.util.Date; /** @@ -24,22 +21,13 @@ * @since 2020/11/26 19:32 */ @Data -@Entity -@Table(name = "li_purchase_order_item") @TableName("li_purchase_order_item") @ApiModel(value = "采购单子内容") -public class PurchaseOrderItem { - - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; +public class PurchaseOrderItem extends IdEntity { @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime; @@ -60,7 +48,6 @@ public class PurchaseOrderItem { private Double price; @ApiModelProperty(value = "规格") - @Column(columnDefinition = "TEXT") private String specs; @ApiModelProperty(value = "图片") diff --git a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuoted.java b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuoted.java index 4c435c617..57a43e90b 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuoted.java +++ b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuoted.java @@ -1,5 +1,6 @@ package cn.lili.modules.purchase.entity.dos; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -11,10 +12,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import java.util.Date; /** @@ -24,22 +21,13 @@ * @since 2020/11/26 20:43 */ @Data -@Entity @ApiModel(value = "供求单报价") @TableName("li_purchase_quoted") -@Table(name = "li_purchase_quoted") -public class PurchaseQuoted { - - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; +public class PurchaseQuoted extends IdEntity { @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime; diff --git a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuotedItem.java b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuotedItem.java index cccfe7123..33fd70675 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuotedItem.java +++ b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuotedItem.java @@ -1,6 +1,7 @@ package cn.lili.modules.purchase.entity.dos; import cn.lili.common.utils.SnowFlake; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -12,10 +13,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import java.util.Date; /** @@ -25,22 +22,13 @@ * @since 2020/11/26 20:43 */ @Data -@Entity @ApiModel(value = "供求单报价") @TableName("li_purchase_quoted_item") -@Table(name = "li_purchase_quoted_item") -public class PurchaseQuotedItem { - - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; +public class PurchaseQuotedItem extends IdEntity { @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime; @@ -52,7 +40,6 @@ public class PurchaseQuotedItem { private String goodsName; @ApiModelProperty(value = "规格") - @Column(columnDefinition = "TEXT") private String specs; @ApiModelProperty(value = "数量") diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dos/CustomWords.java b/framework/src/main/java/cn/lili/modules/search/entity/dos/CustomWords.java index 7486127e5..e11a2fc63 100644 --- a/framework/src/main/java/cn/lili/modules/search/entity/dos/CustomWords.java +++ b/framework/src/main/java/cn/lili/modules/search/entity/dos/CustomWords.java @@ -7,8 +7,6 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotEmpty; /** @@ -18,8 +16,6 @@ * @since 2020/10/15 **/ @Data -@Entity -@Table(name = "li_custom_words") @TableName("li_custom_words") @ApiModel(value = "自定义分词") public class CustomWords extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/dos/MemberStatisticsData.java b/framework/src/main/java/cn/lili/modules/statistics/model/dos/MemberStatisticsData.java index d9fd6d5ec..ce0024358 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/dos/MemberStatisticsData.java +++ b/framework/src/main/java/cn/lili/modules/statistics/model/dos/MemberStatisticsData.java @@ -1,40 +1,27 @@ package cn.lili.modules.statistics.model.dos; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import java.util.Date; /** * 会员统计 + * * @author Chopper * @since 2020/11/17 7:34 下午 */ @Data -@Entity -@Table(name = "li_member_statistics_data") @TableName("li_member_statistics_data") @ApiModel(value = "会员统计") -public class MemberStatisticsData { +public class MemberStatisticsData extends IdEntity { private static final long serialVersionUID = 1L; - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; - @ApiModelProperty(value = "统计日") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") private Date createDate; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/dos/PlatformViewData.java b/framework/src/main/java/cn/lili/modules/statistics/model/dos/PlatformViewData.java index c6ceed095..b66558350 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/dos/PlatformViewData.java +++ b/framework/src/main/java/cn/lili/modules/statistics/model/dos/PlatformViewData.java @@ -1,5 +1,6 @@ package cn.lili.modules.statistics.model.dos; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -7,10 +8,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import java.util.Date; /** @@ -20,20 +17,11 @@ * @since 2020-06-19 17:50 */ @Data -@Entity -@Table(name = "li_s_platform_view_data") @TableName("li_s_platform_view_data") @ApiModel(value = "平台pv统计") -public class PlatformViewData { +public class PlatformViewData extends IdEntity { - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; - @ApiModelProperty(value = "pv数量") private Long pvNum; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderStatisticsDataVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderStatisticsDataVO.java index 27a627c1a..8c699cf41 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderStatisticsDataVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderStatisticsDataVO.java @@ -26,7 +26,7 @@ public class OrderStatisticsDataVO { private Double price; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建时间") private Date createTime; diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/Bill.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/Bill.java index 4a7c97ca2..7df556831 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/Bill.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/Bill.java @@ -1,6 +1,7 @@ package cn.lili.modules.store.entity.dos; import cn.lili.modules.store.entity.enums.BillStatusEnum; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -12,9 +13,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import java.util.Date; /** @@ -24,23 +22,16 @@ * @since 2020/11/17 4:27 下午 */ @Data -@Entity -@Table(name = "li_bill") @TableName("li_bill") @ApiModel(value = "结算单") -public class Bill { +public class Bill extends IdEntity { private static final long serialVersionUID = 1L; - @Id - @TableId - @TableField - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime; @@ -71,7 +62,7 @@ public class Bill { @ApiModelProperty(value = "平台付款时间") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private Date payTime; @ApiModelProperty(value = "银行开户名") diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplate.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplate.java index e6c3a3e6d..17184bf01 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplate.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplate.java @@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotEmpty; /** @@ -18,8 +16,6 @@ * @since 2020/11/17 4:27 下午 */ @Data -@Entity -@Table(name = "li_freight_template") @TableName("li_freight_template") @ApiModel(value = "运费模板") public class FreightTemplate extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplateChild.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplateChild.java index ead8f4eeb..52302320d 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplateChild.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplateChild.java @@ -6,9 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 运费模板子配置 @@ -17,8 +14,6 @@ * @since 2020/11/17 4:27 下午 */ @Data -@Entity -@Table(name = "li_freight_template_child") @TableName("li_freight_template_child") @ApiModel(value = "运费模板子配置") public class FreightTemplateChild extends BaseEntity { @@ -41,11 +36,9 @@ public class FreightTemplateChild extends BaseEntity { private Double continuedPrice; @ApiModelProperty(value = "地址，示例参数：上海,江苏,浙江") - @Column(columnDefinition = "TEXT") private String area; @ApiModelProperty(value = "地区ID，示例参数：1,2,3,4") - @Column(columnDefinition = "TEXT") private String areaId; } diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/Store.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/Store.java index 845f839e6..2a4c7a9b8 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/Store.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/Store.java @@ -13,8 +13,6 @@ import lombok.NoArgsConstructor; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.Size; @@ -27,8 +25,6 @@ * @since 2020-02-18 15:18:56 */ @Data -@Entity -@Table(name = "li_store") @TableName("li_store") @ApiModel(value = "店铺") @NoArgsConstructor @@ -46,7 +42,7 @@ public class Store extends BaseEntity { private String storeName; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "店铺关闭时间") private Date storeEndTime; @@ -109,11 +105,11 @@ public Store(Member member) { deliveryScore = 5.0; serviceScore = 5.0; descriptionScore = 5.0; - goodsNum=0; - collectionNum=0; + goodsNum = 0; + collectionNum = 0; } - public Store(Member member,AdminStoreApplyDTO adminStoreApplyDTO) { + public Store(Member member, AdminStoreApplyDTO adminStoreApplyDTO) { BeanUtil.copyProperties(adminStoreApplyDTO, this); this.memberId = member.getId(); @@ -123,8 +119,8 @@ public Store(Member member,AdminStoreApplyDTO adminStoreApplyDTO) { deliveryScore = 5.0; serviceScore = 5.0; descriptionScore = 5.0; - goodsNum=0; - collectionNum=0; + goodsNum = 0; + collectionNum = 0; } } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreAddress.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreAddress.java index 587eee2be..60e40df7f 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreAddress.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreAddress.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotEmpty; /** @@ -17,9 +15,7 @@ * @since 2020/12/7 15:09 */ @Data -@Entity @TableName("li_store_address") -@Table(name = "li_store_address") @ApiModel(value = "店铺自提点") public class StoreAddress extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreDetail.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreDetail.java index bc4f47c6e..f8596331e 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreDetail.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreDetail.java @@ -6,6 +6,7 @@ import cn.lili.common.validation.Mobile; import cn.lili.common.validation.Phone; import cn.lili.modules.store.entity.dto.AdminStoreApplyDTO; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,10 +18,6 @@ import org.hibernate.validator.constraints.Length; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import javax.validation.constraints.*; import java.util.Date; @@ -31,19 +28,15 @@ * @since 2020-02-18 15:18:56 */ @Data -@Entity -@Table(name = "li_store_detail") @TableName("li_store_detail") @ApiModel(value = "店铺详细") @NoArgsConstructor -public class StoreDetail { +public class StoreDetail extends IdEntity { private static final long serialVersionUID = 4949782642253898816L; - @Id @TableId @TableField - @Column(columnDefinition = "bigint(20)") @ApiModelProperty(value = "唯一标识", hidden = true) private String id; @@ -146,14 +139,13 @@ public class StoreDetail { @NotBlank(message = "店铺经营类目不能为空") @ApiModelProperty(value = "店铺经营类目") - @Column(columnDefinition = "TEXT") private String goodsManagementCategory; @ApiModelProperty(value = "结算周期") private String settlementCycle; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "结算日", hidden = true) private Date settlementDay; @@ -186,12 +178,12 @@ public class StoreDetail { private String salesConsigneeDetail; - public StoreDetail(Store store, AdminStoreApplyDTO adminStoreApplyDTO){ - this.storeId=store.getId(); + public StoreDetail(Store store, AdminStoreApplyDTO adminStoreApplyDTO) { + this.storeId = store.getId(); //设置店铺公司信息、设置店铺银行信息、设置店铺其他信息 BeanUtil.copyProperties(adminStoreApplyDTO, this); - this.settlementDay= DateUtil.date(); - this.stockWarning=10; + this.settlementDay = DateUtil.date(); + this.stockWarning = 10; } diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreGoodsLabel.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreGoodsLabel.java index b49a60a72..1670ff481 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreGoodsLabel.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreGoodsLabel.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.math.BigDecimal; @@ -19,8 +17,6 @@ * @since 2020-02-18 15:18:56 */ @Data -@Entity -@Table(name = "li_store_goods_label") @TableName("li_store_goods_label") @ApiModel(value = "店铺商品分类") public class StoreGoodsLabel extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreLogistics.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreLogistics.java index 838375ae8..ef27dbb5b 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreLogistics.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreLogistics.java @@ -8,8 +8,6 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotNull; /** @@ -19,8 +17,6 @@ * @since 2020/11/17 8:01 下午 */ @Data -@Entity -@Table(name = "li_store_logistics") @TableName("li_store_logistics") @ApiModel(value = "店铺-物流公司") @AllArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/BillDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/BillDTO.java index 59690e4d0..b3ba6affc 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dto/BillDTO.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/BillDTO.java @@ -3,7 +3,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Column; import java.io.Serializable; /** @@ -18,42 +17,33 @@ public class BillDTO implements Serializable { private static final long serialVersionUID = 4441580387361184989L; - @Column(name = "order_price") @ApiModelProperty(value = "结算周期内订单付款总金额") private Double orderPrice; - @Column(name = "refund_price") @ApiModelProperty(value = "退单金额") private Double refundPrice; - @Column(name = "commission_price") @ApiModelProperty(value = "平台收取佣金") private Double commissionPrice; - @Column(name = "refund_commission_price") @ApiModelProperty(value = "退单产生退还佣金金额") private Double refundCommissionPrice; - @Column(name = "distribution_commission") @ApiModelProperty(value = "分销返现支出") private Double distributionCommission; - @Column(name = "distribution_refund_commission") @ApiModelProperty(value = "分销订单退还，返现佣金返还") private Double distributionRefundCommission; - @Column(name = "site_coupon_commission") @ApiModelProperty(value = "平台优惠券补贴") private Double siteCouponCommission; - @Column(name = "site_coupon_refund_commission") @ApiModelProperty(value = "退货平台优惠券补贴返还") private Double siteCouponRefundCommission; - @Column(name = "site_coupon_price") @ApiModelProperty(value = "平台优惠券 使用金额") private Double siteCouponPrice; - @Column(name = "site_coupon_point") + @ApiModelProperty(value = "平台优惠券 返点") private Double siteCouponPoint; diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/BillSearchParams.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/BillSearchParams.java index 0a8533c93..da1e91eaa 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dto/BillSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/BillSearchParams.java @@ -21,12 +21,12 @@ public class BillSearchParams extends PageVO { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "起始日期") private String startDate; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "结束日期") private String endDate; diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java index d91129fe4..0782a3e6f 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java @@ -8,8 +8,6 @@ import lombok.Data; import org.hibernate.validator.constraints.Length; -import javax.persistence.Column; -import javax.persistence.Id; import javax.validation.constraints.Email; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; @@ -25,10 +23,6 @@ public class StoreEditDTO { - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") @ApiModelProperty(value = "唯一标识", hidden = true) private String id; @@ -131,7 +125,6 @@ public class StoreEditDTO { @NotBlank(message = "店铺经营类目不能为空") @ApiModelProperty(value = "店铺经营类目") - @Column(columnDefinition = "TEXT") private String goodsManagementCategory; @ApiModelProperty(value = "结算周期") diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/AppVersion.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/AppVersion.java index 4e183c989..e152e3987 100755 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/AppVersion.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/AppVersion.java @@ -1,5 +1,6 @@ package cn.lili.modules.system.entity.dos; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -12,10 +13,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import java.util.Date; @@ -26,24 +23,15 @@ * @since 2020-06-20 09:29:19 */ @Data -@Entity -@Table(name = "li_app_version") @TableName("li_app_version") @ApiModel(value = "app版本控制") -public class AppVersion { +public class AppVersion extends IdEntity { private static final long serialVersionUID = 3034686331756935L; - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; - @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime; @@ -74,7 +62,7 @@ public class AppVersion { @ApiModelProperty(value = "类型") private String type; - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "版本更新时间") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date versionUpdateDate; diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDelivery.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDelivery.java index 03559f7a3..becf1ec8d 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDelivery.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDelivery.java @@ -11,9 +11,6 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 即时配送 @@ -22,8 +19,6 @@ * @since 2020/12/01 15:58 */ @Data -@Entity -@Table(name = "li_instant_delivery") @TableName("li_instant_delivery") @ApiModel(value = "即时配送") @AllArgsConstructor @@ -45,7 +40,6 @@ public class InstantDelivery extends BaseEntity { * 即时配送配置 */ @ApiModelProperty(value = "即时配送配置") - @Column(columnDefinition = "TEXT") private String deliveryConfig; /** * 即时配送bean diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDeliveryLog.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDeliveryLog.java index 1422e8d44..4812d13b9 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDeliveryLog.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDeliveryLog.java @@ -4,6 +4,7 @@ import cn.lili.common.utils.StringUtils; import cn.lili.modules.system.entity.plugin.logistics.dada.enums.DadaOrderStatusEnum; import cn.lili.modules.system.entity.plugin.logistics.dada.vo.DdOrderBackVO; +import cn.lili.mybatis.IdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -17,10 +18,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; import java.util.Date; /** @@ -31,24 +28,16 @@ */ @Data -@Entity -@Table(name = "li_instant_delivery_log") @TableName("li_instant_delivery_log") @ApiModel(value = "即时配送日志") @AllArgsConstructor @NoArgsConstructor -public class InstantDeliveryLog { +public class InstantDeliveryLog extends IdEntity { - @Id - @TableId - @TableField - @Column(columnDefinition = "bigint(20)") - @ApiModelProperty(value = "唯一标识", hidden = true) - private String id; @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime; diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/Logistics.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/Logistics.java index 4ee341404..5b614639d 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/Logistics.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/Logistics.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotEmpty; /** @@ -17,8 +15,6 @@ * @since 2020/11/17 8:01 下午 */ @Data -@Entity -@Table(name = "li_logistics") @TableName("li_logistics") @ApiModel(value = "物流公司") public class Logistics extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/Region.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/Region.java index e5882df38..c016bb6de 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/Region.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/Region.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -17,8 +15,6 @@ * @since 2020-02-25 14:10:16 */ @Data -@Entity -@Table(name = "li_region") @TableName("li_region") @ApiModel(value = "行政地区") public class Region extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/SensitiveWords.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/SensitiveWords.java index 1854a80a8..49fa833ab 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/SensitiveWords.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/SensitiveWords.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.Size; @@ -17,8 +15,6 @@ * 2020-02-25 14:10:16 */ @Data -@Entity -@Table(name = "li_sensitive_words") @TableName("li_sensitive_words") @ApiModel(value = "敏感词") public class SensitiveWords extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/ServiceNotice.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/ServiceNotice.java index 13916af13..1b5c24693 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/ServiceNotice.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/ServiceNotice.java @@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 服务订阅消息 @@ -15,8 +13,6 @@ * @since 2020-02-25 14:10:16 */ @Data -@Entity -@Table(name = "li_service_notice") @TableName("li_service_notice") @ApiModel(value = "服务订阅消息") public class ServiceNotice extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/Setting.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/Setting.java index daed12a11..4f8a37a8c 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/Setting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/Setting.java @@ -7,8 +7,6 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.persistence.Entity; -import javax.persistence.Table; /** * 设置 @@ -16,8 +14,6 @@ * @since 2020-02-25 14:10:16 */ @Data -@Entity -@Table(name = "li_setting") @TableName("li_setting") @ApiModel(value = "配置") @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java index 304823aaf..975665d6b 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java @@ -7,17 +7,12 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.persistence.Entity; -import javax.persistence.Table; - /** * 验证码资源维护 * @author Chopper * @since 2021/1/30 4:13 下午 */ @Data -@Entity -@Table(name = "li_verification_source") @TableName("li_verification_source") @ApiModel(value = "验证码资源维护") public class VerificationSource extends BaseEntity { diff --git a/framework/src/main/java/cn/lili/mybatis/BaseEntity.java b/framework/src/main/java/cn/lili/mybatis/BaseEntity.java index a37fa984a..1a265b63e 100644 --- a/framework/src/main/java/cn/lili/mybatis/BaseEntity.java +++ b/framework/src/main/java/cn/lili/mybatis/BaseEntity.java @@ -13,13 +13,8 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedBy; import org.springframework.data.annotation.LastModifiedDate; -import org.springframework.data.jpa.domain.support.AuditingEntityListener; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.EntityListeners; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; import java.io.Serializable; import java.util.Date; @@ -32,8 +27,6 @@ * @since 2020/8/20 14:34 */ @Data -@MappedSuperclass -@EntityListeners(AuditingEntityListener.class) @JsonIgnoreProperties(value = {"hibernateLazyInitializer", "handler", "fieldHandler"}) @AllArgsConstructor @NoArgsConstructor @@ -42,10 +35,8 @@ public abstract class BaseEntity implements Serializable { private static final long serialVersionUID = 1L; - @Id @TableId @TableField - @Column(columnDefinition = "bigint(20)") @ApiModelProperty(value = "唯一标识", hidden = true) private String id; @@ -57,7 +48,7 @@ public abstract class BaseEntity implements Serializable { @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime; @@ -69,13 +60,13 @@ public abstract class BaseEntity implements Serializable { @LastModifiedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(fill = FieldFill.UPDATE) @ApiModelProperty(value = "更新时间", hidden = true) private Date updateTime; @TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "删除标志 true/false 删除/未删除", hidden = true) - private Boolean deleteFlag ; + private Boolean deleteFlag; } diff --git a/framework/src/main/java/cn/lili/mybatis/IdEntity.java b/framework/src/main/java/cn/lili/mybatis/IdEntity.java index 5e17357a3..8ba15c9a9 100644 --- a/framework/src/main/java/cn/lili/mybatis/IdEntity.java +++ b/framework/src/main/java/cn/lili/mybatis/IdEntity.java @@ -7,12 +7,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import javax.persistence.Column; -import javax.persistence.EntityListeners; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; import java.io.Serializable; @@ -24,8 +19,6 @@ * @since 2020/8/20 14:34 */ @Data -@MappedSuperclass -@EntityListeners(AuditingEntityListener.class) @JsonIgnoreProperties(value = {"hibernateLazyInitializer", "handler", "fieldHandler"}) @AllArgsConstructor @NoArgsConstructor @@ -34,10 +27,8 @@ public abstract class IdEntity implements Serializable { private static final long serialVersionUID = 1L; - @Id @TableId @TableField - @Column(columnDefinition = "bigint(20)") @ApiModelProperty(value = "唯一标识", hidden = true) private String id; diff --git a/framework/src/main/resources/hibernate.properties b/framework/src/main/resources/hibernate.properties deleted file mode 100644 index c0d0fe469..000000000 --- a/framework/src/main/resources/hibernate.properties +++ /dev/null @@ -1,2 +0,0 @@ -# 自动生成数据库表引擎为InnoDB -hibernate.dialect.storage_engine=innodb diff --git a/manager-api/src/main/java/cn/lili/ManagerApiApplication.java b/manager-api/src/main/java/cn/lili/ManagerApiApplication.java index d246b8ab6..b8a5b384c 100644 --- a/manager-api/src/main/java/cn/lili/ManagerApiApplication.java +++ b/manager-api/src/main/java/cn/lili/ManagerApiApplication.java @@ -6,7 +6,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Primary; import org.springframework.core.task.TaskExecutor; -import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; @@ -19,7 +18,6 @@ @SpringBootApplication @EnableCaching @EnableAsync -@EnableJpaAuditing public class ManagerApiApplication { @Primary diff --git a/manager-api/src/main/resources/application.yml b/manager-api/src/main/resources/application.yml index 7d5fef0fb..6ac2b29c8 100644 --- a/manager-api/src/main/resources/application.yml +++ b/manager-api/src/main/resources/application.yml @@ -39,11 +39,6 @@ spring: # replica-set-name: mongoreplset cache: type: redis - - jpa: - # 自动生成表结构 - generate-ddl: true - open-in-view: false # Redis redis: host: 127.0.0.1 diff --git a/pom.xml b/pom.xml index 453977cb2..c8200a5ca 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,6 @@ 3.0.0 2.9.10 1.18.10 - 6.0.11 4.5.18 3.11.1 2.0.1 diff --git a/seller-api/src/main/java/cn/lili/StoreApiApplication.java b/seller-api/src/main/java/cn/lili/StoreApiApplication.java index 58869a2d1..b2f3f73c9 100644 --- a/seller-api/src/main/java/cn/lili/StoreApiApplication.java +++ b/seller-api/src/main/java/cn/lili/StoreApiApplication.java @@ -6,7 +6,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Primary; import org.springframework.core.task.TaskExecutor; -import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; @@ -17,7 +16,6 @@ * @since 2020/11/16 10:03 下午 */ @SpringBootApplication -@EnableJpaAuditing @EnableCaching @EnableAsync public class StoreApiApplication { diff --git a/seller-api/src/main/resources/application.yml b/seller-api/src/main/resources/application.yml index d1723b324..b4980cdeb 100644 --- a/seller-api/src/main/resources/application.yml +++ b/seller-api/src/main/resources/application.yml @@ -39,11 +39,6 @@ spring: # replica-set-name: mongoreplset cache: type: redis - - jpa: - # 自动生成表结构 - generate-ddl: true - open-in-view: false # Redis redis: host: 127.0.0.1