caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去除jpa依赖，部分不相关的代码去除。

Browse Source
This commit is contained in:
Chopper 2021-08-30 14:32:49 +08:00
parent 74f92506d0
commit f8c1e9d8b8
142 changed files with 137 additions and 1038 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buyer-api/src/main/java/cn/lili/BuyerApiApplication.java
View File

@ -6,7 +6,6 @@ import org.springframework.cache.annotation.EnableCaching;
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 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
* @since 2020/11/16 10:03 下午
*/
@SpringBootApplication
@EnableJpaAuditing
@EnableCaching
@EnableAsync
public class BuyerApiApplication {

5
buyer-api/src/main/resources/application.yml
View File

@ -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

4
buyer-api/src/test/resources/application.yml
View File

@ -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

5
common-api/src/main/resources/application.yml
View File

@ -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

4
config/application.yml
View File

@ -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

5
consumer/src/main/resources/application.yml
View File

@ -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

48
framework/pom.xml
View File

@ -63,11 +63,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId>
</dependency>
<!-- JPA -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<!-- &lt;!&ndash; Websocket &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>org.springframework.boot</groupId>-->
@ -102,26 +97,6 @@
<artifactId>knife4j-spring-boot-starter</artifactId>
<version>${knife4j.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>io.springfox</groupId>-->
<!-- <artifactId>springfox-swagger-ui</artifactId>-->
<!-- <version>${swagger-version}</version>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <artifactId>guava</artifactId>-->
<!-- <groupId>com.google.guava</groupId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <artifactId>javassist</artifactId>-->
<!-- <groupId>org.javassist</groupId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>io.springfox</groupId>-->
<!-- <artifactId>springfox-swagger2</artifactId>-->
<!-- <version>${swagger-version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>swagger-bootstrap-ui</artifactId>
@ -156,22 +131,6 @@
<artifactId>beetl</artifactId>
<version>${beetl-version}</version>
</dependency>
<!-- Minio -->
<dependency>
<groupId>io.minio</groupId>
<artifactId>minio</artifactId>
<version>${minio-version}</version>
<exclusions>
<exclusion>
<artifactId>jsr305</artifactId>
<groupId>com.google.code.findbugs</groupId>
</exclusion>
<exclusion>
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- 阿里云核心包-->
<dependency>
<groupId>com.aliyun</groupId>
@ -229,13 +188,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<!-- <scope>test</scope>-->
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>org.junit.vintage</groupId>-->
<!-- <artifactId>junit-vintage-engine</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
</dependency>
<!-- 解决版本提示问题 -->

2
framework/src/main/java/cn/lili/common/security/token/SecretKeyUtil.java
View File

@ -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;

2
framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchConfig.java
View File

@ -18,7 +18,6 @@ import org.springframework.context.annotation.Bean;
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());

18
framework/src/main/java/cn/lili/modules/connect/entity/Connect.java
View File

@ -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.CreatedBy;
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 @@ import java.util.Date;
* @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;

4
framework/src/main/java/cn/lili/modules/connect/entity/ConnectConfig.java
View File

@ -8,8 +8,6 @@ import io.swagger.annotations.ApiModelProperty;
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 @@ import java.util.Map;
* @author Chopper
*/
@Data
@Entity
@Table(name = "li_connect_config")
@TableName("li_connect_config")
@ApiModel(value = "联合登陆配置")
@NoArgsConstructor

4
framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java
View File

@ -10,8 +10,6 @@ import io.swagger.annotations.ApiModelProperty;
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 @@ import javax.validation.constraints.Size;
* @since 2020-03-14 23:04:56
*/
@Data
@Entity
@ApiModel(value = "分销员")
@TableName("li_distribution")
@Table(name = "li_distribution")
@NoArgsConstructor
public class Distribution extends BaseEntity {

6
framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java
View File

@ -12,8 +12,6 @@ import lombok.NoArgsConstructor;
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 @@ import java.util.Date;
* @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;

20
framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionGoods.java
View File

@ -3,9 +3,9 @@ package cn.lili.modules.distribution.entity.dos;
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.CreatedBy;
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 @@ import java.util.Map;
* @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;

12
framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java
View File

@ -2,6 +2,7 @@ package cn.lili.modules.distribution.entity.dos;
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 lombok.NoArgsConstructor;
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 @@ import java.util.Date;
* @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;

16
framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionSelectedGoods.java
View File

@ -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 io.swagger.annotations.ApiModelProperty;
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 @@ import javax.persistence.Table;
* @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;

4
framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionGoodsVO.java
View File

@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
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;

6
framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionOrderSearchParams.java
View File

@ -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;

4
framework/src/main/java/cn/lili/modules/file/entity/File.java
View File

@ -8,8 +8,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 文件系统
@ -18,8 +16,6 @@ import javax.persistence.Table;
* @since 2020/11/26 15:35
*/
@Data
@Entity
@Table(name = "li_file")
@TableName("li_file")
@ApiModel(value = "文件")
public class File extends BaseEntity {

4
framework/src/main/java/cn/lili/modules/goods/entity/dos/Brand.java
View File

@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
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 @@ import javax.validation.constraints.NotEmpty;
* @since 2020-02-18 15:18:56
*/
@Data
@Entity
@Table(name = "li_brand")
@TableName("li_brand")
@ApiModel(value = "商品品牌")
public class Brand extends BaseEntity {

4
framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java
View File

@ -8,8 +8,6 @@ import lombok.AllArgsConstructor;
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 @@ import java.util.Date;
* @since 2020-02-18 15:18:56
*/
@Data
@Entity
@Table(name = "li_category")
@TableName("li_category")
@ApiModel(value = "商品分类")
@AllArgsConstructor

28
framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryBrand.java
View File

@ -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.CreatedBy;
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 @@ import java.util.Date;
* @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;
}
}

4
framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryParameterGroup.java
View File

@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty;
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 @@ import javax.validation.constraints.NotNull;
* @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 {

5
framework/src/main/java/cn/lili/modules/goods/entity/dos/CategorySpecification.java
View File

@ -9,9 +9,6 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 分类参数组关联
*
@ -19,8 +16,6 @@ import javax.persistence.Table;
* @since 2020-02-26 10:34:02
*/
@Data
@Entity
@Table(name = "li_category_specification")
@TableName("li_category_specification")
@NoArgsConstructor
@AllArgsConstructor

4
framework/src/main/java/cn/lili/modules/goods/entity/dos/Commodity.java
View File

@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 小程序直播商品
@ -16,10 +14,8 @@ import javax.persistence.Table;
*
*/
@Data
@Entity
@ApiModel(value = "Commodity", description = "直播商品")
@TableName("li_commodity")
@Table(name = "li_commodity")
public class Commodity extends BaseEntity {
@ApiModelProperty(value = "图片")

11
framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java
View File

@ -11,9 +11,6 @@ import lombok.Data;
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 @@ import javax.validation.constraints.Max;
* @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;

6
framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
View File

@ -16,9 +16,6 @@ import io.swagger.annotations.ApiModelProperty;
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 @@ import java.util.Map;
* @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;

16
framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsGallery.java
View File

@ -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 io.swagger.annotations.ApiModelProperty;
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 @@ import java.io.Serializable;
* @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

8
framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java
View File

@ -10,9 +10,6 @@ import io.swagger.annotations.ApiModelProperty;
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 @@ import java.util.Date;
* @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 = "商品视频")

4
framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsUnit.java
View File

@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
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 @@ import javax.validation.constraints.NotEmpty;
* @since: 2020/11/26 16:08
*/
@Data
@Entity
@Table(name = "li_goods_unit")
@TableName("li_goods_unit")
@ApiModel(value = "商品计量单位")
public class GoodsUnit extends BaseEntity {

5
framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsWords.java
View File

@ -7,9 +7,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 商品关键字
@ -18,8 +15,6 @@ import javax.persistence.Table;
* @since 2020/10/15
*/
@Data
@Entity
@Table(name = "li_goods_words")
@TableName("li_goods_words")
@ApiModel(value = "商品关键字")
@NoArgsConstructor

4
framework/src/main/java/cn/lili/modules/goods/entity/dos/Parameters.java
View File

@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty;
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 @@ import javax.validation.constraints.NotNull;
* @since 2020-02-23 9:14:33
*/
@Data
@Entity
@Table(name = "li_parameters")
@TableName("li_parameters")
@ApiModel(value = "商品参数")
public class Parameters extends IdEntity {

6
framework/src/main/java/cn/lili/modules/goods/entity/dos/Specification.java
View File

@ -7,9 +7,6 @@ import io.swagger.annotations.ApiModel;
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 @@ import javax.validation.constraints.NotEmpty;
* @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;

4
framework/src/main/java/cn/lili/modules/goods/entity/dos/Studio.java
View File

@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 小程序直播间
@ -16,10 +14,8 @@ import javax.persistence.Table;
* @since: 2021/5/17 9:47 上午
*/
@Data
@Entity
@ApiModel(value = "直播间")
@TableName("li_studio")
@Table(name = "li_studio")
public class Studio extends BaseEntity {
/**

16
framework/src/main/java/cn/lili/modules/goods/entity/dos/StudioCommodity.java
View File

@ -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 io.swagger.annotations.ApiModelProperty;
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 @@ import javax.persistence.Table;
* @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;

4
framework/src/main/java/cn/lili/modules/member/entity/dos/FootPrint.java
View File

@ -8,8 +8,6 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 浏览历史
@ -18,8 +16,6 @@ import javax.persistence.Table;
* @since 2020/11/17 7:22 下午
*/
@Data
@Entity
@Table(name = "li_foot_print")
@TableName("li_foot_print")
@ApiModel(value = "浏览历史")
@NoArgsConstructor

18
framework/src/main/java/cn/lili/modules/member/entity/dos/GoodsCollection.java
View File

@ -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 lombok.NoArgsConstructor;
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 @@ import java.util.Date;
* @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;

4
framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java
View File

@ -10,8 +10,6 @@ import lombok.Data;
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 @@ import java.util.Date;
* @since 2020-02-25 14:10:16
*/
@Data
@Entity
@Table(name = "li_member")
@TableName("li_member")
@ApiModel(value = "会员")
@NoArgsConstructor

4
framework/src/main/java/cn/lili/modules/member/entity/dos/MemberAddress.java
View File

@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModel;
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 @@ import javax.validation.constraints.NotEmpty;
* @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 {

4
framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java
View File

@ -13,8 +13,6 @@ import lombok.Data;
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 @@ import javax.validation.constraints.NotNull;
* @since 2020-02-25 14:10:16
*/
@Data
@Entity
@Table(name = "li_member_evaluation")
@TableName("li_member_evaluation")
@ApiModel(value = "会员商品评价")
@NoArgsConstructor

4
framework/src/main/java/cn/lili/modules/member/entity/dos/MemberGrade.java
View File

@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
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 @@ import javax.validation.constraints.NotNull;
* @since 2021/5/14 5:43 下午
*/
@Data
@Entity
@Table(name = "li_member_grade")
@TableName("li_member_grade")
@ApiModel(value = "会员等级")
public class MemberGrade extends BaseEntity {

4
framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNotice.java
View File

@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 会员站内信
@ -16,8 +14,6 @@ import javax.persistence.Table;
* @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 {

42
framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeLog.java
View File

@ -8,9 +8,6 @@ import io.swagger.annotations.ApiModelProperty;
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 @@ import java.util.Date;
* @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;

9
framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeSenter.java
View File

@ -6,9 +6,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 会员消息
@ -17,33 +14,27 @@ import javax.persistence.Table;
* @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;

16
framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java
View File

@ -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.CreatedBy;
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 @@ import java.util.Date;
* @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)

13
framework/src/main/java/cn/lili/modules/member/entity/dos/MemberReceipt.java
View File

@ -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 lombok.Data;
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 @@ import java.util.Date;
* @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;

18
framework/src/main/java/cn/lili/modules/member/entity/dos/MemberSign.java
View File

@ -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 lombok.Data;
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 @@ import java.util.Date;
* @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;

4
framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWallet.java
View File

@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 会员预存款
@ -16,8 +14,6 @@ import javax.persistence.Table;
* @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 {

10
framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWithdrawApply.java
View File

@ -10,8 +10,6 @@ import io.swagger.annotations.ApiModelProperty;
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 @@ import java.util.Date;
* @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;
}

4
framework/src/main/java/cn/lili/modules/member/entity/dos/StoreCollection.java
View File

@ -8,8 +8,6 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 会员店铺收藏
@ -18,8 +16,6 @@ import javax.persistence.Table;
* @since 2020/11/18 3:32 下午
*/
@Data
@Entity
@Table(name = "li_store_collection")
@TableName("li_store_collection")
@ApiModel(value = "会员收藏")
@NoArgsConstructor

4
framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java
View File

@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 会员接受消息对象
@ -17,8 +15,6 @@ import javax.persistence.Table;
* @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 {

7
framework/src/main/java/cn/lili/modules/message/entity/dos/Message.java
View File

@ -9,9 +9,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
* 管理段发送消息对象
@ -20,8 +17,6 @@ import javax.persistence.Transient;
*/
@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;

5
framework/src/main/java/cn/lili/modules/message/entity/dos/NoticeMessage.java
View File

@ -6,9 +6,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 通知类站内信模版对象
*
@ -17,8 +14,6 @@ import javax.persistence.Table;
* @since 2020/12/8 9:46
*/
@Data
@Entity
@Table(name = "li_notice_message")
@TableName("li_notice_message")
@ApiModel(value = "通知类消息模板")
public class NoticeMessage extends BaseEntity {

5
framework/src/main/java/cn/lili/modules/message/entity/dos/ShortLink.java
View File

@ -6,15 +6,12 @@ import io.swagger.annotations.ApiModel;
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 {

16
framework/src/main/java/cn/lili/modules/message/entity/dos/SmsReach.java
View File

@ -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 lombok.Data;
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 @@ import java.util.Date;
* @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;

14
framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java
View File

@ -7,11 +7,6 @@ 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;
/**
* 短信签名
@ -20,19 +15,10 @@ import javax.persistence.Table;
* @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;

17
framework/src/main/java/cn/lili/modules/message/entity/dos/SmsTemplate.java
View File

@ -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.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;
/**
* 短信模板
@ -20,18 +16,9 @@ import javax.persistence.Table;
* @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;

18
framework/src/main/java/cn/lili/modules/message/entity/dos/StoreMessage.java
View File

@ -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.CreatedBy;
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;

6
framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMPMessage.java
View File

@ -6,15 +6,11 @@ import io.swagger.annotations.ApiModel;
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 {

4
framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMessage.java
View File

@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 微信消息
@ -17,8 +15,6 @@ import javax.persistence.Table;
* @since 2020/12/10 17:02
*/
@Data
@Entity
@Table(name = "li_wechat_message")
@TableName("li_wechat_message")
@ApiModel(value = "微信消息")
public class WechatMessage extends BaseEntity {

6
framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSale.java
View File

@ -8,9 +8,6 @@ import io.swagger.annotations.ApiModelProperty;
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 @@ import java.util.Date;
* @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;

4
framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSaleReason.java
View File

@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
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 @@ import javax.validation.constraints.NotNull;
* @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 {

8
framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java
View File

@ -22,9 +22,6 @@ import lombok.Data;
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 @@ import java.util.Optional;
* @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;

4
framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaint.java
View File

@ -8,8 +8,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
@ -19,8 +17,6 @@ import java.util.Date;
* @since 2020/12/4
**/
@Data
@Entity
@Table(name = "li_order_complaint")
@TableName("li_order_complaint")
@ApiModel(value = "订单交易投诉")
public class OrderComplaint extends BaseEntity {

4
framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderComplaintCommunication.java
View File

@ -8,8 +8,6 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 交易投诉通信
@ -18,8 +16,6 @@ import javax.persistence.Table;
* @since 2020/12/5
**/
@Data
@Entity
@Table(name = "li_order_complaint_communication")
@TableName("li_order_complaint_communication")
@ApiModel(value = "订单交易投诉通信")
@AllArgsConstructor

7
framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java
View File

@ -20,9 +20,6 @@ import lombok.AllArgsConstructor;
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 @@ import java.util.stream.Collectors;
* @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;

6
framework/src/main/java/cn/lili/modules/order/order/entity/dos/Receipt.java
View File

@ -6,9 +6,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 发票
@ -17,8 +14,6 @@ import javax.persistence.Table;
* @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;

17
framework/src/main/java/cn/lili/modules/order/order/entity/dos/StoreFlow.java
View File

@ -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 lombok.Data;
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 @@ import java.util.Date;
* @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;

4
framework/src/main/java/cn/lili/modules/order/order/entity/dos/Trade.java
View File

@ -10,8 +10,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 交易
@ -20,8 +18,6 @@ import javax.persistence.Table;
* @since 2020/11/17 7:34 下午
*/
@Data
@Entity
@Table(name = "li_trade")
@TableName("li_trade")
@ApiModel(value = "交易")
@NoArgsConstructor

6
framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java
View File

@ -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;

2
framework/src/main/java/cn/lili/modules/order/order/entity/dto/ReceiptDTO.java
View File

@ -3,7 +3,6 @@ package cn.lili.modules.order.order.entity.dto;
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 = "数量")

4
framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleSearchParams.java
View File

@ -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;

7
framework/src/main/java/cn/lili/modules/order/order/entity/vo/PaymentLog.java
View File

@ -9,7 +9,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Entity;
import java.util.Date;
/**
@ -19,7 +18,7 @@ import java.util.Date;
* @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() {
}
}

18
framework/src/main/java/cn/lili/modules/order/trade/entity/dos/AfterSaleLog.java
View File

@ -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.CreatedBy;
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 @@ import java.util.Date;
* @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;

17
framework/src/main/java/cn/lili/modules/order/trade/entity/dos/OrderLog.java
View File

@ -2,6 +2,7 @@ package cn.lili.modules.order.trade.entity.dos;
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.CreatedBy;
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 @@ import java.util.Date;
* @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;

20
framework/src/main/java/cn/lili/modules/order/trade/entity/dos/Recharge.java
View File

@ -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.CreatedBy;
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 @@ import java.util.Date;
* @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;

18
framework/src/main/java/cn/lili/modules/order/trade/entity/dos/WalletLog.java
View File

@ -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.CreatedBy;
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 @@ import java.util.Date;
* @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;

4
framework/src/main/java/cn/lili/modules/page/entity/dos/Article.java
View File

@ -8,8 +8,6 @@ import io.swagger.annotations.ApiModelProperty;
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 @@ import javax.validation.constraints.NotNull;
* @since 2020/12/10 17:42
*/
@Data
@Entity
@Table(name = "li_article")
@TableName("li_article")
@ApiModel(value = "文章")
public class Article extends BaseEntity {

4
framework/src/main/java/cn/lili/modules/page/entity/dos/ArticleCategory.java
View File

@ -9,8 +9,6 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.validation.constraints.NotEmpty;
/**
@ -21,8 +19,6 @@ import javax.validation.constraints.NotEmpty;
* @since 2020/12/10 17:42
*/
@Data
@Entity
@Table(name = "li_article_category")
@TableName("li_article_category")
@ApiModel(value = "文章分类")
@NoArgsConstructor

17
framework/src/main/java/cn/lili/modules/page/entity/dos/Feedback.java
View File

@ -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.hibernate.validator.constraints.Length;
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 @@ import java.util.Date;
* @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;

4
framework/src/main/java/cn/lili/modules/page/entity/dos/PageData.java
View File

@ -11,8 +11,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 页面数据DO
@ -21,8 +19,6 @@ import javax.persistence.Table;
* @since 2020/12/10 17:42
*/
@Data
@Entity
@Table(name = "li_page_data")
@TableName("li_page_data")
@ApiModel(value = "页面数据DO")
@NoArgsConstructor

4
framework/src/main/java/cn/lili/modules/page/entity/dos/Special.java
View File

@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 专题活动
@ -17,8 +15,6 @@ import javax.persistence.Table;
* @since 2020/12/10 17:42
*/
@Data
@Entity
@Table(name = "li_special")
@TableName("li_special")
@ApiModel(value = "专题活动")
public class Special extends BaseEntity {

20
framework/src/main/java/cn/lili/modules/payment/entity/RefundLog.java
View File

@ -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 lombok.NoArgsConstructor;
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 @@ import java.util.Date;
* @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;

7
framework/src/main/java/cn/lili/modules/permission/entity/dos/AdminUser.java
View File

@ -6,9 +6,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 管理员类
@ -17,8 +14,6 @@ import javax.persistence.Table;
* @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 = "是否是超级管理员 超级管理员/普通管理员")

8
framework/src/main/java/cn/lili/modules/permission/entity/dos/Department.java
View File

@ -6,9 +6,6 @@ import io.swagger.annotations.ApiModel;
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 @@ import java.math.BigDecimal;
* @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;
}

4
framework/src/main/java/cn/lili/modules/permission/entity/dos/DepartmentRole.java
View File

@ -8,8 +8,6 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 角色部门绑定关系
@ -18,8 +16,6 @@ import javax.persistence.Table;
* @since 2020/11/19 12:18
*/
@Data
@Entity
@Table(name = "li_department_role")
@TableName("li_department_role")
@ApiModel(value = "角色部门")
@NoArgsConstructor

8
framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java
View File

@ -6,9 +6,6 @@ import io.swagger.annotations.ApiModel;
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 @@ import java.math.BigDecimal;
* @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;

4
framework/src/main/java/cn/lili/modules/permission/entity/dos/Role.java
View File

@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 角色
@ -18,8 +16,6 @@ import javax.persistence.Table;
*/
@EqualsAndHashCode(callSuper = true)
@Data
@Entity
@Table(name = "li_role")
@TableName("li_role")
@ApiModel(value = "角色")
public class Role extends BaseEntity {

4
framework/src/main/java/cn/lili/modules/permission/entity/dos/RoleMenu.java
View File

@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 角色权限绑定关系
@ -16,8 +14,6 @@ import javax.persistence.Table;
* @since 2020/11/19 12:18
*/
@Data
@Entity
@Table(name = "li_role_menu")
@TableName("li_role_menu")
@ApiModel(value = "角色权限")
public class RoleMenu extends BaseEntity {

5
framework/src/main/java/cn/lili/modules/permission/entity/dos/UserRole.java
View File

@ -6,9 +6,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 用户角色
*
@ -16,8 +13,6 @@ import javax.persistence.Table;
* @since 2020/11/19 12:18
*/
@Data
@Entity
@Table(name = "li_user_role")
@TableName("li_user_role")
@ApiModel(value = "用户角色")
public class UserRole extends IdEntity {

2
framework/src/main/java/cn/lili/modules/permission/entity/dto/AdminUserDTO.java
View File

@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModel;
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 = "密码不能为空")

6
framework/src/main/java/cn/lili/modules/promotion/entity/dos/Coupon.java
View File

@ -6,9 +6,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 优惠券活动实体类
@ -17,8 +14,6 @@ import javax.persistence.Table;
* @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;
/**

4
framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivity.java
View File

@ -8,8 +8,6 @@ import io.swagger.annotations.ApiModel;
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 @@ import javax.validation.constraints.NotNull;
* @since 2020-03-19 10:44 上午
*/
@Data
@Entity
@Table(name = "li_coupon_activity")
@TableName("li_coupon_activity")
@ApiModel(value = "优惠券活动实体类")
public class CouponActivity extends BasePromotion {

5
framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivityItem.java
View File

@ -6,9 +6,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 优惠券活动实体类
*
@ -16,8 +13,6 @@ import javax.persistence.Table;
* @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 {

4
framework/src/main/java/cn/lili/modules/promotion/entity/dos/FullDiscount.java
View File

@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
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 @@ import javax.validation.constraints.NotNull;
* @since 2020-03-19 10:44 上午
*/
@Data
@Entity
@Table(name = "li_full_discount")
@TableName("li_full_discount")
@ApiModel(value = "满优惠活动")
public class FullDiscount extends BasePromotion {

4
framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivity.java
View File

@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 砍价活动参与实体类
@ -17,8 +15,6 @@ import javax.persistence.Table;
* @date 2020-7-1 10:44 上午
*/
@Data
@Entity
@Table(name = "li_kanjia_activity")
@TableName("li_kanjia_activity")
@ApiModel(value = "砍价活动参与对象")
public class KanjiaActivity extends BaseEntity {

4
framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivityGoods.java
View File

@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
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 @@ import javax.validation.constraints.NotEmpty;
* @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 {

4
framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivityLog.java
View File

@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* 砍价活动商品实体类
@ -16,8 +14,6 @@ import javax.persistence.Table;
* @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 {

6
framework/src/main/java/cn/lili/modules/promotion/entity/dos/MemberCoupon.java
View File

@ -12,9 +12,6 @@ import io.swagger.annotations.ApiModel;
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 @@ import java.util.Date;
* @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 = "使用起始时间")

4
framework/src/main/java/cn/lili/modules/promotion/entity/dos/Pintuan.java
View File

@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
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 @@ import javax.validation.constraints.NotNull;
* @since 2020-03-19 10:44 上午
*/
@Data
@Entity
@Table(name = "li_pintuan")
@TableName("li_pintuan")
@ApiModel(value = "拼团")
public class Pintuan extends BasePromotion {

Some files were not shown because too many files have changed in this diff Show More