diff --git a/admin/admin-application/pom.xml b/admin/admin-application/pom.xml index 0a52ffe9d..78b019b24 100644 --- a/admin/admin-application/pom.xml +++ b/admin/admin-application/pom.xml @@ -11,17 +11,17 @@ admin-application - - 1.3.0.Final - - cn.iocoder.mall admin-service-impl 1.0-SNAPSHOT - + + cn.iocoder.mall + admin-sdk + 1.0-SNAPSHOT + cn.iocoder.mall common-framework @@ -42,42 +42,24 @@ com.alibaba dubbo - 2.6.5 - com.alibaba.boot dubbo-spring-boot-starter - 0.2.1.RELEASE org.apache.curator curator-framework - 2.12.0 - - - - org.mapstruct - mapstruct - ${org.mapstruct.version} io.springfox springfox-swagger2 - 2.9.2 io.springfox springfox-swagger-ui - 2.9.2 - - - - org.mapstruct - mapstruct - ${org.mapstruct.version} @@ -86,12 +68,6 @@ true - - cn.iocoder.mall - admin-sdk - 1.0-SNAPSHOT - - @@ -121,31 +97,16 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - org.mapstruct - mapstruct-processor - ${org.mapstruct.version} - - - org.springframework.boot spring-boot-maven-plugin - - true - - \ No newline at end of file + diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminInfoVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminInfoVO.java index 25cf0e545..676ea0c55 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminInfoVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminInfoVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Set; @ApiModel("管理员信息 VO") +@Data +@Accessors(chain = true) public class AdminInfoVO { @ApiModelProperty(value = "管理员比那好", required = true, example = "1") @@ -13,22 +17,4 @@ public class AdminInfoVO { @ApiModelProperty(value = "角色编号的数组", required = true, example = "[1, 2]") private Set roleIds; - public Integer getAdminId() { - return adminId; - } - - public AdminInfoVO setAdminId(Integer adminId) { - this.adminId = adminId; - return this; - } - - public Set getRoleIds() { - return roleIds; - } - - public AdminInfoVO setRoleIds(Set roleIds) { - this.roleIds = roleIds; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminMenuTreeNodeVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminMenuTreeNodeVO.java index d61304377..277777fa0 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminMenuTreeNodeVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminMenuTreeNodeVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.List; @ApiModel("管理员拥有的菜单 VO") +@Data +@Accessors(chain = true) public class AdminMenuTreeNodeVO { @ApiModelProperty(value = "菜单编号", required = true, example = "1") @@ -23,58 +27,4 @@ public class AdminMenuTreeNodeVO { @ApiModelProperty(value = "子节点数组") private List children; - public Integer getId() { - return id; - } - - public AdminMenuTreeNodeVO setId(Integer id) { - this.id = id; - return this; - } - - public String getHandler() { - return handler; - } - - public AdminMenuTreeNodeVO setHandler(String handler) { - this.handler = handler; - return this; - } - - public Integer getPid() { - return pid; - } - - public AdminMenuTreeNodeVO setPid(Integer pid) { - this.pid = pid; - return this; - } - - public Integer getSort() { - return sort; - } - - public AdminMenuTreeNodeVO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public AdminMenuTreeNodeVO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public List getChildren() { - return children; - } - - public AdminMenuTreeNodeVO setChildren(List children) { - this.children = children; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminPageVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminPageVO.java index 04dbd89e6..f446bc6fb 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminPageVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminPageVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.List; @ApiModel("管理员分页 VO") +@Data +@Accessors(chain = true) public class AdminPageVO { @ApiModelProperty(value = "管理员数组") @@ -13,22 +17,4 @@ public class AdminPageVO { @ApiModelProperty(value = "管理员总数") private Integer total; - public List getList() { - return list; - } - - public AdminPageVO setList(List list) { - this.list = list; - return this; - } - - public Integer getTotal() { - return total; - } - - public AdminPageVO setTotal(Integer total) { - this.total = total; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminRoleVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminRoleVO.java index a29ce2dcd..4e4b1ae3a 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminRoleVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminRoleVO.java @@ -2,8 +2,12 @@ package cn.iocoder.mall.admin.application.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; @ApiModel("管理员拥有的角色 VO") +@Data +@Accessors(chain = true) public class AdminRoleVO { @ApiModelProperty(value = "角色编号", required = true, example = "1") @@ -13,31 +17,4 @@ public class AdminRoleVO { @ApiModelProperty(value = "是否授权", required = true, example = "true") private Boolean assigned; - public Integer getId() { - return id; - } - - public AdminRoleVO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public AdminRoleVO setName(String name) { - this.name = name; - return this; - } - - public Boolean getAssigned() { - return assigned; - } - - public AdminRoleVO setAssigned(Boolean assigned) { - this.assigned = assigned; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminVO.java index a82a69fae..4a9df5b4c 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/AdminVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; @ApiModel("管理员 VO") +@Data +@Accessors(chain = true) public class AdminVO { @ApiModelProperty(value = "管理员编号", required = true, example = "1") @@ -19,49 +23,4 @@ public class AdminVO { @ApiModelProperty(value = "创建时间", required = true, example = "时间戳格式") private Date createTime; - public Integer getId() { - return id; - } - - public AdminVO setId(Integer id) { - this.id = id; - return this; - } - - public String getUsername() { - return username; - } - - public AdminVO setUsername(String username) { - this.username = username; - return this; - } - - public String getNickname() { - return nickname; - } - - public AdminVO setNickname(String nickname) { - this.nickname = nickname; - return this; - } - - public Integer getStatus() { - return status; - } - - public AdminVO setStatus(Integer status) { - this.status = status; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public AdminVO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictEnumVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictEnumVO.java index 8075d4770..1ac524c91 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictEnumVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictEnumVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.List; @ApiModel("数据字典枚举 VO") +@Data +@Accessors(chain = true) public class DataDictEnumVO { @ApiModelProperty(value = "大类枚举值", required = true, example = "gender") @@ -13,22 +17,4 @@ public class DataDictEnumVO { @ApiModelProperty(value = "小类数值数组", required = true) private List values; - public String getEnumValue() { - return enumValue; - } - - public DataDictEnumVO setEnumValue(String enumValue) { - this.enumValue = enumValue; - return this; - } - - public List getValues() { - return values; - } - - public DataDictEnumVO setValues(List values) { - this.values = values; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictVO.java index c64d1d493..9ebdbb854 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictVO.java @@ -2,8 +2,12 @@ package cn.iocoder.mall.admin.application.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; @ApiModel("数据字典 VO") +@Data +@Accessors(chain = true) public class DataDictVO { @ApiModelProperty(value = "编号", required = true, example = "1") @@ -19,58 +23,4 @@ public class DataDictVO { @ApiModelProperty(value = "备注", example = "你猜") private String memo; - public Integer getId() { - return id; - } - - public DataDictVO setId(Integer id) { - this.id = id; - return this; - } - - public String getEnumValue() { - return enumValue; - } - - public DataDictVO setEnumValue(String enumValue) { - this.enumValue = enumValue; - return this; - } - - public String getValue() { - return value; - } - - public DataDictVO setValue(String value) { - this.value = value; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public DataDictVO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public Integer getSort() { - return sort; - } - - public DataDictVO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getMemo() { - return memo; - } - - public DataDictVO setMemo(String memo) { - this.memo = memo; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictValueVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictValueVO.java index 2602d3359..917ad493f 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictValueVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/DataDictValueVO.java @@ -2,8 +2,12 @@ package cn.iocoder.mall.admin.application.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; @ApiModel("数据字典枚举值 VO") +@Data +@Accessors(chain = true) public class DataDictValueVO { @ApiModelProperty(value = "小类数值", required = true, example = "1") @@ -11,22 +15,4 @@ public class DataDictValueVO { @ApiModelProperty(value = "展示名", required = true, example = "男") private String displayName; - public String getValue() { - return value; - } - - public DataDictValueVO setValue(String value) { - this.value = value; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public DataDictValueVO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/PassportLoginVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/PassportLoginVO.java index 7913f4c3f..7bfd92ecb 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/PassportLoginVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/PassportLoginVO.java @@ -2,8 +2,12 @@ package cn.iocoder.mall.admin.application.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; @ApiModel("登陆结果 VO") +@Data +@Accessors(chain = true) public class PassportLoginVO { @ApiModelProperty(value = "访问令牌", required = true, example = "2e3d7635c15e47e997611707a237859f") @@ -12,32 +16,4 @@ public class PassportLoginVO { private String refreshToken; @ApiModelProperty(value = "过期时间，单位：秒", required = true, example = "2879") private Integer expiresIn; - - public String getAccessToken() { - return accessToken; - } - - public PassportLoginVO setAccessToken(String accessToken) { - this.accessToken = accessToken; - return this; - } - - public String getRefreshToken() { - return refreshToken; - } - - public PassportLoginVO setRefreshToken(String refreshToken) { - this.refreshToken = refreshToken; - return this; - } - - public Integer getExpiresIn() { - return expiresIn; - } - - public PassportLoginVO setExpiresIn(Integer expiresIn) { - this.expiresIn = expiresIn; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceTreeNodeVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceTreeNodeVO.java index a9499f87f..bba3696ae 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceTreeNodeVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceTreeNodeVO.java @@ -2,11 +2,15 @@ package cn.iocoder.mall.admin.application.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; import java.util.List; @ApiModel("资源树结构 VO") +@Data +@Accessors(chain = true) public class ResourceTreeNodeVO { @ApiModelProperty(value = "资源编号", required = true, example = "1") @@ -28,85 +32,4 @@ public class ResourceTreeNodeVO { @ApiModelProperty(value = "子节点数组") private List children; - public Integer getId() { - return id; - } - - public ResourceTreeNodeVO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public ResourceTreeNodeVO setName(String name) { - this.name = name; - return this; - } - - public Integer getType() { - return type; - } - - public ResourceTreeNodeVO setType(Integer type) { - this.type = type; - return this; - } - - public Integer getSort() { - return sort; - } - - public ResourceTreeNodeVO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public ResourceTreeNodeVO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public ResourceTreeNodeVO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - - public Integer getPid() { - return pid; - } - - public ResourceTreeNodeVO setPid(Integer pid) { - this.pid = pid; - return this; - } - - public String getHandler() { - return handler; - } - - public ResourceTreeNodeVO setHandler(String handler) { - this.handler = handler; - return this; - } - - public List getChildren() { - return children; - } - - public ResourceTreeNodeVO setChildren(List children) { - this.children = children; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceVO.java index cf056e2e3..e16cb4208 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/ResourceVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; @ApiModel("资源 VO") +@Data +@Accessors(chain = true) public class ResourceVO { @ApiModelProperty(value = "资源编号", required = true, example = "1") @@ -25,76 +29,4 @@ public class ResourceVO { @ApiModelProperty(value = "操作", required = true, example = "/order/list") private String handler; - public Integer getId() { - return id; - } - - public ResourceVO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public ResourceVO setName(String name) { - this.name = name; - return this; - } - - public Integer getType() { - return type; - } - - public ResourceVO setType(Integer type) { - this.type = type; - return this; - } - - public Integer getSort() { - return sort; - } - - public ResourceVO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public ResourceVO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public ResourceVO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - - public Integer getPid() { - return pid; - } - - public ResourceVO setPid(Integer pid) { - this.pid = pid; - return this; - } - - public String getHandler() { - return handler; - } - - public ResourceVO setHandler(String handler) { - this.handler = handler; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RolePageVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RolePageVO.java index 12946c504..c1f574496 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RolePageVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RolePageVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.List; @ApiModel("角色分页 VO") +@Data +@Accessors(chain = true) public class RolePageVO { @ApiModelProperty(value = "角色数组") @@ -13,22 +17,4 @@ public class RolePageVO { @ApiModelProperty(value = "角色总数") private Integer count; - public List getRoles() { - return roles; - } - - public RolePageVO setRoles(List roles) { - this.roles = roles; - return this; - } - - public Integer getCount() { - return count; - } - - public RolePageVO setCount(Integer count) { - this.count = count; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleResourceTreeNodeVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleResourceTreeNodeVO.java index afdd46a53..fed45cac6 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleResourceTreeNodeVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleResourceTreeNodeVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.List; @ApiModel("角色拥有的资源 VO") +@Data +@Accessors(chain = true) public class RoleResourceTreeNodeVO { @ApiModelProperty(value = "菜单编号", required = true, example = "1") @@ -25,66 +29,4 @@ public class RoleResourceTreeNodeVO { @ApiModelProperty(value = "是否授权", required = true, example = "true") private Boolean assigned; - public Integer getId() { - return id; - } - - public RoleResourceTreeNodeVO setId(Integer id) { - this.id = id; - return this; - } - - public String getHandler() { - return handler; - } - - public RoleResourceTreeNodeVO setHandler(String handler) { - this.handler = handler; - return this; - } - - public Integer getPid() { - return pid; - } - - public RoleResourceTreeNodeVO setPid(Integer pid) { - this.pid = pid; - return this; - } - - public Integer getSort() { - return sort; - } - - public RoleResourceTreeNodeVO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public RoleResourceTreeNodeVO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public List getChildren() { - return children; - } - - public RoleResourceTreeNodeVO setChildren(List children) { - this.children = children; - return this; - } - - public Boolean getAssigned() { - return assigned; - } - - public RoleResourceTreeNodeVO setAssigned(Boolean assigned) { - this.assigned = assigned; - return this; - } -} \ No newline at end of file +} diff --git a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleVO.java b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleVO.java index 8d3251146..517dd80d4 100644 --- a/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleVO.java +++ b/admin/admin-application/src/main/java/cn/iocoder/mall/admin/application/vo/RoleVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.admin.application.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; @ApiModel("角色 VO") +@Data +@Accessors(chain = true) public class RoleVO { @ApiModelProperty(value = "角色编号", required = true, example = "1") @@ -15,31 +19,4 @@ public class RoleVO { @ApiModelProperty(value = "创建时间", required = true, example = "时间戳格式") private Date createTime; - public Integer getId() { - return id; - } - - public RoleVO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public RoleVO setName(String name) { - this.name = name; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public RoleVO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-sdk/pom.xml b/admin/admin-sdk/pom.xml index 86b96fe90..376cb059b 100644 --- a/admin/admin-sdk/pom.xml +++ b/admin/admin-sdk/pom.xml @@ -25,31 +25,31 @@ 5.1.5.RELEASE compile + com.alibaba dubbo 2.6.5 - compile + javax.servlet servlet-api 2.5 - compile + provided + cn.iocoder.mall common-framework 1.0-SNAPSHOT - compile cn.iocoder.mall admin-service-api 1.0-SNAPSHOT - compile - \ No newline at end of file + diff --git a/admin/admin-service-api/pom.xml b/admin/admin-service-api/pom.xml index b683c2b0f..fc2d3d383 100644 --- a/admin/admin-service-api/pom.xml +++ b/admin/admin-service-api/pom.xml @@ -17,11 +17,25 @@ common-framework 1.0-SNAPSHOT + - org.hibernate.validator - hibernate-validator + javax.validation + validation-api + + + + org.mapstruct + mapstruct + + + org.mapstruct + mapstruct-jdk8 + + + org.projectlombok + lombok - \ No newline at end of file + diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminBO.java index f983c8050..5291f40aa 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminBO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminBO.java @@ -1,7 +1,15 @@ package cn.iocoder.mall.admin.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; +/** + * 管理员 BO + */ +@Data +@Accessors(chain = true) public class AdminBO { /** @@ -25,48 +33,4 @@ public class AdminBO { */ private Date createTime; - public Integer getId() { - return id; - } - - public AdminBO setId(Integer id) { - this.id = id; - return this; - } - - public String getUsername() { - return username; - } - - public AdminBO setUsername(String username) { - this.username = username; - return this; - } - - public String getNickname() { - return nickname; - } - - public AdminBO setNickname(String nickname) { - this.nickname = nickname; - return this; - } - - public Integer getStatus() { - return status; - } - - public AdminBO setStatus(Integer status) { - this.status = status; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public AdminBO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } } diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminPageBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminPageBO.java index 02c855460..21501ebbf 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminPageBO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/AdminPageBO.java @@ -1,7 +1,15 @@ package cn.iocoder.mall.admin.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.List; +/** + * 管理员分页 BO + */ +@Data +@Accessors(chain = true) public class AdminPageBO { /** @@ -13,22 +21,4 @@ public class AdminPageBO { */ private Integer total; - public List getList() { - return list; - } - - public AdminPageBO setList(List list) { - this.list = list; - return this; - } - - public Integer getTotal() { - return total; - } - - public AdminPageBO setTotal(Integer total) { - this.total = total; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/DataDictBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/DataDictBO.java index 2c404c22d..7ca34c7cc 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/DataDictBO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/DataDictBO.java @@ -1,10 +1,15 @@ package cn.iocoder.mall.admin.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; /** * 数据字典 BO */ +@Data +@Accessors(chain = true) public class DataDictBO { /** @@ -36,67 +41,4 @@ public class DataDictBO { */ private Date createTime; - public Integer getId() { - return id; - } - - public DataDictBO setId(Integer id) { - this.id = id; - return this; - } - - public String getEnumValue() { - return enumValue; - } - - public DataDictBO setEnumValue(String enumValue) { - this.enumValue = enumValue; - return this; - } - - public String getValue() { - return value; - } - - public DataDictBO setValue(String value) { - this.value = value; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public DataDictBO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public Integer getSort() { - return sort; - } - - public DataDictBO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getMemo() { - return memo; - } - - public DataDictBO setMemo(String memo) { - this.memo = memo; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public DataDictBO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AccessTokenBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AccessTokenBO.java index 3d66558d2..59c70e5f0 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AccessTokenBO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AccessTokenBO.java @@ -1,7 +1,15 @@ package cn.iocoder.mall.admin.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; +/** + * OAUTH2 AccessToken BO + */ +@Data +@Accessors(chain = true) public class OAuth2AccessTokenBO implements Serializable { /** @@ -17,31 +25,4 @@ public class OAuth2AccessTokenBO implements Serializable { */ private Integer expiresIn; - public String getAccessToken() { - return accessToken; - } - - public OAuth2AccessTokenBO setAccessToken(String accessToken) { - this.accessToken = accessToken; - return this; - } - - public String getRefreshToken() { - return refreshToken; - } - - public OAuth2AccessTokenBO setRefreshToken(String refreshToken) { - this.refreshToken = refreshToken; - return this; - } - - public Integer getExpiresIn() { - return expiresIn; - } - - public OAuth2AccessTokenBO setExpiresIn(Integer expiresIn) { - this.expiresIn = expiresIn; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AuthenticationBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AuthenticationBO.java index f499e25ca..fc3769474 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AuthenticationBO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/OAuth2AuthenticationBO.java @@ -1,8 +1,16 @@ package cn.iocoder.mall.admin.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.util.Set; +/** + * OAUTH2 认证 BO + */ +@Data +@Accessors(chain = true) public class OAuth2AuthenticationBO implements Serializable { /** @@ -14,22 +22,4 @@ public class OAuth2AuthenticationBO implements Serializable { */ private Set roleIds; - public Integer getAdminId() { - return adminId; - } - - public OAuth2AuthenticationBO setAdminId(Integer adminId) { - this.adminId = adminId; - return this; - } - - public Set getRoleIds() { - return roleIds; - } - - public OAuth2AuthenticationBO setRoleIds(Set roleIds) { - this.roleIds = roleIds; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/ResourceBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/ResourceBO.java index ca6d79bc9..533d7f424 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/ResourceBO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/ResourceBO.java @@ -1,10 +1,15 @@ package cn.iocoder.mall.admin.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; /** * 资源 BO */ +@Data +@Accessors(chain = true) public class ResourceBO { /** @@ -40,76 +45,4 @@ public class ResourceBO { */ private String handler; - public Integer getId() { - return id; - } - - public ResourceBO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public ResourceBO setName(String name) { - this.name = name; - return this; - } - - public Integer getType() { - return type; - } - - public ResourceBO setType(Integer type) { - this.type = type; - return this; - } - - public Integer getSort() { - return sort; - } - - public ResourceBO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public ResourceBO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public ResourceBO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - - public Integer getPid() { - return pid; - } - - public ResourceBO setPid(Integer pid) { - this.pid = pid; - return this; - } - - public String getHandler() { - return handler; - } - - public ResourceBO setHandler(String handler) { - this.handler = handler; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RoleBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RoleBO.java index c8458034e..ee82360d8 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RoleBO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RoleBO.java @@ -1,10 +1,15 @@ package cn.iocoder.mall.admin.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; /** * 角色 BO */ +@Data +@Accessors(chain = true) public class RoleBO { /** @@ -20,31 +25,4 @@ public class RoleBO { */ private Date createTime; - public Integer getId() { - return id; - } - - public RoleBO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public RoleBO setName(String name) { - this.name = name; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public RoleBO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RolePageBO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RolePageBO.java index ce92e8eed..13957afa7 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RolePageBO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/RolePageBO.java @@ -1,7 +1,15 @@ package cn.iocoder.mall.admin.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.List; +/** + * 角色分页 BO + */ +@Data +@Accessors(chain = true) public class RolePageBO { /** @@ -13,22 +21,4 @@ public class RolePageBO { */ private Integer count; - public List getRoles() { - return roles; - } - - public RolePageBO setRoles(List roles) { - this.roles = roles; - return this; - } - - public Integer getCount() { - return count; - } - - public RolePageBO setCount(Integer count) { - this.count = count; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAccessLogAddDTO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAccessLogAddDTO.java index fe259c718..1155404ed 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAccessLogAddDTO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAccessLogAddDTO.java @@ -1,12 +1,17 @@ package cn.iocoder.mall.admin.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotNull; import java.util.Date; /** * 管理员访问日志添加 DTO */ +@Data +@Accessors(chain = true) public class AdminAccessLogAddDTO { /** @@ -57,76 +62,4 @@ public class AdminAccessLogAddDTO { @NotNull(message = "响应时长不能为空") private Integer responseTime; - public Integer getAdminId() { - return adminId; - } - - public AdminAccessLogAddDTO setAdminId(Integer adminId) { - this.adminId = adminId; - return this; - } - - public String getUri() { - return uri; - } - - public AdminAccessLogAddDTO setUri(String uri) { - this.uri = uri; - return this; - } - - public String getQueryString() { - return queryString; - } - - public AdminAccessLogAddDTO setQueryString(String queryString) { - this.queryString = queryString; - return this; - } - - public String getMethod() { - return method; - } - - public AdminAccessLogAddDTO setMethod(String method) { - this.method = method; - return this; - } - - public String getUserAgent() { - return userAgent; - } - - public AdminAccessLogAddDTO setUserAgent(String userAgent) { - this.userAgent = userAgent; - return this; - } - - public String getIp() { - return ip; - } - - public AdminAccessLogAddDTO setIp(String ip) { - this.ip = ip; - return this; - } - - public Date getStartTime() { - return startTime; - } - - public AdminAccessLogAddDTO setStartTime(Date startTime) { - this.startTime = startTime; - return this; - } - - public Integer getResponseTime() { - return responseTime; - } - - public AdminAccessLogAddDTO setResponseTime(Integer responseTime) { - this.responseTime = responseTime; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAddDTO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAddDTO.java index 9d619655c..da242b6bc 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAddDTO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminAddDTO.java @@ -1,5 +1,7 @@ package cn.iocoder.mall.admin.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotEmpty; @@ -8,6 +10,8 @@ import javax.validation.constraints.Pattern; /** * 管理员添加 DTO */ +@Data +@Accessors(chain = true) public class AdminAddDTO { /** @@ -30,30 +34,4 @@ public class AdminAddDTO { @Length(min = 6, max = 16, message = "密码长度为 6-16 位") private String password; - public String getUsername() { - return username; - } - - public AdminAddDTO setUsername(String username) { - this.username = username; - return this; - } - - public String getNickname() { - return nickname; - } - - public AdminAddDTO setNickname(String nickname) { - this.nickname = nickname; - return this; - } - - public String getPassword() { - return password; - } - - public AdminAddDTO setPassword(String password) { - this.password = password; - return this; - } -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminPageDTO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminPageDTO.java index 1a66f733e..9f32e9d25 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminPageDTO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminPageDTO.java @@ -1,7 +1,15 @@ package cn.iocoder.mall.admin.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotNull; +/** + * 管理员分页 DTO + */ +@Data +@Accessors(chain = true) public class AdminPageDTO { /** @@ -14,31 +22,4 @@ public class AdminPageDTO { @NotNull(message = "每页条数不能为空") private Integer pageSize; - public Integer getPageNo() { - return pageNo; - } - - public AdminPageDTO setPageNo(Integer pageNo) { - this.pageNo = pageNo; - return this; - } - - public Integer getPageSize() { - return pageSize; - } - - public AdminPageDTO setPageSize(Integer pageSize) { - this.pageSize = pageSize; - return this; - } - - public String getNickname() { - return nickname; - } - - public AdminPageDTO setNickname(String nickname) { - this.nickname = nickname; - return this; - } - } diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminUpdateDTO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminUpdateDTO.java index 0530563c3..6700b708f 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminUpdateDTO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/AdminUpdateDTO.java @@ -1,5 +1,7 @@ package cn.iocoder.mall.admin.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotEmpty; @@ -9,6 +11,8 @@ import javax.validation.constraints.Pattern; /** * 管理员更新 DTO */ +@Data +@Accessors(chain = true) public class AdminUpdateDTO { /** @@ -35,39 +39,4 @@ public class AdminUpdateDTO { @Length(min = 6, max = 16, message = "密码长度为 6-16 位") private String password; - public String getUsername() { - return username; - } - - public AdminUpdateDTO setUsername(String username) { - this.username = username; - return this; - } - - public String getNickname() { - return nickname; - } - - public AdminUpdateDTO setNickname(String nickname) { - this.nickname = nickname; - return this; - } - - public String getPassword() { - return password; - } - - public AdminUpdateDTO setPassword(String password) { - this.password = password; - return this; - } - - public Integer getId() { - return id; - } - - public AdminUpdateDTO setId(Integer id) { - this.id = id; - return this; - } -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictAddDTO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictAddDTO.java index db44b6e8c..e8728ca12 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictAddDTO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictAddDTO.java @@ -1,11 +1,16 @@ package cn.iocoder.mall.admin.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; /** * 数据字典添加 DTO */ +@Data +@Accessors(chain = true) public class DataDictAddDTO { /** @@ -33,49 +38,4 @@ public class DataDictAddDTO { */ private String memo; - public String getEnumValue() { - return enumValue; - } - - public DataDictAddDTO setEnumValue(String enumValue) { - this.enumValue = enumValue; - return this; - } - - public String getValue() { - return value; - } - - public DataDictAddDTO setValue(String value) { - this.value = value; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public DataDictAddDTO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public Integer getSort() { - return sort; - } - - public DataDictAddDTO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getMemo() { - return memo; - } - - public DataDictAddDTO setMemo(String memo) { - this.memo = memo; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictUpdateDTO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictUpdateDTO.java index 4bc3dc643..02735be66 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictUpdateDTO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/DataDictUpdateDTO.java @@ -1,11 +1,16 @@ package cn.iocoder.mall.admin.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; /** * 数据字典更新 DTO */ +@Data +@Accessors(chain = true) public class DataDictUpdateDTO { /** @@ -33,49 +38,4 @@ public class DataDictUpdateDTO { */ private String memo; - public Integer getId() { - return id; - } - - public DataDictUpdateDTO setId(Integer id) { - this.id = id; - return this; - } - - public String getValue() { - return value; - } - - public DataDictUpdateDTO setValue(String value) { - this.value = value; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public DataDictUpdateDTO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public Integer getSort() { - return sort; - } - - public DataDictUpdateDTO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getMemo() { - return memo; - } - - public DataDictUpdateDTO setMemo(String memo) { - this.memo = memo; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceAddDTO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceAddDTO.java index 9c6966960..ae413a55b 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceAddDTO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceAddDTO.java @@ -1,11 +1,16 @@ package cn.iocoder.mall.admin.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; /** * 资源添加 DTO */ +@Data +@Accessors(chain = true) public class ResourceAddDTO { /** @@ -37,58 +42,4 @@ public class ResourceAddDTO { */ private String handler; - public String getName() { - return name; - } - - public ResourceAddDTO setName(String name) { - this.name = name; - return this; - } - - public Integer getType() { - return type; - } - - public ResourceAddDTO setType(Integer type) { - this.type = type; - return this; - } - - public Integer getSort() { - return sort; - } - - public ResourceAddDTO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public ResourceAddDTO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public Integer getPid() { - return pid; - } - - public ResourceAddDTO setPid(Integer pid) { - this.pid = pid; - return this; - } - - public String getHandler() { - return handler; - } - - public ResourceAddDTO setHandler(String handler) { - this.handler = handler; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceUpdateDTO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceUpdateDTO.java index b77aeefda..279a4a822 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceUpdateDTO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/ResourceUpdateDTO.java @@ -1,11 +1,16 @@ package cn.iocoder.mall.admin.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; /** * 资源更新 DTO */ +@Data +@Accessors(chain = true) public class ResourceUpdateDTO { /** @@ -37,58 +42,4 @@ public class ResourceUpdateDTO { */ private String handler; - public Integer getId() { - return id; - } - - public ResourceUpdateDTO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public ResourceUpdateDTO setName(String name) { - this.name = name; - return this; - } - - public Integer getSort() { - return sort; - } - - public ResourceUpdateDTO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public ResourceUpdateDTO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public Integer getPid() { - return pid; - } - - public ResourceUpdateDTO setPid(Integer pid) { - this.pid = pid; - return this; - } - - public String getHandler() { - return handler; - } - - public ResourceUpdateDTO setHandler(String handler) { - this.handler = handler; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleAddDTO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleAddDTO.java index f7ea73b0f..56bcc8804 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleAddDTO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleAddDTO.java @@ -1,10 +1,15 @@ package cn.iocoder.mall.admin.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotEmpty; /** * 角色添加 DTO */ +@Data +@Accessors(chain = true) public class RoleAddDTO { /** @@ -13,13 +18,4 @@ public class RoleAddDTO { @NotEmpty(message = "角色名字不能为空") private String name; - public String getName() { - return name; - } - - public RoleAddDTO setName(String name) { - this.name = name; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RolePageDTO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RolePageDTO.java index 7b1fbd743..bd53f34af 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RolePageDTO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RolePageDTO.java @@ -1,5 +1,13 @@ package cn.iocoder.mall.admin.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 角色分页 DTO + */ +@Data +@Accessors(chain = true) public class RolePageDTO { private Integer pageNo; diff --git a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleUpdateDTO.java b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleUpdateDTO.java index e69dc295e..7d97e6e17 100644 --- a/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleUpdateDTO.java +++ b/admin/admin-service-api/src/main/java/cn/iocoder/mall/admin/api/dto/RoleUpdateDTO.java @@ -1,11 +1,16 @@ package cn.iocoder.mall.admin.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; /** * 角色添加 DTO */ +@Data +@Accessors(chain = true) public class RoleUpdateDTO { /** @@ -19,22 +24,4 @@ public class RoleUpdateDTO { @NotEmpty(message = "角色名字不能为空") private String name; - public Integer getId() { - return id; - } - - public RoleUpdateDTO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public RoleUpdateDTO setName(String name) { - this.name = name; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-impl/pom.xml b/admin/admin-service-impl/pom.xml index 8345ba7b1..7897c833a 100644 --- a/admin/admin-service-impl/pom.xml +++ b/admin/admin-service-impl/pom.xml @@ -11,21 +11,12 @@ admin-service-impl - - 1.3.0.Final - - - - com.alibaba - dubbo - compile - + cn.iocoder.mall admin-service-api 1.0-SNAPSHOT - compile @@ -37,21 +28,19 @@ spring-boot-starter-jdbc + + com.alibaba + dubbo + + org.mybatis.spring.boot mybatis-spring-boot-starter - 2.0.0 - - - org.mapstruct - mapstruct - ${org.mapstruct.version} com.google.guava guava - 27.0.1-jre @@ -62,21 +51,9 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - org.mapstruct - mapstruct-processor - ${org.mapstruct.version} - - - - \ No newline at end of file + diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminAccessLogDO.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminAccessLogDO.java index 8c84f9702..96ab67b7a 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminAccessLogDO.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminAccessLogDO.java @@ -1,12 +1,16 @@ package cn.iocoder.mall.admin.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; /** * 管理员访问日志 DO */ +@Data +@Accessors(chain = true) public class AdminAccessLogDO extends DeletableDO { /** @@ -48,85 +52,4 @@ public class AdminAccessLogDO extends DeletableDO { */ private Integer responseTime; - public Integer getId() { - return id; - } - - public AdminAccessLogDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getAdminId() { - return adminId; - } - - public AdminAccessLogDO setAdminId(Integer adminId) { - this.adminId = adminId; - return this; - } - - public String getUri() { - return uri; - } - - public AdminAccessLogDO setUri(String uri) { - this.uri = uri; - return this; - } - - public String getQueryString() { - return queryString; - } - - public AdminAccessLogDO setQueryString(String queryString) { - this.queryString = queryString; - return this; - } - - public String getMethod() { - return method; - } - - public AdminAccessLogDO setMethod(String method) { - this.method = method; - return this; - } - - public String getUserAgent() { - return userAgent; - } - - public AdminAccessLogDO setUserAgent(String userAgent) { - this.userAgent = userAgent; - return this; - } - - public String getIp() { - return ip; - } - - public AdminAccessLogDO setIp(String ip) { - this.ip = ip; - return this; - } - - public Date getStartTime() { - return startTime; - } - - public AdminAccessLogDO setStartTime(Date startTime) { - this.startTime = startTime; - return this; - } - - public Integer getResponseTime() { - return responseTime; - } - - public AdminAccessLogDO setResponseTime(Integer responseTime) { - this.responseTime = responseTime; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminDO.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminDO.java index 8cfc41400..32ed645c6 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminDO.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminDO.java @@ -1,10 +1,14 @@ package cn.iocoder.mall.admin.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * 管理员实体 */ +@Data +@Accessors(chain = true) public class AdminDO extends DeletableDO { /** @@ -30,49 +34,4 @@ public class AdminDO extends DeletableDO { */ private Integer status; - public Integer getId() { - return id; - } - - public AdminDO setId(Integer id) { - this.id = id; - return this; - } - - public String getUsername() { - return username; - } - - public AdminDO setUsername(String username) { - this.username = username; - return this; - } - - public String getNickname() { - return nickname; - } - - public AdminDO setNickname(String nickname) { - this.nickname = nickname; - return this; - } - - public String getPassword() { - return password; - } - - public AdminDO setPassword(String password) { - this.password = password; - return this; - } - - public Integer getStatus() { - return status; - } - - public AdminDO setStatus(Integer status) { - this.status = status; - return this; - } - } diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminRoleDO.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminRoleDO.java index c7aa3342a..5b0a32e8f 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminRoleDO.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/AdminRoleDO.java @@ -1,10 +1,14 @@ package cn.iocoder.mall.admin.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * {@link AdminDO} 和 {@link RoleDO} 的关联表 */ +@Data +@Accessors(chain = true) public class AdminRoleDO extends DeletableDO { /** @@ -20,31 +24,4 @@ public class AdminRoleDO extends DeletableDO { */ private Integer roleId; - public Integer getId() { - return id; - } - - public AdminRoleDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getAdminId() { - return adminId; - } - - public AdminRoleDO setAdminId(Integer adminId) { - this.adminId = adminId; - return this; - } - - public Integer getRoleId() { - return roleId; - } - - public AdminRoleDO setRoleId(Integer roleId) { - this.roleId = roleId; - return this; - } - -} \ No newline at end of file +} diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/DataDictDO.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/DataDictDO.java index fa0002bd8..b65a853c0 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/DataDictDO.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/DataDictDO.java @@ -1,6 +1,8 @@ package cn.iocoder.mall.admin.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * 数据字典 @@ -11,6 +13,8 @@ import cn.iocoder.common.framework.dataobject.DeletableDO; * value：1 男 * value：2 女 */ +@Data +@Accessors(chain = true) public class DataDictDO extends DeletableDO { /** @@ -38,57 +42,4 @@ public class DataDictDO extends DeletableDO { */ private String memo; - public String getEnumValue() { - return enumValue; - } - - public DataDictDO setEnumValue(String enumValue) { - this.enumValue = enumValue; - return this; - } - - public String getValue() { - return value; - } - - public DataDictDO setValue(String value) { - this.value = value; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public DataDictDO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public Integer getSort() { - return sort; - } - - public DataDictDO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getMemo() { - return memo; - } - - public DataDictDO setMemo(String memo) { - this.memo = memo; - return this; - } - - public Integer getId() { - return id; - } - - public DataDictDO setId(Integer id) { - this.id = id; - return this; - } -} \ No newline at end of file +} diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2AccessTokenDO.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2AccessTokenDO.java index 373fad188..5ef79d8ee 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2AccessTokenDO.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2AccessTokenDO.java @@ -1,7 +1,15 @@ package cn.iocoder.mall.admin.dataobject; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; +/** + * OAUTH2 AccessToken + */ +@Data +@Accessors(chain = true) public class OAuth2AccessTokenDO { /** @@ -83,4 +91,4 @@ public class OAuth2AccessTokenDO { return this; } -} \ No newline at end of file +} diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2RefreshTokenDO.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2RefreshTokenDO.java index 271d60cb5..8baddfab5 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2RefreshTokenDO.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/OAuth2RefreshTokenDO.java @@ -1,5 +1,8 @@ package cn.iocoder.mall.admin.dataobject; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; /** @@ -7,6 +10,8 @@ import java.util.Date; * * idx_uid */ +@Data +@Accessors(chain = true) public class OAuth2RefreshTokenDO { /** @@ -30,49 +35,4 @@ public class OAuth2RefreshTokenDO { */ private Date createTime; - public String getId() { - return id; - } - - public OAuth2RefreshTokenDO setId(String id) { - this.id = id; - return this; - } - - public Integer getAdminId() { - return adminId; - } - - public OAuth2RefreshTokenDO setAdminId(Integer adminId) { - this.adminId = adminId; - return this; - } - - public Boolean getValid() { - return valid; - } - - public OAuth2RefreshTokenDO setValid(Boolean valid) { - this.valid = valid; - return this; - } - - public Date getExpiresTime() { - return expiresTime; - } - - public OAuth2RefreshTokenDO setExpiresTime(Date expiresTime) { - this.expiresTime = expiresTime; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public OAuth2RefreshTokenDO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - } diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/ResourceDO.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/ResourceDO.java index 2875e9a81..795338ccb 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/ResourceDO.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/ResourceDO.java @@ -1,12 +1,16 @@ package cn.iocoder.mall.admin.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; /** * 资源实体 */ +@Data +@Accessors(chain = true) public class ResourceDO extends DeletableDO { /** @@ -58,76 +62,4 @@ public class ResourceDO extends DeletableDO { */ private String handler; - public Integer getId() { - return id; - } - - public ResourceDO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public ResourceDO setName(String name) { - this.name = name; - return this; - } - - public Integer getType() { - return type; - } - - public ResourceDO setType(Integer type) { - this.type = type; - return this; - } - - public Integer getSort() { - return sort; - } - - public ResourceDO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getDisplayName() { - return displayName; - } - - public ResourceDO setDisplayName(String displayName) { - this.displayName = displayName; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public ResourceDO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - - public Integer getPid() { - return pid; - } - - public ResourceDO setPid(Integer pid) { - this.pid = pid; - return this; - } - - public String getHandler() { - return handler; - } - - public ResourceDO setHandler(String handler) { - this.handler = handler; - return this; - } - } diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleDO.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleDO.java index c35392184..d84fdf303 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleDO.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleDO.java @@ -1,10 +1,14 @@ package cn.iocoder.mall.admin.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * 角色实体 */ +@Data +@Accessors(chain = true) public class RoleDO extends DeletableDO { /** @@ -16,22 +20,4 @@ public class RoleDO extends DeletableDO { */ private String name; - public Integer getId() { - return id; - } - - public RoleDO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public RoleDO setName(String name) { - this.name = name; - return this; - } - } diff --git a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleResourceDO.java b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleResourceDO.java index 584664193..998c45b49 100644 --- a/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleResourceDO.java +++ b/admin/admin-service-impl/src/main/java/cn/iocoder/mall/admin/dataobject/RoleResourceDO.java @@ -1,10 +1,14 @@ package cn.iocoder.mall.admin.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * {@link RoleDO} 和 {@link ResourceDO} 的关联表 */ +@Data +@Accessors(chain = true) public class RoleResourceDO extends DeletableDO { /** @@ -20,31 +24,4 @@ public class RoleResourceDO extends DeletableDO { */ private Integer resourceId; - public Integer getId() { - return id; - } - - public RoleResourceDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getRoleId() { - return roleId; - } - - public RoleResourceDO setRoleId(Integer roleId) { - this.roleId = roleId; - return this; - } - - public Integer getResourceId() { - return resourceId; - } - - public RoleResourceDO setResourceId(Integer resourceId) { - this.resourceId = resourceId; - return this; - } - -} \ No newline at end of file +} diff --git a/common/pom.xml b/common/pom.xml index 400b2a215..cf833fe77 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -16,4 +16,4 @@ - \ No newline at end of file + diff --git a/pay/pay-application/pom.xml b/pay/pay-application/pom.xml index 850f1bc1a..8f7bf977b 100644 --- a/pay/pay-application/pom.xml +++ b/pay/pay-application/pom.xml @@ -22,12 +22,16 @@ common-framework 1.0-SNAPSHOT - cn.iocoder.mall pay-service-impl 1.0-SNAPSHOT + + cn.iocoder.mall + admin-sdk + 1.0-SNAPSHOT + org.springframework.boot @@ -43,42 +47,24 @@ com.alibaba dubbo - 2.6.5 - com.alibaba.boot dubbo-spring-boot-starter - 0.2.1.RELEASE org.apache.curator curator-framework - 2.12.0 - - - - org.mapstruct - mapstruct - ${org.mapstruct.version} io.springfox springfox-swagger2 - 2.9.2 io.springfox springfox-swagger-ui - 2.9.2 - - - - org.mapstruct - mapstruct - ${org.mapstruct.version} @@ -87,12 +73,6 @@ true - - cn.iocoder.mall - admin-sdk - 1.0-SNAPSHOT - - @@ -122,30 +102,15 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - org.mapstruct - mapstruct-processor - ${org.mapstruct.version} - - - org.springframework.boot spring-boot-maven-plugin - - true - - \ No newline at end of file + diff --git a/pay/pay-service-api/pom.xml b/pay/pay-service-api/pom.xml index 42799e634..2bf007bbc 100644 --- a/pay/pay-service-api/pom.xml +++ b/pay/pay-service-api/pom.xml @@ -15,9 +15,26 @@ cn.iocoder.mall common-framework 1.0-SNAPSHOT - compile + + + + javax.validation + validation-api + + + + org.mapstruct + mapstruct + + + org.mapstruct + mapstruct-jdk8 + + + org.projectlombok + lombok - \ No newline at end of file + diff --git a/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionBO.java b/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionBO.java index 1ef08264a..a1803089c 100644 --- a/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionBO.java +++ b/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionBO.java @@ -1,10 +1,15 @@ package cn.iocoder.mall.pay.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; /** * 支付交易 BO */ +@Data +@Accessors(chain = true) public class PayTransactionBO { /** @@ -86,157 +91,4 @@ public class PayTransactionBO { */ private Date createTime; - public Integer getId() { - return id; - } - - public PayTransactionBO setId(Integer id) { - this.id = id; - return this; - } - - public String getAppId() { - return appId; - } - - public PayTransactionBO setAppId(String appId) { - this.appId = appId; - return this; - } - - public String getCreateIp() { - return createIp; - } - - public PayTransactionBO setCreateIp(String createIp) { - this.createIp = createIp; - return this; - } - - public String getOrderId() { - return orderId; - } - - public PayTransactionBO setOrderId(String orderId) { - this.orderId = orderId; - return this; - } - - public String getOrderSubject() { - return orderSubject; - } - - public PayTransactionBO setOrderSubject(String orderSubject) { - this.orderSubject = orderSubject; - return this; - } - - public String getOrderDescription() { - return orderDescription; - } - - public PayTransactionBO setOrderDescription(String orderDescription) { - this.orderDescription = orderDescription; - return this; - } - - public String getOrderMemo() { - return orderMemo; - } - - public PayTransactionBO setOrderMemo(String orderMemo) { - this.orderMemo = orderMemo; - return this; - } - - public Integer getPrice() { - return price; - } - - public PayTransactionBO setPrice(Integer price) { - this.price = price; - return this; - } - - public Integer getStatus() { - return status; - } - - public PayTransactionBO setStatus(Integer status) { - this.status = status; - return this; - } - - public Date getExpireTime() { - return expireTime; - } - - public PayTransactionBO setExpireTime(Date expireTime) { - this.expireTime = expireTime; - return this; - } - - public Date getFinishTime() { - return finishTime; - } - - public PayTransactionBO setFinishTime(Date finishTime) { - this.finishTime = finishTime; - return this; - } - - public Integer getExtensionId() { - return extensionId; - } - - public PayTransactionBO setExtensionId(Integer extensionId) { - this.extensionId = extensionId; - return this; - } - - public Integer getPayChannel() { - return payChannel; - } - - public PayTransactionBO setPayChannel(Integer payChannel) { - this.payChannel = payChannel; - return this; - } - - public Date getPaymentTime() { - return paymentTime; - } - - public PayTransactionBO setPaymentTime(Date paymentTime) { - this.paymentTime = paymentTime; - return this; - } - - public Date getNotifyTime() { - return notifyTime; - } - - public PayTransactionBO setNotifyTime(Date notifyTime) { - this.notifyTime = notifyTime; - return this; - } - - public String getTradeNo() { - return tradeNo; - } - - public PayTransactionBO setTradeNo(String tradeNo) { - this.tradeNo = tradeNo; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public PayTransactionBO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - -} \ No newline at end of file +} diff --git a/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionSubmitBO.java b/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionSubmitBO.java index 1fc33d240..affad3d1e 100644 --- a/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionSubmitBO.java +++ b/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/bo/PayTransactionSubmitBO.java @@ -1,8 +1,13 @@ package cn.iocoder.mall.pay.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + /** * 支付交易提交结果 BO */ +@Data +@Accessors(chain = true) public class PayTransactionSubmitBO { /** @@ -14,22 +19,4 @@ public class PayTransactionSubmitBO { */ private String invokeResponse; - public Integer getId() { - return id; - } - - public PayTransactionSubmitBO setId(Integer id) { - this.id = id; - return this; - } - - public String getInvokeResponse() { - return invokeResponse; - } - - public PayTransactionSubmitBO setInvokeResponse(String invokeResponse) { - this.invokeResponse = invokeResponse; - return this; - } - -} \ No newline at end of file +} diff --git a/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/PayTransactionCreateDTO.java b/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/PayTransactionCreateDTO.java index b95d87139..4eedd49a9 100644 --- a/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/PayTransactionCreateDTO.java +++ b/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/PayTransactionCreateDTO.java @@ -1,5 +1,8 @@ package cn.iocoder.mall.pay.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.DecimalMin; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -9,6 +12,8 @@ import java.util.Date; /** * 支付交易创建 DTO */ +@Data +@Accessors(chain = true) public class PayTransactionCreateDTO { /** @@ -55,76 +60,4 @@ public class PayTransactionCreateDTO { @NotNull(message = "交易过期时间不能为空") private Date expireTime; - public String getAppId() { - return appId; - } - - public PayTransactionCreateDTO setAppId(String appId) { - this.appId = appId; - return this; - } - - public String getCreateIp() { - return createIp; - } - - public PayTransactionCreateDTO setCreateIp(String createIp) { - this.createIp = createIp; - return this; - } - - public String getOrderId() { - return orderId; - } - - public PayTransactionCreateDTO setOrderId(String orderId) { - this.orderId = orderId; - return this; - } - - public String getOrderSubject() { - return orderSubject; - } - - public PayTransactionCreateDTO setOrderSubject(String orderSubject) { - this.orderSubject = orderSubject; - return this; - } - - public String getOrderDescription() { - return orderDescription; - } - - public PayTransactionCreateDTO setOrderDescription(String orderDescription) { - this.orderDescription = orderDescription; - return this; - } - - public String getOrderMemo() { - return orderMemo; - } - - public PayTransactionCreateDTO setOrderMemo(String orderMemo) { - this.orderMemo = orderMemo; - return this; - } - - public Integer getPrice() { - return price; - } - - public PayTransactionCreateDTO setPrice(Integer price) { - this.price = price; - return this; - } - - public Date getExpireTime() { - return expireTime; - } - - public PayTransactionCreateDTO setExpireTime(Date expireTime) { - this.expireTime = expireTime; - return this; - } - -} \ No newline at end of file +} diff --git a/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/PayTransactionSubmitDTO.java b/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/PayTransactionSubmitDTO.java index 782da8990..c0050a0e3 100644 --- a/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/PayTransactionSubmitDTO.java +++ b/pay/pay-service-api/src/main/java/cn/iocoder/mall/pay/api/dto/PayTransactionSubmitDTO.java @@ -1,11 +1,16 @@ package cn.iocoder.mall.pay.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; /** * 支付交易提交 DTO */ +@Data +@Accessors(chain = true) public class PayTransactionSubmitDTO { /** @@ -29,40 +34,4 @@ public class PayTransactionSubmitDTO { @NotNull(message = "支付渠道") private Integer payChannel; - public String getAppId() { - return appId; - } - - public PayTransactionSubmitDTO setAppId(String appId) { - this.appId = appId; - return this; - } - - public String getCreateIp() { - return createIp; - } - - public PayTransactionSubmitDTO setCreateIp(String createIp) { - this.createIp = createIp; - return this; - } - - public String getOrderId() { - return orderId; - } - - public PayTransactionSubmitDTO setOrderId(String orderId) { - this.orderId = orderId; - return this; - } - - public Integer getPayChannel() { - return payChannel; - } - - public PayTransactionSubmitDTO setPayChannel(Integer payChannel) { - this.payChannel = payChannel; - return this; - } - -} \ No newline at end of file +} diff --git a/pay/pay-service-impl/pom.xml b/pay/pay-service-impl/pom.xml index 012b7ffbc..967fb2afc 100644 --- a/pay/pay-service-impl/pom.xml +++ b/pay/pay-service-impl/pom.xml @@ -19,19 +19,16 @@ com.alibaba dubbo - compile cn.iocoder.mall admin-service-api 1.0-SNAPSHOT - compile cn.iocoder.mall pay-service-api 1.0-SNAPSHOT - compile @@ -46,18 +43,11 @@ org.mybatis.spring.boot mybatis-spring-boot-starter - 2.0.0 - - - org.mapstruct - mapstruct - ${org.mapstruct.version} com.google.guava guava - 27.0.1-jre @@ -70,13 +60,11 @@ com.xuxueli xxl-job-core - 2.0.1 org.apache.rocketmq rocketmq-spring-boot-starter - 2.0.1 @@ -87,18 +75,6 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - org.mapstruct - mapstruct-processor - ${org.mapstruct.version} - - - @@ -115,4 +91,4 @@ - \ No newline at end of file + diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayAppDO.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayAppDO.java index f7d062791..b06ce0f24 100644 --- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayAppDO.java +++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayAppDO.java @@ -1,10 +1,14 @@ package cn.iocoder.mall.pay.biz.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * 支付应用（业务线）DO */ +@Data +@Accessors(chain = true) public class PayAppDO extends DeletableDO { /** @@ -24,40 +28,4 @@ public class PayAppDO extends DeletableDO { */ private Integer status; - public String getId() { - return id; - } - - public PayAppDO setId(String id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public PayAppDO setName(String name) { - this.name = name; - return this; - } - - public String getNotifyUrl() { - return notifyUrl; - } - - public PayAppDO setNotifyUrl(String notifyUrl) { - this.notifyUrl = notifyUrl; - return this; - } - - public Integer getStatus() { - return status; - } - - public PayAppDO setStatus(Integer status) { - this.status = status; - return this; - } - -} \ No newline at end of file +} diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayLogDO.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayLogDO.java index 35ab44c83..a18c42f4b 100644 --- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayLogDO.java +++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayLogDO.java @@ -1,5 +1,8 @@ package cn.iocoder.mall.pay.biz.dataobject; +import lombok.Data; +import lombok.experimental.Accessors; + /** * 交易日志 DO * @@ -7,6 +10,8 @@ package cn.iocoder.mall.pay.biz.dataobject; * * TODO 芋艿，后面在捉摸 */ +@Data +@Accessors(chain = true) public class PayLogDO { /** @@ -21,4 +26,4 @@ public class PayLogDO { * 业务线订单编号 */ private Integer orderId; -} \ No newline at end of file +} diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayRefundDO.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayRefundDO.java index 7f8664bbc..eea5ce411 100644 --- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayRefundDO.java +++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayRefundDO.java @@ -1,4 +1,9 @@ package cn.iocoder.mall.pay.biz.dataobject; +import lombok.Data; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) public class PayRefundDO { } diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayRepeatTransactionDO.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayRepeatTransactionDO.java index c94ab8810..eef449846 100644 --- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayRepeatTransactionDO.java +++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayRepeatTransactionDO.java @@ -1,9 +1,14 @@ package cn.iocoder.mall.pay.biz.dataobject; +import lombok.Data; +import lombok.experimental.Accessors; + /** * TODO 重复支付的交易 * * 可能不靠这个表，而是差错处理。 */ +@Data +@Accessors(chain = true) public class PayRepeatTransactionDO { } diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionDO.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionDO.java index 81cd56a12..77159d037 100644 --- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionDO.java +++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionDO.java @@ -1,12 +1,16 @@ package cn.iocoder.mall.pay.biz.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; /** * 支付交易 DO */ +@Data +@Accessors(chain = true) public class PayTransactionDO extends DeletableDO { /** @@ -100,156 +104,4 @@ public class PayTransactionDO extends DeletableDO { */ private String tradeNo; - public Integer getId() { - return id; - } - - public PayTransactionDO setId(Integer id) { - this.id = id; - return this; - } - - public String getAppId() { - return appId; - } - - public PayTransactionDO setAppId(String appId) { - this.appId = appId; - return this; - } - - public String getCreateIp() { - return createIp; - } - - public PayTransactionDO setCreateIp(String createIp) { - this.createIp = createIp; - return this; - } - - public String getOrderId() { - return orderId; - } - - public PayTransactionDO setOrderId(String orderId) { - this.orderId = orderId; - return this; - } - - public Integer getStatus() { - return status; - } - - public PayTransactionDO setStatus(Integer status) { - this.status = status; - return this; - } - - public Integer getPrice() { - return price; - } - - public PayTransactionDO setPrice(Integer price) { - this.price = price; - return this; - } - - public Integer getPayChannel() { - return payChannel; - } - - public PayTransactionDO setPayChannel(Integer payChannel) { - this.payChannel = payChannel; - return this; - } - - public Date getPaymentTime() { - return paymentTime; - } - - public PayTransactionDO setPaymentTime(Date paymentTime) { - this.paymentTime = paymentTime; - return this; - } - - public Date getNotifyTime() { - return notifyTime; - } - - public PayTransactionDO setNotifyTime(Date notifyTime) { - this.notifyTime = notifyTime; - return this; - } - - public String getTradeNo() { - return tradeNo; - } - - public PayTransactionDO setTradeNo(String tradeNo) { - this.tradeNo = tradeNo; - return this; - } - - public String getOrderSubject() { - return orderSubject; - } - - public PayTransactionDO setOrderSubject(String orderSubject) { - this.orderSubject = orderSubject; - return this; - } - - public String getOrderDescription() { - return orderDescription; - } - - public PayTransactionDO setOrderDescription(String orderDescription) { - this.orderDescription = orderDescription; - return this; - } - - public String getOrderMemo() { - return orderMemo; - } - - public PayTransactionDO setOrderMemo(String orderMemo) { - this.orderMemo = orderMemo; - return this; - } - - public Date getExpireTime() { - return expireTime; - } - - public PayTransactionDO setExpireTime(Date expireTime) { - this.expireTime = expireTime; - return this; - } - - public Date getFinishTime() { - return finishTime; - } - - public PayTransactionDO setFinishTime(Date finishTime) { - this.finishTime = finishTime; - return this; - } - - public Integer getExtensionId() { - return extensionId; - } - - public PayTransactionDO setExtensionId(Integer extensionId) { - this.extensionId = extensionId; - return this; - } - - public String getNotifyUrl() { - return notifyUrl; - } - - public PayTransactionDO setNotifyUrl(String notifyUrl) { - this.notifyUrl = notifyUrl; - return this; - } -} \ No newline at end of file +} diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionExtensionDO.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionExtensionDO.java index c25ee8ea5..e5f4c6162 100644 --- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionExtensionDO.java +++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionExtensionDO.java @@ -1,10 +1,14 @@ package cn.iocoder.mall.pay.biz.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * 交易扩展表 */ +@Data +@Accessors(chain = true) public class PayTransactionExtensionDO extends DeletableDO { /** @@ -43,67 +47,4 @@ public class PayTransactionExtensionDO extends DeletableDO { */ private Integer status; - public Integer getId() { - return id; - } - - public PayTransactionExtensionDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getTransactionId() { - return transactionId; - } - - public PayTransactionExtensionDO setTransactionId(Integer transactionId) { - this.transactionId = transactionId; - return this; - } - - public Integer getPayChannel() { - return payChannel; - } - - public PayTransactionExtensionDO setPayChannel(Integer payChannel) { - this.payChannel = payChannel; - return this; - } - - public String getTransactionCode() { - return transactionCode; - } - - public PayTransactionExtensionDO setTransactionCode(String transactionCode) { - this.transactionCode = transactionCode; - return this; - } - - public String getExtensionData() { - return extensionData; - } - - public PayTransactionExtensionDO setExtensionData(String extensionData) { - this.extensionData = extensionData; - return this; - } - - public String getCreateIp() { - return createIp; - } - - public PayTransactionExtensionDO setCreateIp(String createIp) { - this.createIp = createIp; - return this; - } - - public Integer getStatus() { - return status; - } - - public PayTransactionExtensionDO setStatus(Integer status) { - this.status = status; - return this; - } - -} \ No newline at end of file +} diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionNotifyLogDO.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionNotifyLogDO.java index 341b5d22c..9280acd3e 100644 --- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionNotifyLogDO.java +++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionNotifyLogDO.java @@ -1,12 +1,16 @@ package cn.iocoder.mall.pay.biz.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * 支付交易通知 App 的日志 DO * * 通过该表，记录通知 App 时，产生的日志 */ +@Data +@Accessors(chain = true) public class PayTransactionNotifyLogDO extends DeletableDO { /** @@ -32,49 +36,4 @@ public class PayTransactionNotifyLogDO extends DeletableDO { */ private Integer status; - public Integer getId() { - return id; - } - - public PayTransactionNotifyLogDO setId(Integer id) { - this.id = id; - return this; - } - - public String getRequest() { - return request; - } - - public PayTransactionNotifyLogDO setRequest(String request) { - this.request = request; - return this; - } - - public String getResponse() { - return response; - } - - public PayTransactionNotifyLogDO setResponse(String response) { - this.response = response; - return this; - } - - public Integer getStatus() { - return status; - } - - public PayTransactionNotifyLogDO setStatus(Integer status) { - this.status = status; - return this; - } - - public Integer getNotifyId() { - return notifyId; - } - - public PayTransactionNotifyLogDO setNotifyId(Integer notifyId) { - this.notifyId = notifyId; - return this; - } - -} \ No newline at end of file +} diff --git a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionNotifyTaskDO.java b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionNotifyTaskDO.java index 531606221..5a3393166 100644 --- a/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionNotifyTaskDO.java +++ b/pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionNotifyTaskDO.java @@ -2,12 +2,16 @@ package cn.iocoder.mall.pay.biz.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; import cn.iocoder.mall.pay.biz.service.PayServiceImpl; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; /** * 支付交易通知 App 的任务 DO */ +@Data +@Accessors(chain = true) public class PayTransactionNotifyTaskDO extends DeletableDO { /** @@ -84,103 +88,4 @@ public class PayTransactionNotifyTaskDO extends DeletableDO { */ private String notifyUrl; - public Integer getTransactionId() { - return transactionId; - } - - public PayTransactionNotifyTaskDO setTransactionId(Integer transactionId) { - this.transactionId = transactionId; - return this; - } - - public String getAppId() { - return appId; - } - - public PayTransactionNotifyTaskDO setAppId(String appId) { - this.appId = appId; - return this; - } - - public String getOrderId() { - return orderId; - } - - public PayTransactionNotifyTaskDO setOrderId(String orderId) { - this.orderId = orderId; - return this; - } - - public Integer getStatus() { - return status; - } - - public PayTransactionNotifyTaskDO setStatus(Integer status) { - this.status = status; - return this; - } - - public Date getNextNotifyTime() { - return nextNotifyTime; - } - - public PayTransactionNotifyTaskDO setNextNotifyTime(Date nextNotifyTime) { - this.nextNotifyTime = nextNotifyTime; - return this; - } - - public Integer getNotifyTimes() { - return notifyTimes; - } - - public PayTransactionNotifyTaskDO setNotifyTimes(Integer notifyTimes) { - this.notifyTimes = notifyTimes; - return this; - } - - public Integer getMaxNotifyTimes() { - return maxNotifyTimes; - } - - public PayTransactionNotifyTaskDO setMaxNotifyTimes(Integer maxNotifyTimes) { - this.maxNotifyTimes = maxNotifyTimes; - return this; - } - - public Integer getId() { - return id; - } - - public PayTransactionNotifyTaskDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getTransactionExtensionId() { - return transactionExtensionId; - } - - public PayTransactionNotifyTaskDO setTransactionExtensionId(Integer transactionExtensionId) { - this.transactionExtensionId = transactionExtensionId; - return this; - } - - public String getNotifyUrl() { - return notifyUrl; - } - - public PayTransactionNotifyTaskDO setNotifyUrl(String notifyUrl) { - this.notifyUrl = notifyUrl; - return this; - } - - public Date getLastExecuteTime() { - return lastExecuteTime; - } - - public PayTransactionNotifyTaskDO setLastExecuteTime(Date lastExecuteTime) { - this.lastExecuteTime = lastExecuteTime; - return this; - } - -} \ No newline at end of file +} diff --git a/pom.xml b/pom.xml index 672bc88f4..5c5481e3c 100644 --- a/pom.xml +++ b/pom.xml @@ -25,19 +25,101 @@ pom + + 2.6.5 + 5.1.47 + 0.2.1.RELEASE + 1.3.0.Final + 2.12.0 + 2.9.2 + 2.0.0 + 2.0.1 + 27.0.1-jre + 2.0.1 + + 3.8.0 + 1.16.14 + + 1.8 + + com.alibaba dubbo - 2.6.5 + ${com.alibab.dubbo.version} + + + com.alibaba.boot + dubbo-spring-boot-starter + ${dubbo-spring-boot-starter.version} mysql mysql-connector-java - 5.1.47 + ${mysql-connector-java.version} + + + org.mapstruct + mapstruct + ${org.mapstruct.version} + + + org.mapstruct + mapstruct-jdk8 + ${org.mapstruct.version} + + + + org.projectlombok + lombok + ${org.projectlombok.version} + + + + org.apache.curator + curator-framework + ${curator.version} + + + + io.springfox + springfox-swagger2 + ${springfox-swagger.version} + + + io.springfox + springfox-swagger-ui + ${springfox-swagger.version} + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + ${mybatis-spring-boot-starter.version} + + + + com.google.guava + guava + ${guava.version} + + + + com.xuxueli + xxl-job-core + ${xxl-job.version} + + + + org.apache.rocketmq + rocketmq-spring-boot-starter + ${rocketmq-spring-boot-starter.version} + + @@ -50,5 +132,42 @@ + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${java.version} + ${java.version} + + + org.mapstruct + mapstruct-processor + ${org.mapstruct.version} + + + org.projectlombok + lombok + ${org.projectlombok.version} + + + + - \ No newline at end of file + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + + + + diff --git a/product/product-application/pom.xml b/product/product-application/pom.xml index 008fbd314..4558849d3 100644 --- a/product/product-application/pom.xml +++ b/product/product-application/pom.xml @@ -11,10 +11,6 @@ product-application - - 1.3.0.Final - - cn.iocoder.mall @@ -47,6 +43,7 @@ org.springframework.boot spring-boot-starter-web + mysql mysql-connector-java @@ -58,7 +55,6 @@ org.mybatis.spring.boot mybatis-spring-boot-starter - 2.0.0 @@ -70,44 +66,24 @@ com.alibaba dubbo - 2.6.5 - com.alibaba.boot dubbo-spring-boot-starter - 0.2.1.RELEASE org.apache.curator curator-framework - 2.12.0 - - org.mapstruct - mapstruct - ${org.mapstruct.version} - - - io.springfox springfox-swagger2 - 2.9.2 io.springfox springfox-swagger-ui - 2.9.2 - - - - javax.servlet - servlet-api - 2.5 - provided @@ -118,29 +94,14 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - org.mapstruct - mapstruct-processor - ${org.mapstruct.version} - - - org.springframework.boot spring-boot-maven-plugin - - true - - \ No newline at end of file + diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductCategoryController.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductCategoryController.java index 4adc3cb9c..c71ea9e55 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductCategoryController.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/admins/AdminsProductCategoryController.java @@ -36,7 +36,7 @@ public class AdminsProductCategoryController { public CommonResult> tree() { List productCategories = productCategoryService.getAll().getData(); // 创建 ProductCategoryTreeNodeVO Map - Map treeNodeMap = productCategories.stream().collect(Collectors.toMap(ProductCategoryBO::getId, ProductCategoryConvert.INSTANCE::convert)); + Map treeNodeMap = productCategories.stream().collect(Collectors.toMap(ProductCategoryBO::getId, ProductCategoryConvert.Admins.INSTANCE::convert)); // 处理父子关系 treeNodeMap.values().stream() .filter(node -> !node.getPid().equals(ProductCategoryConstants.PID_ROOT)) @@ -77,7 +77,7 @@ public class AdminsProductCategoryController { // 创建商品分类 CommonResult result = productCategoryService.addProductCategory(AdminSecurityContextHolder.getContext().getAdminId(), productCategoryAddDTO); // 返回结果 - return ProductCategoryConvert.INSTANCE.convert2(result); + return ProductCategoryConvert.Admins.INSTANCE.convert2(result); } @PostMapping("/update") @@ -121,4 +121,4 @@ public class AdminsProductCategoryController { return productCategoryService.deleteProductCategory(AdminSecurityContextHolder.getContext().getAdminId(), id); } -} \ No newline at end of file +} diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductCategoryController.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductCategoryController.java index 59426eaa2..5091e96d8 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductCategoryController.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/controller/users/UsersProductCategoryController.java @@ -29,7 +29,7 @@ public class UsersProductCategoryController { @ApiImplicitParam(name = "pid", value = "指定分类编号", required = true, example = "0") public CommonResult> list(@RequestParam("pid") Integer pid) { List result = productCategoryService.getListByPid(pid); - return CommonResult.success(ProductCategoryConvert.INSTANCE.convertToVO(result)); + return CommonResult.success(ProductCategoryConvert.Users.INSTANCE.convertToVO(result)); } -} \ No newline at end of file +} diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/convert/ProductCategoryConvert.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/convert/ProductCategoryConvert.java index 9966488a2..1b44f6a67 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/convert/ProductCategoryConvert.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/convert/ProductCategoryConvert.java @@ -2,30 +2,41 @@ package cn.iocoder.mall.product.application.convert; import cn.iocoder.common.framework.vo.CommonResult; import cn.iocoder.mall.product.api.bo.ProductCategoryBO; -import cn.iocoder.mall.product.application.vo.users.UsersProductCategoryVO; import cn.iocoder.mall.product.application.vo.admins.AdminsProductCategoryTreeNodeVO; import cn.iocoder.mall.product.application.vo.admins.AdminsProductCategoryVO; +import cn.iocoder.mall.product.application.vo.users.UsersProductCategoryVO; import org.mapstruct.Mapper; import org.mapstruct.Mappings; import org.mapstruct.factory.Mappers; import java.util.List; -@Mapper public interface ProductCategoryConvert { - ProductCategoryConvert INSTANCE = Mappers.getMapper(ProductCategoryConvert.class); + @Mapper + interface Users { - @Mappings({}) - UsersProductCategoryVO convertToVO(ProductCategoryBO category); + Users INSTANCE = Mappers.getMapper(Users.class); - @Mappings({}) - List convertToVO(List categoryList); + @Mappings({}) + UsersProductCategoryVO convertToVO(ProductCategoryBO category); - @Mappings({}) - AdminsProductCategoryTreeNodeVO convert(ProductCategoryBO category); + @Mappings({}) + List convertToVO(List categoryList); - @Mappings({}) - CommonResult convert2(CommonResult result); + } -} \ No newline at end of file + @Mapper + interface Admins { + + Admins INSTANCE = Mappers.getMapper(Admins.class); + + @Mappings({}) + AdminsProductCategoryTreeNodeVO convert(ProductCategoryBO category); + + @Mappings({}) + CommonResult convert2(CommonResult result); + + } + +} diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrAndValuePairVO.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrAndValuePairVO.java index 7d6aeb2f7..33c6fb643 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrAndValuePairVO.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrAndValuePairVO.java @@ -2,8 +2,12 @@ package cn.iocoder.mall.product.application.vo.admins; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; @ApiModel(value = "商品规格属性和值对 VO") +@Data +@Accessors(chain = true) public class AdminsProductAttrAndValuePairVO { @ApiModelProperty(value = "规格编号", required = true, example = "1") @@ -15,40 +19,4 @@ public class AdminsProductAttrAndValuePairVO { @ApiModelProperty(value = "规格值名", required = true, example = "红色") private String attrValueName; - public Integer getAttrId() { - return attrId; - } - - public AdminsProductAttrAndValuePairVO setAttrId(Integer attrId) { - this.attrId = attrId; - return this; - } - - public String getAttrName() { - return attrName; - } - - public AdminsProductAttrAndValuePairVO setAttrName(String attrName) { - this.attrName = attrName; - return this; - } - - public Integer getAttrValueId() { - return attrValueId; - } - - public AdminsProductAttrAndValuePairVO setAttrValueId(Integer attrValueId) { - this.attrValueId = attrValueId; - return this; - } - - public String getAttrValueName() { - return attrValueName; - } - - public AdminsProductAttrAndValuePairVO setAttrValueName(String attrValueName) { - this.attrValueName = attrValueName; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrDetailVO.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrDetailVO.java index 8b5660062..edf2cf0a6 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrDetailVO.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrDetailVO.java @@ -2,11 +2,15 @@ package cn.iocoder.mall.product.application.vo.admins; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; import java.util.List; @ApiModel(value = "商品规格明细 VO", description = "带有规格值数组") +@Data +@Accessors(chain = true) public class AdminsProductAttrDetailVO { @ApiModelProperty(value = "规格编号", required = true, example = "1") @@ -20,49 +24,4 @@ public class AdminsProductAttrDetailVO { @ApiModelProperty(value = "规格值数组", required = true) private List values; - public Integer getId() { - return id; - } - - public AdminsProductAttrDetailVO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public AdminsProductAttrDetailVO setName(String name) { - this.name = name; - return this; - } - - public Integer getStatus() { - return status; - } - - public AdminsProductAttrDetailVO setStatus(Integer status) { - this.status = status; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public AdminsProductAttrDetailVO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - - public List getValues() { - return values; - } - - public AdminsProductAttrDetailVO setValues(List values) { - this.values = values; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrPageVO.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrPageVO.java index 44a5c67e8..73fe8e343 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrPageVO.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrPageVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.product.application.vo.admins; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.List; @ApiModel(value = "商品规格明细分页 VO") +@Data +@Accessors(chain = true) public class AdminsProductAttrPageVO { @ApiModelProperty(value = "规格数组", required = true) @@ -13,22 +17,4 @@ public class AdminsProductAttrPageVO { @ApiModelProperty(value = "总数", required = true) private Integer count; - public List getAttrs() { - return attrs; - } - - public AdminsProductAttrPageVO setAttrs(List attrs) { - this.attrs = attrs; - return this; - } - - public Integer getCount() { - return count; - } - - public AdminsProductAttrPageVO setCount(Integer count) { - this.count = count; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrSimpleVO.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrSimpleVO.java index c446654a5..b734772f0 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrSimpleVO.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrSimpleVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.product.application.vo.admins; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.List; @ApiModel(value = "商品规格精简 VO", description = "带有规格值数组") +@Data +@Accessors(chain = true) public class AdminsProductAttrSimpleVO { @ApiModelProperty(value = "规格编号", required = true, example = "1") @@ -15,31 +19,4 @@ public class AdminsProductAttrSimpleVO { @ApiModelProperty(value = "规格值数组", required = true) private List values; - public Integer getId() { - return id; - } - - public AdminsProductAttrSimpleVO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public AdminsProductAttrSimpleVO setName(String name) { - this.name = name; - return this; - } - - public List getValues() { - return values; - } - - public AdminsProductAttrSimpleVO setValues(List values) { - this.values = values; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrVO.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrVO.java index c0767df56..1e75a2d30 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrVO.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.product.application.vo.admins; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; @ApiModel(value = "商品规格 VO", description = "不带有规格值数组") +@Data +@Accessors(chain = true) public class AdminsProductAttrVO { @ApiModelProperty(value = "规格编号", required = true, example = "1") @@ -17,39 +21,4 @@ public class AdminsProductAttrVO { @ApiModelProperty(value = "创建时间", required = true, example = "时间戳") private Date createTime; - public Integer getId() { - return id; - } - - public AdminsProductAttrVO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public AdminsProductAttrVO setName(String name) { - this.name = name; - return this; - } - - public Integer getStatus() { - return status; - } - - public AdminsProductAttrVO setStatus(Integer status) { - this.status = status; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public AdminsProductAttrVO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } -} \ No newline at end of file +} diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueDetailVO.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueDetailVO.java index 3276afe4a..2bb8182af 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueDetailVO.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueDetailVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.product.application.vo.admins; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; @ApiModel(value = "商品规格值 VO") +@Data +@Accessors(chain = true) public class AdminsProductAttrValueDetailVO { @ApiModelProperty(value = "规格值编号", required = true, example = "1") @@ -17,40 +21,4 @@ public class AdminsProductAttrValueDetailVO { @ApiModelProperty(value = "创建时间", required = true, example = "时间戳") private Date createTime; - public Integer getId() { - return id; - } - - public AdminsProductAttrValueDetailVO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public AdminsProductAttrValueDetailVO setName(String name) { - this.name = name; - return this; - } - - public Integer getStatus() { - return status; - } - - public AdminsProductAttrValueDetailVO setStatus(Integer status) { - this.status = status; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public AdminsProductAttrValueDetailVO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueSimpleVO.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueSimpleVO.java index c814343c8..bcd12b54e 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueSimpleVO.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueSimpleVO.java @@ -2,8 +2,12 @@ package cn.iocoder.mall.product.application.vo.admins; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; @ApiModel(value = "商品规格值精简 VO") +@Data +@Accessors(chain = true) public class AdminsProductAttrValueSimpleVO { @ApiModelProperty(value = "规格值编号", required = true, example = "1") @@ -11,22 +15,4 @@ public class AdminsProductAttrValueSimpleVO { @ApiModelProperty(value = "规格值名", required = true, example = "颜色") private String name; - public Integer getId() { - return id; - } - - public AdminsProductAttrValueSimpleVO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public AdminsProductAttrValueSimpleVO setName(String name) { - this.name = name; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueVO.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueVO.java index 187ce2f7a..0829891a6 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueVO.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductAttrValueVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.product.application.vo.admins; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; @ApiModel(value = "商品规格值 VO") +@Data +@Accessors(chain = true) public class AdminsProductAttrValueVO { @ApiModelProperty(value = "规格值编号", required = true, example = "1") @@ -19,49 +23,4 @@ public class AdminsProductAttrValueVO { @ApiModelProperty(value = "创建时间", required = true, example = "时间戳") private Date createTime; - public Integer getId() { - return id; - } - - public AdminsProductAttrValueVO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public AdminsProductAttrValueVO setName(String name) { - this.name = name; - return this; - } - - public Integer getStatus() { - return status; - } - - public AdminsProductAttrValueVO setStatus(Integer status) { - this.status = status; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public AdminsProductAttrValueVO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - - public Integer getAttrId() { - return attrId; - } - - public AdminsProductAttrValueVO setAttrId(Integer attrId) { - this.attrId = attrId; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductCategoryTreeNodeVO.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductCategoryTreeNodeVO.java index 526db8268..6a7b35adc 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductCategoryTreeNodeVO.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductCategoryTreeNodeVO.java @@ -2,11 +2,15 @@ package cn.iocoder.mall.product.application.vo.admins; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; import java.util.List; @ApiModel("产品分类树节点 VO") +@Data +@Accessors(chain = true) public class AdminsProductCategoryTreeNodeVO { @ApiModelProperty(value = "分类编号", required = true, example = "1") @@ -28,85 +32,4 @@ public class AdminsProductCategoryTreeNodeVO { @ApiModelProperty(value = "子节点数组") private List children; - public Integer getId() { - return id; - } - - public AdminsProductCategoryTreeNodeVO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getPid() { - return pid; - } - - public AdminsProductCategoryTreeNodeVO setPid(Integer pid) { - this.pid = pid; - return this; - } - - public String getName() { - return name; - } - - public AdminsProductCategoryTreeNodeVO setName(String name) { - this.name = name; - return this; - } - - public String getDescription() { - return description; - } - - public AdminsProductCategoryTreeNodeVO setDescription(String description) { - this.description = description; - return this; - } - - public String getPicUrl() { - return picUrl; - } - - public AdminsProductCategoryTreeNodeVO setPicUrl(String picUrl) { - this.picUrl = picUrl; - return this; - } - - public Integer getSort() { - return sort; - } - - public AdminsProductCategoryTreeNodeVO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public Integer getStatus() { - return status; - } - - public AdminsProductCategoryTreeNodeVO setStatus(Integer status) { - this.status = status; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public AdminsProductCategoryTreeNodeVO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - - public List getChildren() { - return children; - } - - public AdminsProductCategoryTreeNodeVO setChildren(List children) { - this.children = children; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductCategoryVO.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductCategoryVO.java index 4a309b383..b52374f27 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductCategoryVO.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductCategoryVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.product.application.vo.admins; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; @ApiModel("产品分类 VO") +@Data +@Accessors(chain = true) public class AdminsProductCategoryVO { @ApiModelProperty(value = "分类编号", required = true, example = "1") @@ -25,76 +29,4 @@ public class AdminsProductCategoryVO { @ApiModelProperty(value = "创建时间", required = true, example = "时间戳") private Date createTime; - public Integer getId() { - return id; - } - - public AdminsProductCategoryVO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getPid() { - return pid; - } - - public AdminsProductCategoryVO setPid(Integer pid) { - this.pid = pid; - return this; - } - - public String getName() { - return name; - } - - public AdminsProductCategoryVO setName(String name) { - this.name = name; - return this; - } - - public String getDescription() { - return description; - } - - public AdminsProductCategoryVO setDescription(String description) { - this.description = description; - return this; - } - - public String getPicUrl() { - return picUrl; - } - - public AdminsProductCategoryVO setPicUrl(String picUrl) { - this.picUrl = picUrl; - return this; - } - - public Integer getSort() { - return sort; - } - - public AdminsProductCategoryVO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public Integer getStatus() { - return status; - } - - public AdminsProductCategoryVO setStatus(Integer status) { - this.status = status; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public AdminsProductCategoryVO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSkuDetailVO.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSkuDetailVO.java index bf35708cc..bc80242ca 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSkuDetailVO.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSkuDetailVO.java @@ -1,12 +1,16 @@ package cn.iocoder.mall.product.application.vo.admins; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.List; /** * 商品 Sku 明细 BO */ +@Data +@Accessors(chain = true) public class AdminsProductSkuDetailVO { @ApiModelProperty(value = "sku 编号", required = true, example = "1") @@ -22,58 +26,4 @@ public class AdminsProductSkuDetailVO { @ApiModelProperty(value = "库存数量", required = true, example = "100") private Integer quantity; - public Integer getId() { - return id; - } - - public AdminsProductSkuDetailVO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getSpuId() { - return spuId; - } - - public AdminsProductSkuDetailVO setSpuId(Integer spuId) { - this.spuId = spuId; - return this; - } - - public String getPicURL() { - return picURL; - } - - public AdminsProductSkuDetailVO setPicURL(String picURL) { - this.picURL = picURL; - return this; - } - - public Integer getPrice() { - return price; - } - - public AdminsProductSkuDetailVO setPrice(Integer price) { - this.price = price; - return this; - } - - public Integer getQuantity() { - return quantity; - } - - public AdminsProductSkuDetailVO setQuantity(Integer quantity) { - this.quantity = quantity; - return this; - } - - public List getAttrs() { - return attrs; - } - - public AdminsProductSkuDetailVO setAttrs(List attrs) { - this.attrs = attrs; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuDetailVO.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuDetailVO.java index 2b5d0d5d5..7626f96df 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuDetailVO.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuDetailVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.product.application.vo.admins; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.List; @ApiModel(value = "商品 SPU 详细 VO", description = "包括 SKU 信息 VO") +@Data +@Accessors(chain = true) public class AdminsProductSpuDetailVO { @ApiModelProperty(value = "SPU 编号", required = true, example = "1") @@ -36,85 +40,4 @@ public class AdminsProductSpuDetailVO { */ private List skus; - public Integer getId() { - return id; - } - - public AdminsProductSpuDetailVO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public AdminsProductSpuDetailVO setName(String name) { - this.name = name; - return this; - } - - public String getSellPoint() { - return sellPoint; - } - - public AdminsProductSpuDetailVO setSellPoint(String sellPoint) { - this.sellPoint = sellPoint; - return this; - } - - public String getDescription() { - return description; - } - - public AdminsProductSpuDetailVO setDescription(String description) { - this.description = description; - return this; - } - - public Integer getCid() { - return cid; - } - - public AdminsProductSpuDetailVO setCid(Integer cid) { - this.cid = cid; - return this; - } - - public List getPicUrls() { - return picUrls; - } - - public AdminsProductSpuDetailVO setPicUrls(List picUrls) { - this.picUrls = picUrls; - return this; - } - - public Boolean getVisible() { - return visible; - } - - public AdminsProductSpuDetailVO setVisible(Boolean visible) { - this.visible = visible; - return this; - } - - public Integer getSort() { - return sort; - } - - public AdminsProductSpuDetailVO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public List getSkus() { - return skus; - } - - public AdminsProductSpuDetailVO setSkus(List skus) { - this.skus = skus; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuPageVO.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuPageVO.java index 4e381cb77..f81151a9b 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuPageVO.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuPageVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.product.application.vo.admins; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.List; @ApiModel("商品 SPU 分页 VO") +@Data +@Accessors(chain = true) public class AdminsProductSpuPageVO { @ApiModelProperty(value = "spu 数组", required = true) @@ -13,22 +17,4 @@ public class AdminsProductSpuPageVO { @ApiModelProperty(value = "总数", required = true) private Integer count; - public List getSpus() { - return spus; - } - - public AdminsProductSpuPageVO setSpus(List spus) { - this.spus = spus; - return this; - } - - public Integer getCount() { - return count; - } - - public AdminsProductSpuPageVO setCount(Integer count) { - this.count = count; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuVO.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuVO.java index 1011dbd62..dddf86389 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuVO.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/admins/AdminsProductSpuVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.product.application.vo.admins; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.List; @ApiModel(value = "商品 SPU VO", description = "不包括 SKU 信息 VO") +@Data +@Accessors(chain = true) public class AdminsProductSpuVO { @ApiModelProperty(value = "SPU 编号", required = true, example = "1") @@ -31,85 +35,4 @@ public class AdminsProductSpuVO { @ApiModelProperty(value = "排序字段", required = true, example = "10") private Integer sort; - public Integer getId() { - return id; - } - - public AdminsProductSpuVO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public AdminsProductSpuVO setName(String name) { - this.name = name; - return this; - } - - public String getSellPoint() { - return sellPoint; - } - - public AdminsProductSpuVO setSellPoint(String sellPoint) { - this.sellPoint = sellPoint; - return this; - } - - public String getDescription() { - return description; - } - - public AdminsProductSpuVO setDescription(String description) { - this.description = description; - return this; - } - - public Integer getCid() { - return cid; - } - - public AdminsProductSpuVO setCid(Integer cid) { - this.cid = cid; - return this; - } - - public List getPicUrls() { - return picUrls; - } - - public AdminsProductSpuVO setPicUrls(List picUrls) { - this.picUrls = picUrls; - return this; - } - - public Boolean getVisible() { - return visible; - } - - public AdminsProductSpuVO setVisible(Boolean visible) { - this.visible = visible; - return this; - } - - public Integer getSort() { - return sort; - } - - public AdminsProductSpuVO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public Integer getQuantity() { - return quantity; - } - - public AdminsProductSpuVO setQuantity(Integer quantity) { - this.quantity = quantity; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductAttrAndValuePairVO.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductAttrAndValuePairVO.java index 55a59ffdc..2902980bf 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductAttrAndValuePairVO.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductAttrAndValuePairVO.java @@ -2,8 +2,12 @@ package cn.iocoder.mall.product.application.vo.users; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; @ApiModel(value = "商品规格属性和值对 VO") +@Data +@Accessors(chain = true) public class UsersProductAttrAndValuePairVO { @ApiModelProperty(value = "规格编号", required = true, example = "1") @@ -15,40 +19,4 @@ public class UsersProductAttrAndValuePairVO { @ApiModelProperty(value = "规格值名", required = true, example = "红色") private String attrValueName; - public Integer getAttrId() { - return attrId; - } - - public UsersProductAttrAndValuePairVO setAttrId(Integer attrId) { - this.attrId = attrId; - return this; - } - - public String getAttrName() { - return attrName; - } - - public UsersProductAttrAndValuePairVO setAttrName(String attrName) { - this.attrName = attrName; - return this; - } - - public Integer getAttrValueId() { - return attrValueId; - } - - public UsersProductAttrAndValuePairVO setAttrValueId(Integer attrValueId) { - this.attrValueId = attrValueId; - return this; - } - - public String getAttrValueName() { - return attrValueName; - } - - public UsersProductAttrAndValuePairVO setAttrValueName(String attrValueName) { - this.attrValueName = attrValueName; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductCategoryVO.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductCategoryVO.java index d32304b64..57b158e02 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductCategoryVO.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductCategoryVO.java @@ -2,8 +2,12 @@ package cn.iocoder.mall.product.application.vo.users; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; @ApiModel("商品分类（简单）") +@Data +@Accessors(chain = true) public class UsersProductCategoryVO { @ApiModelProperty(value = "分类编号", required = true, example = "1") @@ -13,28 +17,4 @@ public class UsersProductCategoryVO { @ApiModelProperty(value = "分类图片", notes = "一般情况下，只有根分类才有图片", example = "http://www.iocoder.cn/images/common/wechat_mp_2017_07_31_bak.jpg") private String picUrl; - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getPicUrl() { - return picUrl; - } - - public void setPicUrl(String picUrl) { - this.picUrl = picUrl; - } - -} \ No newline at end of file +} diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSkuDetailVO.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSkuDetailVO.java index b1cfc0081..338209ffc 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSkuDetailVO.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSkuDetailVO.java @@ -1,12 +1,16 @@ package cn.iocoder.mall.product.application.vo.users; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.List; /** * 商品 Sku 明细 BO */ +@Data +@Accessors(chain = true) public class UsersProductSkuDetailVO { @ApiModelProperty(value = "sku 编号", required = true, example = "1") @@ -22,58 +26,4 @@ public class UsersProductSkuDetailVO { @ApiModelProperty(value = "库存数量", required = true, example = "100") private Integer quantity; - public Integer getId() { - return id; - } - - public UsersProductSkuDetailVO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getSpuId() { - return spuId; - } - - public UsersProductSkuDetailVO setSpuId(Integer spuId) { - this.spuId = spuId; - return this; - } - - public String getPicURL() { - return picURL; - } - - public UsersProductSkuDetailVO setPicURL(String picURL) { - this.picURL = picURL; - return this; - } - - public Integer getPrice() { - return price; - } - - public UsersProductSkuDetailVO setPrice(Integer price) { - this.price = price; - return this; - } - - public Integer getQuantity() { - return quantity; - } - - public UsersProductSkuDetailVO setQuantity(Integer quantity) { - this.quantity = quantity; - return this; - } - - public List getAttrs() { - return attrs; - } - - public UsersProductSkuDetailVO setAttrs(List attrs) { - this.attrs = attrs; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSpuDetailVO.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSpuDetailVO.java index d58ea0b77..1d56f8029 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSpuDetailVO.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSpuDetailVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.product.application.vo.users; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.List; @ApiModel(value = "商品 SPU 详细 VO", description = "包括 SKU 信息 VO") +@Data +@Accessors(chain = true) public class UsersProductSpuDetailVO { @ApiModelProperty(value = "SPU 编号", required = true, example = "1") @@ -30,66 +34,4 @@ public class UsersProductSpuDetailVO { */ private List skus; - public Integer getId() { - return id; - } - - public UsersProductSpuDetailVO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public UsersProductSpuDetailVO setName(String name) { - this.name = name; - return this; - } - - public String getSellPoint() { - return sellPoint; - } - - public UsersProductSpuDetailVO setSellPoint(String sellPoint) { - this.sellPoint = sellPoint; - return this; - } - - public String getDescription() { - return description; - } - - public UsersProductSpuDetailVO setDescription(String description) { - this.description = description; - return this; - } - - public Integer getCid() { - return cid; - } - - public UsersProductSpuDetailVO setCid(Integer cid) { - this.cid = cid; - return this; - } - - public List getPicUrls() { - return picUrls; - } - - public UsersProductSpuDetailVO setPicUrls(List picUrls) { - this.picUrls = picUrls; - return this; - } - - public List getSkus() { - return skus; - } - - public UsersProductSpuDetailVO setSkus(List skus) { - this.skus = skus; - return this; - } -} \ No newline at end of file +} diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSpuPageVO.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSpuPageVO.java index 55c801cc1..f2adb5f76 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSpuPageVO.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSpuPageVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.product.application.vo.users; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.List; @ApiModel("商品 SPU 分页 VO") +@Data +@Accessors(chain = true) public class UsersProductSpuPageVO { @ApiModelProperty(value = "spu 数组", required = true) @@ -13,22 +17,4 @@ public class UsersProductSpuPageVO { @ApiModelProperty(value = "总数", required = true) private Integer count; - public List getSpus() { - return spus; - } - - public UsersProductSpuPageVO setSpus(List spus) { - this.spus = spus; - return this; - } - - public Integer getCount() { - return count; - } - - public UsersProductSpuPageVO setCount(Integer count) { - this.count = count; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSpuVO.java b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSpuVO.java index 5f7e5d1fd..1236a0e12 100644 --- a/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSpuVO.java +++ b/product/product-application/src/main/java/cn/iocoder/mall/product/application/vo/users/UsersProductSpuVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.product.application.vo.users; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.List; @ApiModel(value = "商品 SPU VO", description = "不包括 SKU 信息 VO") +@Data +@Accessors(chain = true) public class UsersProductSpuVO { @ApiModelProperty(value = "SPU 编号", required = true, example = "1") @@ -35,66 +39,4 @@ public class UsersProductSpuVO { */ private Integer quantity; - public Integer getId() { - return id; - } - - public UsersProductSpuVO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public UsersProductSpuVO setName(String name) { - this.name = name; - return this; - } - - public String getSellPoint() { - return sellPoint; - } - - public UsersProductSpuVO setSellPoint(String sellPoint) { - this.sellPoint = sellPoint; - return this; - } - - public Integer getCid() { - return cid; - } - - public UsersProductSpuVO setCid(Integer cid) { - this.cid = cid; - return this; - } - - public List getPicUrls() { - return picUrls; - } - - public UsersProductSpuVO setPicUrls(List picUrls) { - this.picUrls = picUrls; - return this; - } - - public Integer getPrice() { - return price; - } - - public UsersProductSpuVO setPrice(Integer price) { - this.price = price; - return this; - } - - public Integer getQuantity() { - return quantity; - } - - public UsersProductSpuVO setQuantity(Integer quantity) { - this.quantity = quantity; - return this; - } -} \ No newline at end of file +} diff --git a/product/product-service-api/pom.xml b/product/product-service-api/pom.xml index 24117697c..03c2efe52 100644 --- a/product/product-service-api/pom.xml +++ b/product/product-service-api/pom.xml @@ -19,9 +19,22 @@ - org.hibernate.validator - hibernate-validator + javax.validation + validation-api + + + + org.mapstruct + mapstruct + + + org.mapstruct + mapstruct-jdk8 + + + org.projectlombok + lombok - \ No newline at end of file + diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrAndValuePairBO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrAndValuePairBO.java index dfea5d9f5..3faa888aa 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrAndValuePairBO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrAndValuePairBO.java @@ -1,10 +1,15 @@ package cn.iocoder.mall.product.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; /** * 商品规格明细 BO */ +@Data +@Accessors(chain = true) public class ProductAttrAndValuePairBO implements Serializable { /** @@ -24,40 +29,4 @@ public class ProductAttrAndValuePairBO implements Serializable { */ private String attrValueName; - public Integer getAttrId() { - return attrId; - } - - public ProductAttrAndValuePairBO setAttrId(Integer attrId) { - this.attrId = attrId; - return this; - } - - public String getAttrName() { - return attrName; - } - - public ProductAttrAndValuePairBO setAttrName(String attrName) { - this.attrName = attrName; - return this; - } - - public Integer getAttrValueId() { - return attrValueId; - } - - public ProductAttrAndValuePairBO setAttrValueId(Integer attrValueId) { - this.attrValueId = attrValueId; - return this; - } - - public String getAttrValueName() { - return attrValueName; - } - - public ProductAttrAndValuePairBO setAttrValueName(String attrValueName) { - this.attrValueName = attrValueName; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrBO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrBO.java index 2da299c38..cbb535142 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrBO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrBO.java @@ -1,11 +1,16 @@ package cn.iocoder.mall.product.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.util.Date; /** * 商品规格 VO */ +@Data +@Accessors(chain = true) public class ProductAttrBO implements Serializable { /** @@ -25,39 +30,4 @@ public class ProductAttrBO implements Serializable { */ private Date createTime; - public Integer getId() { - return id; - } - - public ProductAttrBO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public ProductAttrBO setName(String name) { - this.name = name; - return this; - } - - public Integer getStatus() { - return status; - } - - public ProductAttrBO setStatus(Integer status) { - this.status = status; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public ProductAttrBO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } -} \ No newline at end of file +} diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrDetailBO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrDetailBO.java index 6a3c5edf3..0911e4d0e 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrDetailBO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrDetailBO.java @@ -1,5 +1,8 @@ package cn.iocoder.mall.product.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.util.Date; import java.util.List; @@ -7,6 +10,8 @@ import java.util.List; /** * 商品规格明细 VO */ +@Data +@Accessors(chain = true) public class ProductAttrDetailBO implements Serializable { /** @@ -30,48 +35,4 @@ public class ProductAttrDetailBO implements Serializable { */ private List values; - public Integer getId() { - return id; - } - - public ProductAttrDetailBO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public ProductAttrDetailBO setName(String name) { - this.name = name; - return this; - } - - public Integer getStatus() { - return status; - } - - public ProductAttrDetailBO setStatus(Integer status) { - this.status = status; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public ProductAttrDetailBO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - - public List getValues() { - return values; - } - - public ProductAttrDetailBO setValues(List values) { - this.values = values; - return this; - } -} \ No newline at end of file +} diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrPageBO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrPageBO.java index bf6176f5c..f44cce203 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrPageBO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrPageBO.java @@ -1,11 +1,16 @@ package cn.iocoder.mall.product.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.util.List; /** * 商品规格明细分页 BO */ +@Data +@Accessors(chain = true) public class ProductAttrPageBO implements Serializable { /** @@ -17,22 +22,4 @@ public class ProductAttrPageBO implements Serializable { */ private Integer count; - public List getAttrs() { - return attrs; - } - - public ProductAttrPageBO setAttrs(List attrs) { - this.attrs = attrs; - return this; - } - - public Integer getCount() { - return count; - } - - public ProductAttrPageBO setCount(Integer count) { - this.count = count; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrSimpleBO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrSimpleBO.java index 9eda2af66..2337c7a90 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrSimpleBO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrSimpleBO.java @@ -1,11 +1,16 @@ package cn.iocoder.mall.product.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.util.List; /** * 商品规格精简 VO */ +@Data +@Accessors(chain = true) public class ProductAttrSimpleBO implements Serializable { /** @@ -21,31 +26,4 @@ public class ProductAttrSimpleBO implements Serializable { */ private List values; - public Integer getId() { - return id; - } - - public ProductAttrSimpleBO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public ProductAttrSimpleBO setName(String name) { - this.name = name; - return this; - } - - public List getValues() { - return values; - } - - public ProductAttrSimpleBO setValues(List values) { - this.values = values; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrValueBO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrValueBO.java index 3fe44272e..3c6874985 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrValueBO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrValueBO.java @@ -1,11 +1,16 @@ package cn.iocoder.mall.product.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.util.Date; /** * 商品规格值 VO */ +@Data +@Accessors(chain = true) public class ProductAttrValueBO implements Serializable { /** @@ -29,48 +34,4 @@ public class ProductAttrValueBO implements Serializable { */ private Date createTime; - public Integer getId() { - return id; - } - - public ProductAttrValueBO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public ProductAttrValueBO setName(String name) { - this.name = name; - return this; - } - - public Integer getStatus() { - return status; - } - - public ProductAttrValueBO setStatus(Integer status) { - this.status = status; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public ProductAttrValueBO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - - public Integer getAttrId() { - return attrId; - } - - public ProductAttrValueBO setAttrId(Integer attrId) { - this.attrId = attrId; - return this; - } -} \ No newline at end of file +} diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrValueDetailBO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrValueDetailBO.java index c70690e99..ffb9f3ade 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrValueDetailBO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrValueDetailBO.java @@ -1,11 +1,16 @@ package cn.iocoder.mall.product.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.util.Date; /** * 商品规格值 VO */ +@Data +@Accessors(chain = true) public class ProductAttrValueDetailBO implements Serializable { /** @@ -25,39 +30,4 @@ public class ProductAttrValueDetailBO implements Serializable { */ private Date createTime; - public Integer getId() { - return id; - } - - public ProductAttrValueDetailBO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public ProductAttrValueDetailBO setName(String name) { - this.name = name; - return this; - } - - public Integer getStatus() { - return status; - } - - public ProductAttrValueDetailBO setStatus(Integer status) { - this.status = status; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public ProductAttrValueDetailBO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } -} \ No newline at end of file +} diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrValueSimpleBO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrValueSimpleBO.java index 7d1bb0ec9..f2380b3ed 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrValueSimpleBO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductAttrValueSimpleBO.java @@ -1,10 +1,15 @@ package cn.iocoder.mall.product.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; /** * 商品规格值 VO */ +@Data +@Accessors(chain = true) public class ProductAttrValueSimpleBO implements Serializable { /** @@ -16,22 +21,4 @@ public class ProductAttrValueSimpleBO implements Serializable { */ private String name; - public Integer getId() { - return id; - } - - public ProductAttrValueSimpleBO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public ProductAttrValueSimpleBO setName(String name) { - this.name = name; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductCategoryBO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductCategoryBO.java index 6450145cc..b2cefd507 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductCategoryBO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductCategoryBO.java @@ -1,11 +1,16 @@ package cn.iocoder.mall.product.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.util.Date; /** * 商品分类 BO */ +@Data +@Accessors(chain = true) public class ProductCategoryBO implements Serializable { /** @@ -46,71 +51,4 @@ public class ProductCategoryBO implements Serializable { */ private Date createTime; - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Integer getPid() { - return pid; - } - - public void setPid(Integer pid) { - this.pid = pid; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getPicUrl() { - return picUrl; - } - - public void setPicUrl(String picUrl) { - this.picUrl = picUrl; - } - - public Integer getSort() { - return sort; - } - - public void setSort(Integer sort) { - this.sort = sort; - } - - public String getDescription() { - return description; - } - - public ProductCategoryBO setDescription(String description) { - this.description = description; - return this; - } - - public Integer getStatus() { - return status; - } - - public ProductCategoryBO setStatus(Integer status) { - this.status = status; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public ProductCategoryBO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - } diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSkuBO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSkuBO.java index 7ef2ea4ff..e26e85d44 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSkuBO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSkuBO.java @@ -1,17 +1,20 @@ package cn.iocoder.mall.product.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; +/** + * 商品 SKU BOA + */ +@Data +@Accessors(chain = true) public class ProductSkuBO implements Serializable { + /** + * SKU 编号 + */ private Integer id; - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - -} \ No newline at end of file +} diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSkuDetailBO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSkuDetailBO.java index e6e9d5ab4..7864a9efc 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSkuDetailBO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSkuDetailBO.java @@ -1,11 +1,16 @@ package cn.iocoder.mall.product.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.util.List; /** * 商品 Sku 明细 BO */ +@Data +@Accessors(chain = true) public class ProductSkuDetailBO implements Serializable { /** @@ -33,59 +38,4 @@ public class ProductSkuDetailBO implements Serializable { */ private Integer quantity; - - public Integer getId() { - return id; - } - - public ProductSkuDetailBO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getSpuId() { - return spuId; - } - - public ProductSkuDetailBO setSpuId(Integer spuId) { - this.spuId = spuId; - return this; - } - - public String getPicURL() { - return picURL; - } - - public ProductSkuDetailBO setPicURL(String picURL) { - this.picURL = picURL; - return this; - } - - public List getAttrs() { - return attrs; - } - - public ProductSkuDetailBO setAttrs(List attrs) { - this.attrs = attrs; - return this; - } - - public Integer getPrice() { - return price; - } - - public ProductSkuDetailBO setPrice(Integer price) { - this.price = price; - return this; - } - - public Integer getQuantity() { - return quantity; - } - - public ProductSkuDetailBO setQuantity(Integer quantity) { - this.quantity = quantity; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSpuBO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSpuBO.java index c40702e1a..8f442e4d0 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSpuBO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSpuBO.java @@ -1,8 +1,16 @@ package cn.iocoder.mall.product.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.util.List; +/** + * 商品 SPU BO + */ +@Data +@Accessors(chain = true) public class ProductSpuBO implements Serializable { /** @@ -63,93 +71,4 @@ public class ProductSpuBO implements Serializable { */ private Integer quantity; - public Integer getId() { - return id; - } - - public ProductSpuBO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public ProductSpuBO setName(String name) { - this.name = name; - return this; - } - - public String getSellPoint() { - return sellPoint; - } - - public ProductSpuBO setSellPoint(String sellPoint) { - this.sellPoint = sellPoint; - return this; - } - - public String getDescription() { - return description; - } - - public ProductSpuBO setDescription(String description) { - this.description = description; - return this; - } - - public Integer getCid() { - return cid; - } - - public ProductSpuBO setCid(Integer cid) { - this.cid = cid; - return this; - } - - public List getPicUrls() { - return picUrls; - } - - public ProductSpuBO setPicUrls(List picUrls) { - this.picUrls = picUrls; - return this; - } - - public Boolean getVisible() { - return visible; - } - - public ProductSpuBO setVisible(Boolean visible) { - this.visible = visible; - return this; - } - - public Integer getSort() { - return sort; - } - - public ProductSpuBO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public Integer getPrice() { - return price; - } - - public ProductSpuBO setPrice(Integer price) { - this.price = price; - return this; - } - - public Integer getQuantity() { - return quantity; - } - - public ProductSpuBO setQuantity(Integer quantity) { - this.quantity = quantity; - return this; - } -} \ No newline at end of file +} diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSpuDetailBO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSpuDetailBO.java index 2ad313429..c97ed4282 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSpuDetailBO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSpuDetailBO.java @@ -1,11 +1,16 @@ package cn.iocoder.mall.product.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.util.List; /** * 商品 Spu 明细 BO（包括 Sku 明细） */ +@Data +@Accessors(chain = true) public class ProductSpuDetailBO implements Serializable { /** @@ -59,85 +64,4 @@ public class ProductSpuDetailBO implements Serializable { */ private List skus; - public Integer getId() { - return id; - } - - public ProductSpuDetailBO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public ProductSpuDetailBO setName(String name) { - this.name = name; - return this; - } - - public String getSellPoint() { - return sellPoint; - } - - public ProductSpuDetailBO setSellPoint(String sellPoint) { - this.sellPoint = sellPoint; - return this; - } - - public String getDescription() { - return description; - } - - public ProductSpuDetailBO setDescription(String description) { - this.description = description; - return this; - } - - public Integer getCid() { - return cid; - } - - public ProductSpuDetailBO setCid(Integer cid) { - this.cid = cid; - return this; - } - - public List getPicUrls() { - return picUrls; - } - - public ProductSpuDetailBO setPicUrls(List picUrls) { - this.picUrls = picUrls; - return this; - } - - public Boolean getVisible() { - return visible; - } - - public ProductSpuDetailBO setVisible(Boolean visible) { - this.visible = visible; - return this; - } - - public Integer getSort() { - return sort; - } - - public ProductSpuDetailBO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public List getSkus() { - return skus; - } - - public ProductSpuDetailBO setSkus(List skus) { - this.skus = skus; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSpuPageBO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSpuPageBO.java index 0d6093743..a32ef38ef 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSpuPageBO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/bo/ProductSpuPageBO.java @@ -1,8 +1,16 @@ package cn.iocoder.mall.product.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.util.List; +/** + * 商品 SPU 分页 BO + */ +@Data +@Accessors(chain = true) public class ProductSpuPageBO implements Serializable { /** @@ -14,22 +22,4 @@ public class ProductSpuPageBO implements Serializable { */ private Integer count; - public List getSpus() { - return spus; - } - - public ProductSpuPageBO setSpus(List spus) { - this.spus = spus; - return this; - } - - public Integer getCount() { - return count; - } - - public ProductSpuPageBO setCount(Integer count) { - this.count = count; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductAttrAddDTO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductAttrAddDTO.java index 1990facde..9a86e8a7d 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductAttrAddDTO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductAttrAddDTO.java @@ -1,10 +1,15 @@ package cn.iocoder.mall.product.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotEmpty; /** * Product 规格添加 DTO */ +@Data +@Accessors(chain = true) public class ProductAttrAddDTO { /** @@ -13,13 +18,4 @@ public class ProductAttrAddDTO { @NotEmpty(message = "规格名不能为空") private String name; - public String getName() { - return name; - } - - public ProductAttrAddDTO setName(String name) { - this.name = name; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductAttrPageDTO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductAttrPageDTO.java index 20319219d..ef27ada19 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductAttrPageDTO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductAttrPageDTO.java @@ -1,10 +1,15 @@ package cn.iocoder.mall.product.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotNull; /** * 商品规格分页 DTO */ +@Data +@Accessors(chain = true) public class ProductAttrPageDTO { private String name; @@ -14,31 +19,4 @@ public class ProductAttrPageDTO { @NotNull(message = "每页条数不能为空") private Integer pageSize; - public String getName() { - return name; - } - - public ProductAttrPageDTO setName(String name) { - this.name = name; - return this; - } - - public Integer getPageNo() { - return pageNo; - } - - public ProductAttrPageDTO setPageNo(Integer pageNo) { - this.pageNo = pageNo; - return this; - } - - public Integer getPageSize() { - return pageSize; - } - - public ProductAttrPageDTO setPageSize(Integer pageSize) { - this.pageSize = pageSize; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductAttrUpdateDTO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductAttrUpdateDTO.java index 70ed8c3ef..70eca60ba 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductAttrUpdateDTO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductAttrUpdateDTO.java @@ -1,11 +1,16 @@ package cn.iocoder.mall.product.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; /** * Product 规格修改 DTO */ +@Data +@Accessors(chain = true) public class ProductAttrUpdateDTO { /** @@ -19,22 +24,5 @@ public class ProductAttrUpdateDTO { @NotEmpty(message = "规格名不能为空") private String name; - public String getName() { - return name; - } - public ProductAttrUpdateDTO setName(String name) { - this.name = name; - return this; - } - - public Integer getId() { - return id; - } - - public ProductAttrUpdateDTO setId(Integer id) { - this.id = id; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductAttrValueAddDTO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductAttrValueAddDTO.java index 1d11c4f18..630aa20b1 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductAttrValueAddDTO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductAttrValueAddDTO.java @@ -1,11 +1,16 @@ package cn.iocoder.mall.product.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; /** * Product 规格值添加 DTO */ +@Data +@Accessors(chain = true) public class ProductAttrValueAddDTO { /** @@ -19,22 +24,4 @@ public class ProductAttrValueAddDTO { @NotEmpty(message = "规格值名不能为空") private String name; - public Integer getAttrId() { - return attrId; - } - - public ProductAttrValueAddDTO setAttrId(Integer attrId) { - this.attrId = attrId; - return this; - } - - public String getName() { - return name; - } - - public ProductAttrValueAddDTO setName(String name) { - this.name = name; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductAttrValueUpdateDTO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductAttrValueUpdateDTO.java index 633d9f905..aef865ee3 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductAttrValueUpdateDTO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductAttrValueUpdateDTO.java @@ -1,5 +1,8 @@ package cn.iocoder.mall.product.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; @@ -8,6 +11,8 @@ import javax.validation.constraints.NotNull; * * 注意，不允许修改所属规格 */ +@Data +@Accessors(chain = true) public class ProductAttrValueUpdateDTO { /** @@ -21,22 +26,4 @@ public class ProductAttrValueUpdateDTO { @NotEmpty(message = "规格名不能为空") private String name; - public String getName() { - return name; - } - - public ProductAttrValueUpdateDTO setName(String name) { - this.name = name; - return this; - } - - public Integer getId() { - return id; - } - - public ProductAttrValueUpdateDTO setId(Integer id) { - this.id = id; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductCategoryAddDTO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductCategoryAddDTO.java index 4b839944c..30eeeca5f 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductCategoryAddDTO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductCategoryAddDTO.java @@ -1,10 +1,15 @@ package cn.iocoder.mall.product.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotNull; /** * 商品分类添加 DTO */ +@Data +@Accessors(chain = true) public class ProductCategoryAddDTO { /** @@ -33,49 +38,4 @@ public class ProductCategoryAddDTO { @NotNull(message = "排序值不能为空") private Integer sort; - public Integer getPid() { - return pid; - } - - public ProductCategoryAddDTO setPid(Integer pid) { - this.pid = pid; - return this; - } - - public String getName() { - return name; - } - - public ProductCategoryAddDTO setName(String name) { - this.name = name; - return this; - } - - public String getDescription() { - return description; - } - - public ProductCategoryAddDTO setDescription(String description) { - this.description = description; - return this; - } - - public String getPicUrl() { - return picUrl; - } - - public ProductCategoryAddDTO setPicUrl(String picUrl) { - this.picUrl = picUrl; - return this; - } - - public Integer getSort() { - return sort; - } - - public ProductCategoryAddDTO setSort(Integer sort) { - this.sort = sort; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductCategoryUpdateDTO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductCategoryUpdateDTO.java index ed9737310..0f6e28d60 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductCategoryUpdateDTO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductCategoryUpdateDTO.java @@ -1,10 +1,15 @@ package cn.iocoder.mall.product.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotNull; /** * 商品分类更新 DTO */ +@Data +@Accessors(chain = true) public class ProductCategoryUpdateDTO { /** @@ -38,57 +43,4 @@ public class ProductCategoryUpdateDTO { @NotNull(message = "排序值不能为空") private Integer sort; - public Integer getPid() { - return pid; - } - - public ProductCategoryUpdateDTO setPid(Integer pid) { - this.pid = pid; - return this; - } - - public String getName() { - return name; - } - - public ProductCategoryUpdateDTO setName(String name) { - this.name = name; - return this; - } - - public String getDescription() { - return description; - } - - public ProductCategoryUpdateDTO setDescription(String description) { - this.description = description; - return this; - } - - public String getPicUrl() { - return picUrl; - } - - public ProductCategoryUpdateDTO setPicUrl(String picUrl) { - this.picUrl = picUrl; - return this; - } - - public Integer getSort() { - return sort; - } - - public ProductCategoryUpdateDTO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public Integer getId() { - return id; - } - - public ProductCategoryUpdateDTO setId(Integer id) { - this.id = id; - return this; - } -} \ No newline at end of file +} diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductSkuAddOrUpdateDTO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductSkuAddOrUpdateDTO.java index 3c6bbffc8..a39a1f9b6 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductSkuAddOrUpdateDTO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductSkuAddOrUpdateDTO.java @@ -1,5 +1,8 @@ package cn.iocoder.mall.product.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; import java.util.List; @@ -7,6 +10,8 @@ import java.util.List; /** * 商品 Sku 添加 DTO */ +@Data +@Accessors(chain = true) public class ProductSkuAddOrUpdateDTO { /** @@ -27,31 +32,4 @@ public class ProductSkuAddOrUpdateDTO { @Min(value = 1L, message = "最小库存为 1") private Integer quantity; - public List getAttrs() { - return attrs; - } - - public ProductSkuAddOrUpdateDTO setAttrs(List attrs) { - this.attrs = attrs; - return this; - } - - public Integer getPrice() { - return price; - } - - public ProductSkuAddOrUpdateDTO setPrice(Integer price) { - this.price = price; - return this; - } - - public Integer getQuantity() { - return quantity; - } - - public ProductSkuAddOrUpdateDTO setQuantity(Integer quantity) { - this.quantity = quantity; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductSpuAddDTO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductSpuAddDTO.java index 86c650db1..b2150b25e 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductSpuAddDTO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductSpuAddDTO.java @@ -1,5 +1,8 @@ package cn.iocoder.mall.product.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.util.List; @@ -7,6 +10,8 @@ import java.util.List; /** * 商品 SPU + SKU 添加 DTO */ +@Data +@Accessors(chain = true) public class ProductSpuAddDTO { // ========== 基本信息 ========= @@ -54,67 +59,4 @@ public class ProductSpuAddDTO { @NotNull(message = "SKU 不能为空") private List skus; - public String getName() { - return name; - } - - public ProductSpuAddDTO setName(String name) { - this.name = name; - return this; - } - - public String getSellPoint() { - return sellPoint; - } - - public ProductSpuAddDTO setSellPoint(String sellPoint) { - this.sellPoint = sellPoint; - return this; - } - - public String getDescription() { - return description; - } - - public ProductSpuAddDTO setDescription(String description) { - this.description = description; - return this; - } - - public Integer getCid() { - return cid; - } - - public ProductSpuAddDTO setCid(Integer cid) { - this.cid = cid; - return this; - } - - public List getPicUrls() { - return picUrls; - } - - public ProductSpuAddDTO setPicUrls(List picUrls) { - this.picUrls = picUrls; - return this; - } - - public Boolean getVisible() { - return visible; - } - - public ProductSpuAddDTO setVisible(Boolean visible) { - this.visible = visible; - return this; - } - - public List getSkus() { - return skus; - } - - public ProductSpuAddDTO setSkus(List skus) { - this.skus = skus; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductSpuPageDTO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductSpuPageDTO.java index a218e56b5..604841b2d 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductSpuPageDTO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductSpuPageDTO.java @@ -1,10 +1,15 @@ package cn.iocoder.mall.product.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotNull; /** * 商品 Spu 分页 DTO */ +@Data +@Accessors(chain = true) public class ProductSpuPageDTO { /** @@ -27,49 +32,4 @@ public class ProductSpuPageDTO { @NotNull(message = "每页条数不能为空") private Integer pageSize; - public String getName() { - return name; - } - - public ProductSpuPageDTO setName(String name) { - this.name = name; - return this; - } - - public Integer getPageNo() { - return pageNo; - } - - public ProductSpuPageDTO setPageNo(Integer pageNo) { - this.pageNo = pageNo; - return this; - } - - public Integer getPageSize() { - return pageSize; - } - - public ProductSpuPageDTO setPageSize(Integer pageSize) { - this.pageSize = pageSize; - return this; - } - - public Integer getCid() { - return cid; - } - - public ProductSpuPageDTO setCid(Integer cid) { - this.cid = cid; - return this; - } - - public Boolean getVisible() { - return visible; - } - - public ProductSpuPageDTO setVisible(Boolean visible) { - this.visible = visible; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductSpuUpdateDTO.java b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductSpuUpdateDTO.java index 7847ed61b..5b4753491 100644 --- a/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductSpuUpdateDTO.java +++ b/product/product-service-api/src/main/java/cn/iocoder/mall/product/api/dto/ProductSpuUpdateDTO.java @@ -1,5 +1,8 @@ package cn.iocoder.mall.product.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.util.List; @@ -7,6 +10,8 @@ import java.util.List; /** * 商品 SPU + SKU 更新 DTO */ +@Data +@Accessors(chain = true) public class ProductSpuUpdateDTO { /** @@ -60,75 +65,4 @@ public class ProductSpuUpdateDTO { @NotNull(message = "SKU 不能为空") private List skus; - public String getName() { - return name; - } - - public ProductSpuUpdateDTO setName(String name) { - this.name = name; - return this; - } - - public String getSellPoint() { - return sellPoint; - } - - public ProductSpuUpdateDTO setSellPoint(String sellPoint) { - this.sellPoint = sellPoint; - return this; - } - - public String getDescription() { - return description; - } - - public ProductSpuUpdateDTO setDescription(String description) { - this.description = description; - return this; - } - - public Integer getCid() { - return cid; - } - - public ProductSpuUpdateDTO setCid(Integer cid) { - this.cid = cid; - return this; - } - - public List getPicUrls() { - return picUrls; - } - - public ProductSpuUpdateDTO setPicUrls(List picUrls) { - this.picUrls = picUrls; - return this; - } - - public Boolean getVisible() { - return visible; - } - - public ProductSpuUpdateDTO setVisible(Boolean visible) { - this.visible = visible; - return this; - } - - public List getSkus() { - return skus; - } - - public ProductSpuUpdateDTO setSkus(List skus) { - this.skus = skus; - return this; - } - - public Integer getId() { - return id; - } - - public ProductSpuUpdateDTO setId(Integer id) { - this.id = id; - return this; - } -} \ No newline at end of file +} diff --git a/product/product-service-impl/pom.xml b/product/product-service-impl/pom.xml index 7195150a9..1855c5a9b 100644 --- a/product/product-service-impl/pom.xml +++ b/product/product-service-impl/pom.xml @@ -11,48 +11,35 @@ product-service-impl - - 1.3.0.Final - - - - com.alibaba - dubbo - 2.6.5 - compile - cn.iocoder.mall product-service-api 1.0-SNAPSHOT - compile mysql mysql-connector-java + + org.mybatis.spring.boot + mybatis-spring-boot-starter + + org.springframework.boot spring-boot-starter-jdbc - org.mybatis.spring.boot - mybatis-spring-boot-starter - 2.0.0 - - - org.mapstruct - mapstruct - ${org.mapstruct.version} + com.alibaba + dubbo com.google.guava guava - 27.0.1-jre @@ -63,20 +50,8 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - org.mapstruct - mapstruct-processor - ${org.mapstruct.version} - - - - \ No newline at end of file + diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductAttrDO.java b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductAttrDO.java index 4d42aa986..4499806bf 100644 --- a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductAttrDO.java +++ b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductAttrDO.java @@ -1,10 +1,14 @@ package cn.iocoder.mall.product.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * Product 规格 */ +@Data +@Accessors(chain = true) public class ProductAttrDO extends DeletableDO { /** @@ -23,31 +27,4 @@ public class ProductAttrDO extends DeletableDO { */ private Integer status; - public Integer getId() { - return id; - } - - public ProductAttrDO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public ProductAttrDO setName(String name) { - this.name = name; - return this; - } - - public Integer getStatus() { - return status; - } - - public ProductAttrDO setStatus(Integer status) { - this.status = status; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductAttrValueDO.java b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductAttrValueDO.java index ba9f0a747..ccfe7aa35 100644 --- a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductAttrValueDO.java +++ b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductAttrValueDO.java @@ -1,10 +1,14 @@ package cn.iocoder.mall.product.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * Product 规格值 */ +@Data +@Accessors(chain = true) public class ProductAttrValueDO extends DeletableDO { /** @@ -27,40 +31,4 @@ public class ProductAttrValueDO extends DeletableDO { */ private Integer status; - public Integer getId() { - return id; - } - - public ProductAttrValueDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getAttrId() { - return attrId; - } - - public ProductAttrValueDO setAttrId(Integer attrId) { - this.attrId = attrId; - return this; - } - - public String getName() { - return name; - } - - public ProductAttrValueDO setName(String name) { - this.name = name; - return this; - } - - public Integer getStatus() { - return status; - } - - public ProductAttrValueDO setStatus(Integer status) { - this.status = status; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductCategoryDO.java b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductCategoryDO.java index c31a53254..aa6489612 100644 --- a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductCategoryDO.java +++ b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductCategoryDO.java @@ -1,10 +1,14 @@ package cn.iocoder.mall.product.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * 商品分类 */ +@Data +@Accessors(chain = true) public class ProductCategoryDO extends DeletableDO { /** @@ -41,66 +45,4 @@ public class ProductCategoryDO extends DeletableDO { */ private Integer status; - public Integer getId() { - return id; - } - - public ProductCategoryDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getPid() { - return pid; - } - - public ProductCategoryDO setPid(Integer pid) { - this.pid = pid; - return this; - } - - public String getName() { - return name; - } - - public ProductCategoryDO setName(String name) { - this.name = name; - return this; - } - - public String getDescription() { - return description; - } - - public ProductCategoryDO setDescription(String description) { - this.description = description; - return this; - } - - public String getPicUrl() { - return picUrl; - } - - public ProductCategoryDO setPicUrl(String picUrl) { - this.picUrl = picUrl; - return this; - } - - public Integer getSort() { - return sort; - } - - public ProductCategoryDO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public Integer getStatus() { - return status; - } - - public ProductCategoryDO setStatus(Integer status) { - this.status = status; - return this; - } -} \ No newline at end of file +} diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductSkuDO.java b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductSkuDO.java index 60543167d..2edbb11e9 100644 --- a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductSkuDO.java +++ b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductSkuDO.java @@ -1,10 +1,14 @@ package cn.iocoder.mall.product.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * 商品 SKU */ +@Data +@Accessors(chain = true) public class ProductSkuDO extends DeletableDO { /** @@ -52,68 +56,4 @@ public class ProductSkuDO extends DeletableDO { // */ // private Integer soldNum; - - public Integer getId() { - return id; - } - - public ProductSkuDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getSpuId() { - return spuId; - } - - public ProductSkuDO setSpuId(Integer spuId) { - this.spuId = spuId; - return this; - } - - public Integer getStatus() { - return status; - } - - public ProductSkuDO setStatus(Integer status) { - this.status = status; - return this; - } - - public String getPicUrl() { - return picUrl; - } - - public ProductSkuDO setPicUrl(String picUrl) { - this.picUrl = picUrl; - return this; - } - - public String getAttrs() { - return attrs; - } - - public ProductSkuDO setAttrs(String attrs) { - this.attrs = attrs; - return this; - } - - public Integer getPrice() { - return price; - } - - public ProductSkuDO setPrice(Integer price) { - this.price = price; - return this; - } - - public Integer getQuantity() { - return quantity; - } - - public ProductSkuDO setQuantity(Integer quantity) { - this.quantity = quantity; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductSpuDO.java b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductSpuDO.java index 073e6168d..25fa9774c 100644 --- a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductSpuDO.java +++ b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductSpuDO.java @@ -1,10 +1,14 @@ package cn.iocoder.mall.product.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * 商品 SPU */ +@Data +@Accessors(chain = true) public class ProductSpuDO extends DeletableDO { /** @@ -69,94 +73,4 @@ public class ProductSpuDO extends DeletableDO { */ private Integer quantity; - public Integer getId() { - return id; - } - - public ProductSpuDO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public ProductSpuDO setName(String name) { - this.name = name; - return this; - } - - public String getSellPoint() { - return sellPoint; - } - - public ProductSpuDO setSellPoint(String sellPoint) { - this.sellPoint = sellPoint; - return this; - } - - public String getDescription() { - return description; - } - - public ProductSpuDO setDescription(String description) { - this.description = description; - return this; - } - - public Integer getCid() { - return cid; - } - - public ProductSpuDO setCid(Integer cid) { - this.cid = cid; - return this; - } - - public String getPicUrls() { - return picUrls; - } - - public ProductSpuDO setPicUrls(String picUrls) { - this.picUrls = picUrls; - return this; - } - - public Boolean getVisible() { - return visible; - } - - public ProductSpuDO setVisible(Boolean visible) { - this.visible = visible; - return this; - } - - public Integer getSort() { - return sort; - } - - public ProductSpuDO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public Integer getPrice() { - return price; - } - - public ProductSpuDO setPrice(Integer price) { - this.price = price; - return this; - } - - public Integer getQuantity() { - return quantity; - } - - public ProductSpuDO setQuantity(Integer quantity) { - this.quantity = quantity; - return this; - } - -} \ No newline at end of file +} diff --git a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductStockDO.java b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductStockDO.java index 21043fcaa..8bc60d659 100644 --- a/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductStockDO.java +++ b/product/product-service-impl/src/main/java/cn/iocoder/mall/product/dataobject/ProductStockDO.java @@ -1,11 +1,16 @@ package cn.iocoder.mall.product.dataobject; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; /** * Product 库存 */ @Deprecated // TODO 芋艿，咱暂时不加库存表和库存服务 +@Data +@Accessors(chain = true) public class ProductStockDO { /** @@ -36,4 +41,4 @@ public class ProductStockDO { */ private Integer status; -} \ No newline at end of file +} diff --git a/promotion/promotion-application/pom.xml b/promotion/promotion-application/pom.xml index e633ae714..1aa044d42 100644 --- a/promotion/promotion-application/pom.xml +++ b/promotion/promotion-application/pom.xml @@ -11,11 +11,6 @@ promotion-application - - 1.3.0.Final - 1.16.14 - - cn.iocoder.mall @@ -34,63 +29,15 @@ 1.0-SNAPSHOT - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-test - test - - - - com.alibaba - dubbo - 2.6.5 - - - - com.alibaba.boot - dubbo-spring-boot-starter - 0.2.1.RELEASE - - - - org.apache.curator - curator-framework - 2.12.0 - - - - org.mapstruct - mapstruct - ${org.mapstruct.version} - - - - io.springfox - springfox-swagger2 - 2.9.2 - - - io.springfox - springfox-swagger-ui - 2.9.2 - - cn.iocoder.mall user-service-api 1.0-SNAPSHOT - compile cn.iocoder.mall user-sdk 1.0-SNAPSHOT - compile @@ -100,20 +47,36 @@ - org.mapstruct - mapstruct - ${org.mapstruct.version} + org.springframework.boot + spring-boot-starter-web - org.mapstruct - mapstruct-jdk8 - ${org.mapstruct.version} + org.springframework.boot + spring-boot-starter-test + test - org.projectlombok - lombok - ${org.projectlombok.version} + com.alibaba + dubbo + + + com.alibaba.boot + dubbo-spring-boot-starter + + + + org.apache.curator + curator-framework + + + + io.springfox + springfox-swagger2 + + + io.springfox + springfox-swagger-ui @@ -124,23 +87,6 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 - - 1.8 - 1.8 - - - org.mapstruct - mapstruct-processor - ${org.mapstruct.version} - - - org.projectlombok - lombok - ${org.projectlombok.version} - - - diff --git a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/admins/AdminsBannerPageVO.java b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/admins/AdminsBannerPageVO.java index 7f5595e7f..94711cfd1 100644 --- a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/admins/AdminsBannerPageVO.java +++ b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/admins/AdminsBannerPageVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.promotion.application.vo.admins; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.List; @ApiModel("Banner 分页 VO") +@Data +@Accessors(chain = true) public class AdminsBannerPageVO { @ApiModelProperty(value = "Banner 数组") @@ -13,22 +17,4 @@ public class AdminsBannerPageVO { @ApiModelProperty(value = "Banner 总数") private Integer total; - public List getList() { - return list; - } - - public AdminsBannerPageVO setList(List list) { - this.list = list; - return this; - } - - public Integer getTotal() { - return total; - } - - public AdminsBannerPageVO setTotal(Integer total) { - this.total = total; - return this; - } - -} \ No newline at end of file +} diff --git a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/admins/AdminsCouponTemplatePageVO.java b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/admins/AdminsCouponTemplatePageVO.java index 4d6568b78..89495b1f7 100644 --- a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/admins/AdminsCouponTemplatePageVO.java +++ b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/admins/AdminsCouponTemplatePageVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.promotion.application.vo.admins; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.List; @ApiModel("优惠劵（码）分页 VO") +@Data +@Accessors(chain = true) public class AdminsCouponTemplatePageVO { @ApiModelProperty(value = "优惠劵（码）数组") @@ -13,22 +17,4 @@ public class AdminsCouponTemplatePageVO { @ApiModelProperty(value = "优惠劵（码）总数") private Integer total; - public List getList() { - return list; - } - - public AdminsCouponTemplatePageVO setList(List list) { - this.list = list; - return this; - } - - public Integer getTotal() { - return total; - } - - public AdminsCouponTemplatePageVO setTotal(Integer total) { - this.total = total; - return this; - } - } diff --git a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/admins/AdminsCouponTemplateVO.java b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/admins/AdminsCouponTemplateVO.java index 34e98d5cc..e956506cd 100644 --- a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/admins/AdminsCouponTemplateVO.java +++ b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/admins/AdminsCouponTemplateVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.promotion.application.vo.admins; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; @ApiModel("CouponTemplate VO") +@Data +@Accessors(chain = true) public class AdminsCouponTemplateVO { // ========== 基本信息 BEGIN ========== @@ -73,201 +77,4 @@ public class AdminsCouponTemplateVO { @ApiModelProperty(value = "折扣上限", required = true) private Date createTime; - public Integer getId() { - return id; - } - - public AdminsCouponTemplateVO setId(Integer id) { - this.id = id; - return this; - } - - public String getTitle() { - return title; - } - - public AdminsCouponTemplateVO setTitle(String title) { - this.title = title; - return this; - } - - public String getDescription() { - return description; - } - - public AdminsCouponTemplateVO setDescription(String description) { - this.description = description; - return this; - } - - public Integer getType() { - return type; - } - - public AdminsCouponTemplateVO setType(Integer type) { - this.type = type; - return this; - } - - public Integer getCodeType() { - return codeType; - } - - public AdminsCouponTemplateVO setCodeType(Integer codeType) { - this.codeType = codeType; - return this; - } - - public Integer getStatus() { - return status; - } - - public AdminsCouponTemplateVO setStatus(Integer status) { - this.status = status; - return this; - } - - public Integer getQuota() { - return quota; - } - - public AdminsCouponTemplateVO setQuota(Integer quota) { - this.quota = quota; - return this; - } - - public Integer getPriceAvailable() { - return priceAvailable; - } - - public AdminsCouponTemplateVO setPriceAvailable(Integer priceAvailable) { - this.priceAvailable = priceAvailable; - return this; - } - - public Integer getRangeType() { - return rangeType; - } - - public AdminsCouponTemplateVO setRangeType(Integer rangeType) { - this.rangeType = rangeType; - return this; - } - - public String getRangeValues() { - return rangeValues; - } - - public AdminsCouponTemplateVO setRangeValues(String rangeValues) { - this.rangeValues = rangeValues; - return this; - } - - public Integer getDateType() { - return dateType; - } - - public AdminsCouponTemplateVO setDateType(Integer dateType) { - this.dateType = dateType; - return this; - } - - public Date getValidStartTime() { - return validStartTime; - } - - public AdminsCouponTemplateVO setValidStartTime(Date validStartTime) { - this.validStartTime = validStartTime; - return this; - } - - public Date getValidEndTime() { - return validEndTime; - } - - public AdminsCouponTemplateVO setValidEndTime(Date validEndTime) { - this.validEndTime = validEndTime; - return this; - } - - public Integer getFixedStartTerm() { - return fixedStartTerm; - } - - public AdminsCouponTemplateVO setFixedStartTerm(Integer fixedStartTerm) { - this.fixedStartTerm = fixedStartTerm; - return this; - } - - public Integer getFixedEndTerm() { - return fixedEndTerm; - } - - public AdminsCouponTemplateVO setFixedEndTerm(Integer fixedEndTerm) { - this.fixedEndTerm = fixedEndTerm; - return this; - } - - public Integer getPreferentialType() { - return preferentialType; - } - - public AdminsCouponTemplateVO setPreferentialType(Integer preferentialType) { - this.preferentialType = preferentialType; - return this; - } - - public Integer getPercentOff() { - return percentOff; - } - - public AdminsCouponTemplateVO setPercentOff(Integer percentOff) { - this.percentOff = percentOff; - return this; - } - - public Integer getPriceOff() { - return priceOff; - } - - public AdminsCouponTemplateVO setPriceOff(Integer priceOff) { - this.priceOff = priceOff; - return this; - } - - public Integer getDiscountPriceLimit() { - return discountPriceLimit; - } - - public AdminsCouponTemplateVO setDiscountPriceLimit(Integer discountPriceLimit) { - this.discountPriceLimit = discountPriceLimit; - return this; - } - - public Integer getStatFetchNum() { - return statFetchNum; - } - - public AdminsCouponTemplateVO setStatFetchNum(Integer statFetchNum) { - this.statFetchNum = statFetchNum; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public AdminsCouponTemplateVO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - - public Integer getTotal() { - return total; - } - - public AdminsCouponTemplateVO setTotal(Integer total) { - this.total = total; - return this; - } } diff --git a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/admins/AdminsProductRecommendPageVO.java b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/admins/AdminsProductRecommendPageVO.java index e774b8429..278c512eb 100644 --- a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/admins/AdminsProductRecommendPageVO.java +++ b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/admins/AdminsProductRecommendPageVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.promotion.application.vo.admins; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.List; @ApiModel("商品推荐分页 VO") +@Data +@Accessors(chain = true) public class AdminsProductRecommendPageVO { @ApiModelProperty(value = "商品推荐数组") @@ -13,22 +17,4 @@ public class AdminsProductRecommendPageVO { @ApiModelProperty(value = "商品推荐总数") private Integer total; - public List getList() { - return list; - } - - public AdminsProductRecommendPageVO setList(List list) { - this.list = list; - return this; - } - - public Integer getTotal() { - return total; - } - - public AdminsProductRecommendPageVO setTotal(Integer total) { - this.total = total; - return this; - } - -} \ No newline at end of file +} diff --git a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/admins/AdminsProductRecommendVO.java b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/admins/AdminsProductRecommendVO.java index d95a6051a..13e1b5516 100644 --- a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/admins/AdminsProductRecommendVO.java +++ b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/admins/AdminsProductRecommendVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.promotion.application.vo.admins; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; @ApiModel("商品推荐 VO") +@Data +@Accessors(chain = true) public class AdminsProductRecommendVO { @ApiModelProperty(value = "编号", required = true, example = "1") @@ -23,66 +27,4 @@ public class AdminsProductRecommendVO { @ApiModelProperty(value = "创建时间", required = true, example = "时间戳格式") private Date createTime; - public Integer getId() { - return id; - } - - public AdminsProductRecommendVO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getType() { - return type; - } - - public AdminsProductRecommendVO setType(Integer type) { - this.type = type; - return this; - } - - public Integer getProductSpuId() { - return productSpuId; - } - - public AdminsProductRecommendVO setProductSpuId(Integer productSpuId) { - this.productSpuId = productSpuId; - return this; - } - - public Integer getSort() { - return sort; - } - - public AdminsProductRecommendVO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public Integer getStatus() { - return status; - } - - public AdminsProductRecommendVO setStatus(Integer status) { - this.status = status; - return this; - } - - public String getMemo() { - return memo; - } - - public AdminsProductRecommendVO setMemo(String memo) { - this.memo = memo; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public AdminsProductRecommendVO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } -} \ No newline at end of file +} diff --git a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/users/UsersProductRecommendVO.java b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/users/UsersProductRecommendVO.java index d4fadd729..351b6f4a1 100644 --- a/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/users/UsersProductRecommendVO.java +++ b/promotion/promotion-application/src/main/java/cn/iocoder/mall/promotion/application/vo/users/UsersProductRecommendVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.promotion.application.vo.users; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.List; @ApiModel(value = "商品推荐 VO", description = "不包括 SKU 信息 VO") +@Data +@Accessors(chain = true) public class UsersProductRecommendVO { @ApiModelProperty(value = "商品 SPU 编号", required = true, example = "1") @@ -27,49 +31,4 @@ public class UsersProductRecommendVO { */ private Integer price; - public Integer getId() { - return id; - } - - public UsersProductRecommendVO setId(Integer id) { - this.id = id; - return this; - } - - public String getName() { - return name; - } - - public UsersProductRecommendVO setName(String name) { - this.name = name; - return this; - } - - public String getSellPoint() { - return sellPoint; - } - - public UsersProductRecommendVO setSellPoint(String sellPoint) { - this.sellPoint = sellPoint; - return this; - } - - public List getPicUrls() { - return picUrls; - } - - public UsersProductRecommendVO setPicUrls(List picUrls) { - this.picUrls = picUrls; - return this; - } - - public Integer getPrice() { - return price; - } - - public UsersProductRecommendVO setPrice(Integer price) { - this.price = price; - return this; - } - -} \ No newline at end of file +} diff --git a/promotion/promotion-service-api/pom.xml b/promotion/promotion-service-api/pom.xml index c49c39763..2aae54544 100644 --- a/promotion/promotion-service-api/pom.xml +++ b/promotion/promotion-service-api/pom.xml @@ -11,38 +11,29 @@ promotion-service-api - - 1.3.0.Final - 1.16.14 - - - - javax.validation - validation-api - cn.iocoder.mall common-framework 1.0-SNAPSHOT - compile + + + + javax.validation + validation-api org.mapstruct mapstruct - ${org.mapstruct.version} org.mapstruct mapstruct-jdk8 - ${org.mapstruct.version} - org.projectlombok lombok - ${org.projectlombok.version} @@ -52,23 +43,6 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 - - 1.8 - 1.8 - - - org.mapstruct - mapstruct-processor - ${org.mapstruct.version} - - - org.projectlombok - lombok - ${org.projectlombok.version} - - - diff --git a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/BannerPageBO.java b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/BannerPageBO.java index 940f27dfa..1d7bcb343 100644 --- a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/BannerPageBO.java +++ b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/BannerPageBO.java @@ -1,7 +1,15 @@ package cn.iocoder.mall.promotion.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.List; +/** + * Banner 分页 BO + */ +@Data +@Accessors(chain = true) public class BannerPageBO { /** @@ -13,22 +21,4 @@ public class BannerPageBO { */ private Integer total; - public List getList() { - return list; - } - - public BannerPageBO setList(List list) { - this.list = list; - return this; - } - - public Integer getTotal() { - return total; - } - - public BannerPageBO setTotal(Integer total) { - this.total = total; - return this; - } - -} \ No newline at end of file +} diff --git a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/CouponCardBO.java b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/CouponCardBO.java index 4239b9aa7..30182fa94 100644 --- a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/CouponCardBO.java +++ b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/CouponCardBO.java @@ -1,4 +1,12 @@ package cn.iocoder.mall.promotion.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 优惠劵 BO + */ +@Data +@Accessors(chain = true) public class CouponCardBO { } diff --git a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/CouponTemplateBO.java b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/CouponTemplateBO.java index 9aa54d853..229b5883c 100644 --- a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/CouponTemplateBO.java +++ b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/CouponTemplateBO.java @@ -1,7 +1,15 @@ package cn.iocoder.mall.promotion.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; +/** + * 优惠劵（码）模板 BO + */ +@Data +@Accessors(chain = true) public class CouponTemplateBO { // ========== 基本信息 BEGIN ========== @@ -143,202 +151,4 @@ public class CouponTemplateBO { */ private Date createTime; - public Integer getId() { - return id; - } - - public CouponTemplateBO setId(Integer id) { - this.id = id; - return this; - } - - public String getTitle() { - return title; - } - - public CouponTemplateBO setTitle(String title) { - this.title = title; - return this; - } - - public String getDescription() { - return description; - } - - public CouponTemplateBO setDescription(String description) { - this.description = description; - return this; - } - - public Integer getType() { - return type; - } - - public CouponTemplateBO setType(Integer type) { - this.type = type; - return this; - } - - public Integer getCodeType() { - return codeType; - } - - public CouponTemplateBO setCodeType(Integer codeType) { - this.codeType = codeType; - return this; - } - - public Integer getStatus() { - return status; - } - - public CouponTemplateBO setStatus(Integer status) { - this.status = status; - return this; - } - - public Integer getQuota() { - return quota; - } - - public CouponTemplateBO setQuota(Integer quota) { - this.quota = quota; - return this; - } - - public Integer getTotal() { - return total; - } - - public CouponTemplateBO setTotal(Integer total) { - this.total = total; - return this; - } - - public Integer getPriceAvailable() { - return priceAvailable; - } - - public CouponTemplateBO setPriceAvailable(Integer priceAvailable) { - this.priceAvailable = priceAvailable; - return this; - } - - public Integer getRangeType() { - return rangeType; - } - - public CouponTemplateBO setRangeType(Integer rangeType) { - this.rangeType = rangeType; - return this; - } - - public String getRangeValues() { - return rangeValues; - } - - public CouponTemplateBO setRangeValues(String rangeValues) { - this.rangeValues = rangeValues; - return this; - } - - public Integer getDateType() { - return dateType; - } - - public CouponTemplateBO setDateType(Integer dateType) { - this.dateType = dateType; - return this; - } - - public Date getValidStartTime() { - return validStartTime; - } - - public CouponTemplateBO setValidStartTime(Date validStartTime) { - this.validStartTime = validStartTime; - return this; - } - - public Date getValidEndTime() { - return validEndTime; - } - - public CouponTemplateBO setValidEndTime(Date validEndTime) { - this.validEndTime = validEndTime; - return this; - } - - public Integer getPreferentialType() { - return preferentialType; - } - - public CouponTemplateBO setPreferentialType(Integer preferentialType) { - this.preferentialType = preferentialType; - return this; - } - - public Integer getPercentOff() { - return percentOff; - } - - public CouponTemplateBO setPercentOff(Integer percentOff) { - this.percentOff = percentOff; - return this; - } - - public Integer getPriceOff() { - return priceOff; - } - - public CouponTemplateBO setPriceOff(Integer priceOff) { - this.priceOff = priceOff; - return this; - } - - public Integer getDiscountPriceLimit() { - return discountPriceLimit; - } - - public CouponTemplateBO setDiscountPriceLimit(Integer discountPriceLimit) { - this.discountPriceLimit = discountPriceLimit; - return this; - } - - public Integer getStatFetchNum() { - return statFetchNum; - } - - public CouponTemplateBO setStatFetchNum(Integer statFetchNum) { - this.statFetchNum = statFetchNum; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public CouponTemplateBO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - - public Integer getFixedStartTerm() { - return fixedStartTerm; - } - - public CouponTemplateBO setFixedStartTerm(Integer fixedStartTerm) { - this.fixedStartTerm = fixedStartTerm; - return this; - } - - public Integer getFixedEndTerm() { - return fixedEndTerm; - } - - public CouponTemplateBO setFixedEndTerm(Integer fixedEndTerm) { - this.fixedEndTerm = fixedEndTerm; - return this; - } - } diff --git a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/CouponTemplatePageBO.java b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/CouponTemplatePageBO.java index 454d9cea2..dc1a2f819 100644 --- a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/CouponTemplatePageBO.java +++ b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/CouponTemplatePageBO.java @@ -1,7 +1,15 @@ package cn.iocoder.mall.promotion.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.List; +/** + * 优惠劵（码）模板分页 BO + */ +@Data +@Accessors(chain = true) public class CouponTemplatePageBO { /** @@ -13,21 +21,4 @@ public class CouponTemplatePageBO { */ private Integer total; - public CouponTemplatePageBO setList(List list) { - this.list = list; - return this; - } - - public CouponTemplatePageBO setTotal(Integer total) { - this.total = total; - return this; - } - - public List getList() { - return list; - } - - public Integer getTotal() { - return total; - } } diff --git a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/ProductRecommendBO.java b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/ProductRecommendBO.java index 0834296e6..0e57ec6b4 100644 --- a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/ProductRecommendBO.java +++ b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/ProductRecommendBO.java @@ -1,12 +1,16 @@ package cn.iocoder.mall.promotion.api.bo; import cn.iocoder.mall.promotion.api.constant.ProductRecommendTypeEnum; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; /** * 商品推荐 BO */ +@Data +@Accessors(chain = true) public class ProductRecommendBO { /** @@ -42,67 +46,4 @@ public class ProductRecommendBO { */ private Date createTime; - public Integer getId() { - return id; - } - - public ProductRecommendBO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getType() { - return type; - } - - public ProductRecommendBO setType(Integer type) { - this.type = type; - return this; - } - - public Integer getProductSpuId() { - return productSpuId; - } - - public ProductRecommendBO setProductSpuId(Integer productSpuId) { - this.productSpuId = productSpuId; - return this; - } - - public Integer getSort() { - return sort; - } - - public ProductRecommendBO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public Integer getStatus() { - return status; - } - - public ProductRecommendBO setStatus(Integer status) { - this.status = status; - return this; - } - - public String getMemo() { - return memo; - } - - public ProductRecommendBO setMemo(String memo) { - this.memo = memo; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public ProductRecommendBO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - } diff --git a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/ProductRecommendPageBO.java b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/ProductRecommendPageBO.java index 30d36c5dc..f0221dd43 100644 --- a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/ProductRecommendPageBO.java +++ b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/bo/ProductRecommendPageBO.java @@ -1,7 +1,15 @@ package cn.iocoder.mall.promotion.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.List; +/** + * 商品推荐分页 BO + */ +@Data +@Accessors(chain = true) public class ProductRecommendPageBO { /** @@ -13,22 +21,4 @@ public class ProductRecommendPageBO { */ private Integer total; - public List getList() { - return list; - } - - public ProductRecommendPageBO setList(List list) { - this.list = list; - return this; - } - - public Integer getTotal() { - return total; - } - - public ProductRecommendPageBO setTotal(Integer total) { - this.total = total; - return this; - } - -} \ No newline at end of file +} diff --git a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/BannerAddDTO.java b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/BannerAddDTO.java index 8581e834a..573c34705 100644 --- a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/BannerAddDTO.java +++ b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/BannerAddDTO.java @@ -1,5 +1,7 @@ package cn.iocoder.mall.promotion.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.URL; @@ -9,6 +11,8 @@ import javax.validation.constraints.NotNull; /** * Banner 添加 DTO */ +@Data +@Accessors(chain = true) public class BannerAddDTO { @NotEmpty(message = "标题不能为空") @@ -27,48 +31,4 @@ public class BannerAddDTO { @Length(max = 255, message = "备注最大长度为 255 位") private String memo; - public String getTitle() { - return title; - } - - public BannerAddDTO setTitle(String title) { - this.title = title; - return this; - } - - public String getUrl() { - return url; - } - - public BannerAddDTO setUrl(String url) { - this.url = url; - return this; - } - - public Integer getSort() { - return sort; - } - - public BannerAddDTO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getMemo() { - return memo; - } - - public BannerAddDTO setMemo(String memo) { - this.memo = memo; - return this; - } - - public String getPicUrl() { - return picUrl; - } - - public BannerAddDTO setPicUrl(String picUrl) { - this.picUrl = picUrl; - return this; - } } diff --git a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/BannerPageDTO.java b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/BannerPageDTO.java index 6b65b4efc..49bf45abc 100644 --- a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/BannerPageDTO.java +++ b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/BannerPageDTO.java @@ -1,7 +1,15 @@ package cn.iocoder.mall.promotion.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotNull; +/** + * Banner 分页 DTO + */ +@Data +@Accessors(chain = true) public class BannerPageDTO { /** @@ -14,31 +22,4 @@ public class BannerPageDTO { @NotNull(message = "每页条数不能为空") private Integer pageSize; - public Integer getPageNo() { - return pageNo; - } - - public BannerPageDTO setPageNo(Integer pageNo) { - this.pageNo = pageNo; - return this; - } - - public Integer getPageSize() { - return pageSize; - } - - public BannerPageDTO setPageSize(Integer pageSize) { - this.pageSize = pageSize; - return this; - } - - public String getTitle() { - return title; - } - - public BannerPageDTO setTitle(String title) { - this.title = title; - return this; - } - -} \ No newline at end of file +} diff --git a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/BannerUpdateDTO.java b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/BannerUpdateDTO.java index a89a7728c..42fe8b467 100644 --- a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/BannerUpdateDTO.java +++ b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/BannerUpdateDTO.java @@ -1,5 +1,7 @@ package cn.iocoder.mall.promotion.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.URL; @@ -9,6 +11,8 @@ import javax.validation.constraints.NotNull; /** * Banner 更新 DTO */ +@Data +@Accessors(chain = true) public class BannerUpdateDTO { @NotNull(message = "编号不能为空") @@ -29,58 +33,4 @@ public class BannerUpdateDTO { @Length(max = 255, message = "备注最大长度为 255 位") private String memo; - public Integer getId() { - return id; - } - - public BannerUpdateDTO setId(Integer id) { - this.id = id; - return this; - } - - public String getTitle() { - return title; - } - - public BannerUpdateDTO setTitle(String title) { - this.title = title; - return this; - } - - public String getUrl() { - return url; - } - - public BannerUpdateDTO setUrl(String url) { - this.url = url; - return this; - } - - public Integer getSort() { - return sort; - } - - public BannerUpdateDTO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getMemo() { - return memo; - } - - public BannerUpdateDTO setMemo(String memo) { - this.memo = memo; - return this; - } - - public String getPicUrl() { - return picUrl; - } - - public BannerUpdateDTO setPicUrl(String picUrl) { - this.picUrl = picUrl; - return this; - } - -} \ No newline at end of file +} diff --git a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/CouponCardTemplateAddDTO.java b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/CouponCardTemplateAddDTO.java index 3414ab30b..8db1d56d6 100644 --- a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/CouponCardTemplateAddDTO.java +++ b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/CouponCardTemplateAddDTO.java @@ -4,6 +4,8 @@ import cn.iocoder.common.framework.validator.InEnum; import cn.iocoder.mall.promotion.api.constant.CouponTemplateDateTypeEnum; import cn.iocoder.mall.promotion.api.constant.CouponTemplatePreferentialTypeEnum; import cn.iocoder.mall.promotion.api.constant.CouponTemplateRangeTypeEnum; +import lombok.Data; +import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.Max; @@ -12,6 +14,11 @@ import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.util.Date; +/** + * 优惠劵模板添加 DTO + */ +@Data +@Accessors(chain = true) public class CouponCardTemplateAddDTO { // ========== 基本信息 BEGIN ========== @@ -132,149 +139,4 @@ public class CouponCardTemplateAddDTO { private Integer discountPriceLimit; // ========== 使用效果 END ========== - - public String getTitle() { - return title; - } - - public CouponCardTemplateAddDTO setTitle(String title) { - this.title = title; - return this; - } - - public String getDescription() { - return description; - } - - public CouponCardTemplateAddDTO setDescription(String description) { - this.description = description; - return this; - } - - public Integer getQuota() { - return quota; - } - - public CouponCardTemplateAddDTO setQuota(Integer quota) { - this.quota = quota; - return this; - } - - public Integer getPriceAvailable() { - return priceAvailable; - } - - public CouponCardTemplateAddDTO setPriceAvailable(Integer priceAvailable) { - this.priceAvailable = priceAvailable; - return this; - } - - public Integer getRangeType() { - return rangeType; - } - - public CouponCardTemplateAddDTO setRangeType(Integer rangeType) { - this.rangeType = rangeType; - return this; - } - - public String getRangeValues() { - return rangeValues; - } - - public CouponCardTemplateAddDTO setRangeValues(String rangeValues) { - this.rangeValues = rangeValues; - return this; - } - - public Integer getDateType() { - return dateType; - } - - public CouponCardTemplateAddDTO setDateType(Integer dateType) { - this.dateType = dateType; - return this; - } - - public Date getValidStartTime() { - return validStartTime; - } - - public CouponCardTemplateAddDTO setValidStartTime(Date validStartTime) { - this.validStartTime = validStartTime; - return this; - } - - public Date getValidEndTime() { - return validEndTime; - } - - public CouponCardTemplateAddDTO setValidEndTime(Date validEndTime) { - this.validEndTime = validEndTime; - return this; - } - - public Integer getFixedBeginTerm() { - return fixedBeginTerm; - } - - public CouponCardTemplateAddDTO setFixedBeginTerm(Integer fixedBeginTerm) { - this.fixedBeginTerm = fixedBeginTerm; - return this; - } - - public Integer getFixedEndTerm() { - return fixedEndTerm; - } - - public CouponCardTemplateAddDTO setFixedEndTerm(Integer fixedEndTerm) { - this.fixedEndTerm = fixedEndTerm; - return this; - } - - public Integer getPreferentialType() { - return preferentialType; - } - - public CouponCardTemplateAddDTO setPreferentialType(Integer preferentialType) { - this.preferentialType = preferentialType; - return this; - } - - public Integer getPercentOff() { - return percentOff; - } - - public CouponCardTemplateAddDTO setPercentOff(Integer percentOff) { - this.percentOff = percentOff; - return this; - } - - public Integer getPriceOff() { - return priceOff; - } - - public CouponCardTemplateAddDTO setPriceOff(Integer priceOff) { - this.priceOff = priceOff; - return this; - } - - public Integer getDiscountPriceLimit() { - return discountPriceLimit; - } - - public CouponCardTemplateAddDTO setDiscountPriceLimit(Integer discountPriceLimit) { - this.discountPriceLimit = discountPriceLimit; - return this; - } - - public Integer getTotal() { - return total; - } - - public CouponCardTemplateAddDTO setTotal(Integer total) { - this.total = total; - return this; - } - } diff --git a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/CouponCardTemplateUpdateDTO.java b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/CouponCardTemplateUpdateDTO.java index 948ad671d..024100ae3 100644 --- a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/CouponCardTemplateUpdateDTO.java +++ b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/CouponCardTemplateUpdateDTO.java @@ -2,15 +2,22 @@ package cn.iocoder.mall.promotion.api.dto; import cn.iocoder.common.framework.validator.InEnum; import cn.iocoder.mall.promotion.api.constant.CouponTemplateRangeTypeEnum; +import lombok.Data; +import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.Min; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +/** + * 优惠劵模板更新 DTO + */ +@Data +@Accessors(chain = true) public class CouponCardTemplateUpdateDTO { - @NotNull(message = "编号不能为空") + @NotNull(message = "编号不能为空") private Integer id; // ========== 基本信息 BEGIN ========== diff --git a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/CouponCodeTemplateAddDTO.java b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/CouponCodeTemplateAddDTO.java index 85a307243..f3c5a8b2a 100644 --- a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/CouponCodeTemplateAddDTO.java +++ b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/CouponCodeTemplateAddDTO.java @@ -1,4 +1,12 @@ package cn.iocoder.mall.promotion.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 优惠码模板添加 DTO + */ +@Data +@Accessors(chain = true) public class CouponCodeTemplateAddDTO { } diff --git a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/CouponCodeTemplateUpdateDTO.java b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/CouponCodeTemplateUpdateDTO.java index 8a88fb159..862bbc3f5 100644 --- a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/CouponCodeTemplateUpdateDTO.java +++ b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/CouponCodeTemplateUpdateDTO.java @@ -1,4 +1,12 @@ package cn.iocoder.mall.promotion.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 优惠码模板更新 DTO + */ +@Data +@Accessors(chain = true) public class CouponCodeTemplateUpdateDTO { } diff --git a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/CouponTemplatePageDTO.java b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/CouponTemplatePageDTO.java index d283eed37..245ac7884 100644 --- a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/CouponTemplatePageDTO.java +++ b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/CouponTemplatePageDTO.java @@ -1,10 +1,15 @@ package cn.iocoder.mall.promotion.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotNull; /** * 优惠劵模板分页 DTO */ +@Data +@Accessors(chain = true) public class CouponTemplatePageDTO { /** @@ -29,57 +34,4 @@ public class CouponTemplatePageDTO { @NotNull(message = "每页条数不能为空") private Integer pageSize; - public Integer getType() { - return type; - } - - public CouponTemplatePageDTO setType(Integer type) { - this.type = type; - return this; - } - - public String getTitle() { - return title; - } - - public CouponTemplatePageDTO setTitle(String title) { - this.title = title; - return this; - } - - public Integer getStatus() { - return status; - } - - public CouponTemplatePageDTO setStatus(Integer status) { - this.status = status; - return this; - } - - public Integer getPreferentialType() { - return preferentialType; - } - - public CouponTemplatePageDTO setPreferentialType(Integer preferentialType) { - this.preferentialType = preferentialType; - return this; - } - - public Integer getPageNo() { - return pageNo; - } - - public CouponTemplatePageDTO setPageNo(Integer pageNo) { - this.pageNo = pageNo; - return this; - } - - public Integer getPageSize() { - return pageSize; - } - - public CouponTemplatePageDTO setPageSize(Integer pageSize) { - this.pageSize = pageSize; - return this; - } } diff --git a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/ProductRecommendAddDTO.java b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/ProductRecommendAddDTO.java index af042b409..b1c95e632 100644 --- a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/ProductRecommendAddDTO.java +++ b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/ProductRecommendAddDTO.java @@ -1,5 +1,7 @@ package cn.iocoder.mall.promotion.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotNull; @@ -7,6 +9,8 @@ import javax.validation.constraints.NotNull; /** * 商品推荐添加 DTO */ +@Data +@Accessors(chain = true) public class ProductRecommendAddDTO { @NotNull(message = "推荐类型不能为空") @@ -18,40 +22,4 @@ public class ProductRecommendAddDTO { @Length(max = 255, message = "备注最大长度为 255 位") private String memo; - public Integer getType() { - return type; - } - - public ProductRecommendAddDTO setType(Integer type) { - this.type = type; - return this; - } - - public Integer getProductSpuId() { - return productSpuId; - } - - public ProductRecommendAddDTO setProductSpuId(Integer productSpuId) { - this.productSpuId = productSpuId; - return this; - } - - public Integer getSort() { - return sort; - } - - public ProductRecommendAddDTO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getMemo() { - return memo; - } - - public ProductRecommendAddDTO setMemo(String memo) { - this.memo = memo; - return this; - } - -} \ No newline at end of file +} diff --git a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/ProductRecommendPageDTO.java b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/ProductRecommendPageDTO.java index 21567327a..f61e1e100 100644 --- a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/ProductRecommendPageDTO.java +++ b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/ProductRecommendPageDTO.java @@ -1,7 +1,15 @@ package cn.iocoder.mall.promotion.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotNull; +/** + * 商品推荐分页 DTO + */ +@Data +@Accessors(chain = true) public class ProductRecommendPageDTO { /** @@ -14,31 +22,4 @@ public class ProductRecommendPageDTO { @NotNull(message = "每页条数不能为空") private Integer pageSize; - public Integer getPageNo() { - return pageNo; - } - - public ProductRecommendPageDTO setPageNo(Integer pageNo) { - this.pageNo = pageNo; - return this; - } - - public Integer getPageSize() { - return pageSize; - } - - public ProductRecommendPageDTO setPageSize(Integer pageSize) { - this.pageSize = pageSize; - return this; - } - - public Integer getType() { - return type; - } - - public ProductRecommendPageDTO setType(Integer type) { - this.type = type; - return this; - } - -} \ No newline at end of file +} diff --git a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/ProductRecommendUpdateDTO.java b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/ProductRecommendUpdateDTO.java index 779696686..305900360 100644 --- a/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/ProductRecommendUpdateDTO.java +++ b/promotion/promotion-service-api/src/main/java/cn/iocoder/mall/promotion/api/dto/ProductRecommendUpdateDTO.java @@ -1,5 +1,7 @@ package cn.iocoder.mall.promotion.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotNull; @@ -7,6 +9,8 @@ import javax.validation.constraints.NotNull; /** * 商品推荐更新 DTO */ +@Data +@Accessors(chain = true) public class ProductRecommendUpdateDTO { @NotNull(message = "编号不能为空") @@ -20,49 +24,4 @@ public class ProductRecommendUpdateDTO { @Length(max = 255, message = "备注最大长度为 255 位") private String memo; - public Integer getId() { - return id; - } - - public ProductRecommendUpdateDTO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getType() { - return type; - } - - public ProductRecommendUpdateDTO setType(Integer type) { - this.type = type; - return this; - } - - public Integer getProductSpuId() { - return productSpuId; - } - - public ProductRecommendUpdateDTO setProductSpuId(Integer productSpuId) { - this.productSpuId = productSpuId; - return this; - } - - public Integer getSort() { - return sort; - } - - public ProductRecommendUpdateDTO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public String getMemo() { - return memo; - } - - public ProductRecommendUpdateDTO setMemo(String memo) { - this.memo = memo; - return this; - } - -} \ No newline at end of file +} diff --git a/promotion/promotion-service-impl/pom.xml b/promotion/promotion-service-impl/pom.xml index ce002879a..ea0ca6110 100644 --- a/promotion/promotion-service-impl/pom.xml +++ b/promotion/promotion-service-impl/pom.xml @@ -11,12 +11,6 @@ promotion-service-impl - - - 1.3.0.Final - 1.16.14 - - cn.iocoder.mall @@ -27,17 +21,16 @@ cn.iocoder.mall admin-service-api 1.0-SNAPSHOT - compile + + cn.iocoder.mall + product-service-api + 1.0-SNAPSHOT + + com.alibaba dubbo - compile - - - com.google.guava - guava - 27.0.1-jre @@ -52,42 +45,21 @@ org.mybatis.spring.boot mybatis-spring-boot-starter - 2.0.0 - - - - org.mapstruct - mapstruct - ${org.mapstruct.version} - - - org.mapstruct - mapstruct-jdk8 - ${org.mapstruct.version} - - - - org.projectlombok - lombok - ${org.projectlombok.version} com.google.guava guava - 27.0.1-jre com.xuxueli xxl-job-core - 2.0.1 org.apache.rocketmq rocketmq-spring-boot-starter - 2.0.1 @@ -96,18 +68,7 @@ spring-boot-starter-test test - - cn.iocoder.mall - user-sdk - 1.0-SNAPSHOT - compile - - - cn.iocoder.mall - product-service-api - 1.0-SNAPSHOT - compile - + @@ -116,23 +77,6 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 - - 1.8 - 1.8 - - - org.mapstruct - mapstruct-processor - ${org.mapstruct.version} - - - org.projectlombok - lombok - ${org.projectlombok.version} - - - diff --git a/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/dataobject/CouponCardDO.java b/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/dataobject/CouponCardDO.java index ed966e707..5223c8d74 100644 --- a/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/dataobject/CouponCardDO.java +++ b/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/dataobject/CouponCardDO.java @@ -1,12 +1,16 @@ package cn.iocoder.mall.promotion.biz.dataobject; import cn.iocoder.common.framework.dataobject.BaseDO; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; /** * 优惠劵 DO */ +@Data +@Accessors(chain = true) public class CouponCardDO extends BaseDO { // ========== 基本信息 BEGIN ========== diff --git a/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/dataobject/CouponCodeDO.java b/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/dataobject/CouponCodeDO.java index b82e067be..a5a462186 100644 --- a/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/dataobject/CouponCodeDO.java +++ b/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/dataobject/CouponCodeDO.java @@ -1,12 +1,16 @@ package cn.iocoder.mall.promotion.biz.dataobject; import cn.iocoder.common.framework.dataobject.BaseDO; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; /** * 优惠码 */ +@Data +@Accessors(chain = true) public class CouponCodeDO extends BaseDO { /** @@ -34,57 +38,4 @@ public class CouponCodeDO extends BaseDO { */ private Integer couponId; - public Integer getId() { - return id; - } - - public CouponCodeDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getTemplateId() { - return templateId; - } - - public CouponCodeDO setTemplateId(Integer templateId) { - this.templateId = templateId; - return this; - } - - public Integer getCode() { - return code; - } - - public CouponCodeDO setCode(Integer code) { - this.code = code; - return this; - } - - public Date getTakeTime() { - return takeTime; - } - - public CouponCodeDO setTakeTime(Date takeTime) { - this.takeTime = takeTime; - return this; - } - - public Integer getUserId() { - return userId; - } - - public CouponCodeDO setUserId(Integer userId) { - this.userId = userId; - return this; - } - - public Integer getCouponId() { - return couponId; - } - - public CouponCodeDO setCouponId(Integer couponId) { - this.couponId = couponId; - return this; - } -} \ No newline at end of file +} diff --git a/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/dataobject/CouponTemplateDO.java b/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/dataobject/CouponTemplateDO.java index 4b2182200..e7cc00879 100644 --- a/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/dataobject/CouponTemplateDO.java +++ b/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/dataobject/CouponTemplateDO.java @@ -1,6 +1,8 @@ package cn.iocoder.mall.promotion.biz.dataobject; import cn.iocoder.common.framework.dataobject.BaseDO; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; @@ -9,6 +11,8 @@ import java.util.Date; * * 当用户领取时，会生成 {@link CouponCardDO} 优惠劵（码）。 */ +@Data +@Accessors(chain = true) public class CouponTemplateDO extends BaseDO { // ========== 基本信息 BEGIN ========== @@ -208,193 +212,4 @@ public class CouponTemplateDO extends BaseDO { // private Integer statUseNum; // ========== 统计信息 END ========== - - public Integer getId() { - return id; - } - - public CouponTemplateDO setId(Integer id) { - this.id = id; - return this; - } - - public String getTitle() { - return title; - } - - public CouponTemplateDO setTitle(String title) { - this.title = title; - return this; - } - - public String getDescription() { - return description; - } - - public CouponTemplateDO setDescription(String description) { - this.description = description; - return this; - } - - public Integer getType() { - return type; - } - - public CouponTemplateDO setType(Integer type) { - this.type = type; - return this; - } - - public Integer getCodeType() { - return codeType; - } - - public CouponTemplateDO setCodeType(Integer codeType) { - this.codeType = codeType; - return this; - } - - public Integer getStatus() { - return status; - } - - public CouponTemplateDO setStatus(Integer status) { - this.status = status; - return this; - } - - public Integer getQuota() { - return quota; - } - - public CouponTemplateDO setQuota(Integer quota) { - this.quota = quota; - return this; - } - - public Integer getTotal() { - return total; - } - - public CouponTemplateDO setTotal(Integer total) { - this.total = total; - return this; - } - - public Integer getPriceAvailable() { - return priceAvailable; - } - - public CouponTemplateDO setPriceAvailable(Integer priceAvailable) { - this.priceAvailable = priceAvailable; - return this; - } - - public Integer getRangeType() { - return rangeType; - } - - public CouponTemplateDO setRangeType(Integer rangeType) { - this.rangeType = rangeType; - return this; - } - - public String getRangeValues() { - return rangeValues; - } - - public CouponTemplateDO setRangeValues(String rangeValues) { - this.rangeValues = rangeValues; - return this; - } - - public Integer getDateType() { - return dateType; - } - - public CouponTemplateDO setDateType(Integer dateType) { - this.dateType = dateType; - return this; - } - - public Date getValidStartTime() { - return validStartTime; - } - - public CouponTemplateDO setValidStartTime(Date validStartTime) { - this.validStartTime = validStartTime; - return this; - } - - public Date getValidEndTime() { - return validEndTime; - } - - public CouponTemplateDO setValidEndTime(Date validEndTime) { - this.validEndTime = validEndTime; - return this; - } - - public Integer getFixedStartTerm() { - return fixedStartTerm; - } - - public CouponTemplateDO setFixedStartTerm(Integer fixedStartTerm) { - this.fixedStartTerm = fixedStartTerm; - return this; - } - - public Integer getFixedEndTerm() { - return fixedEndTerm; - } - - public CouponTemplateDO setFixedEndTerm(Integer fixedEndTerm) { - this.fixedEndTerm = fixedEndTerm; - return this; - } - - public Integer getPreferentialType() { - return preferentialType; - } - - public CouponTemplateDO setPreferentialType(Integer preferentialType) { - this.preferentialType = preferentialType; - return this; - } - - public Integer getPercentOff() { - return percentOff; - } - - public CouponTemplateDO setPercentOff(Integer percentOff) { - this.percentOff = percentOff; - return this; - } - - public Integer getPriceOff() { - return priceOff; - } - - public CouponTemplateDO setPriceOff(Integer priceOff) { - this.priceOff = priceOff; - return this; - } - - public Integer getDiscountPriceLimit() { - return discountPriceLimit; - } - - public CouponTemplateDO setDiscountPriceLimit(Integer discountPriceLimit) { - this.discountPriceLimit = discountPriceLimit; - return this; - } - - public Integer getStatFetchNum() { - return statFetchNum; - } - - public CouponTemplateDO setStatFetchNum(Integer statFetchNum) { - this.statFetchNum = statFetchNum; - return this; - } } diff --git a/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/dataobject/ProductRecommendDO.java b/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/dataobject/ProductRecommendDO.java index 601c2f388..8b245aa5a 100644 --- a/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/dataobject/ProductRecommendDO.java +++ b/promotion/promotion-service-impl/src/main/java/cn/iocoder/mall/promotion/biz/dataobject/ProductRecommendDO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.promotion.biz.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; import cn.iocoder.mall.promotion.api.constant.ProductRecommendTypeEnum; +import lombok.Data; +import lombok.experimental.Accessors; /** * 商品推荐 DO */ +@Data +@Accessors(chain = true) public class ProductRecommendDO extends DeletableDO { /** @@ -38,58 +42,4 @@ public class ProductRecommendDO extends DeletableDO { */ private String memo; - public Integer getId() { - return id; - } - - public ProductRecommendDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getType() { - return type; - } - - public ProductRecommendDO setType(Integer type) { - this.type = type; - return this; - } - - public Integer getProductSpuId() { - return productSpuId; - } - - public ProductRecommendDO setProductSpuId(Integer productSpuId) { - this.productSpuId = productSpuId; - return this; - } - - public Integer getSort() { - return sort; - } - - public ProductRecommendDO setSort(Integer sort) { - this.sort = sort; - return this; - } - - public Integer getStatus() { - return status; - } - - public ProductRecommendDO setStatus(Integer status) { - this.status = status; - return this; - } - - public String getMemo() { - return memo; - } - - public ProductRecommendDO setMemo(String memo) { - this.memo = memo; - return this; - } - } diff --git a/promotion/promotion-service-impl/target/generated-sources/annotations/cn/iocoder/mall/promotion/biz/convert/CouponTemplateConvertImpl.java b/promotion/promotion-service-impl/target/generated-sources/annotations/cn/iocoder/mall/promotion/biz/convert/CouponTemplateConvertImpl.java index 6cb89e9db..5bd1c7cc0 100644 --- a/promotion/promotion-service-impl/target/generated-sources/annotations/cn/iocoder/mall/promotion/biz/convert/CouponTemplateConvertImpl.java +++ b/promotion/promotion-service-impl/target/generated-sources/annotations/cn/iocoder/mall/promotion/biz/convert/CouponTemplateConvertImpl.java @@ -12,7 +12,7 @@ import javax.annotation.Generated; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2019-04-06T01:40:11+0800", + date = "2019-04-06T20:54:04+0800", comments = "version: 1.3.0.Final, compiler: javac, environment: Java 1.8.0_121 (Oracle Corporation)" ) public class CouponTemplateConvertImpl implements CouponTemplateConvert { @@ -121,14 +121,14 @@ public class CouponTemplateConvertImpl implements CouponTemplateConvert { couponTemplateBO.setDateType( template.getDateType() ); couponTemplateBO.setValidStartTime( template.getValidStartTime() ); couponTemplateBO.setValidEndTime( template.getValidEndTime() ); + couponTemplateBO.setFixedStartTerm( template.getFixedStartTerm() ); + couponTemplateBO.setFixedEndTerm( template.getFixedEndTerm() ); couponTemplateBO.setPreferentialType( template.getPreferentialType() ); couponTemplateBO.setPercentOff( template.getPercentOff() ); couponTemplateBO.setPriceOff( template.getPriceOff() ); couponTemplateBO.setDiscountPriceLimit( template.getDiscountPriceLimit() ); couponTemplateBO.setStatFetchNum( template.getStatFetchNum() ); couponTemplateBO.setCreateTime( template.getCreateTime() ); - couponTemplateBO.setFixedStartTerm( template.getFixedStartTerm() ); - couponTemplateBO.setFixedEndTerm( template.getFixedEndTerm() ); return couponTemplateBO; } diff --git a/user/user-application/pom.xml b/user/user-application/pom.xml index 625d36667..5ed01743a 100644 --- a/user/user-application/pom.xml +++ b/user/user-application/pom.xml @@ -26,13 +26,27 @@ user-service-impl 1.0-SNAPSHOT - + + cn.iocoder.mall + user-service-api + 1.0-SNAPSHOT + cn.iocoder.mall common-framework 1.0-SNAPSHOT + + cn.iocoder.mall + user-sdk + 1.0-SNAPSHOT + + + cn.iocoder.mall + admin-sdk + + org.springframework.boot spring-boot-starter-web @@ -47,62 +61,26 @@ com.alibaba dubbo - 2.6.5 - com.alibaba.boot dubbo-spring-boot-starter - 0.2.1.RELEASE org.apache.curator curator-framework - 2.12.0 - - - - org.mapstruct - mapstruct - ${org.mapstruct.version} io.springfox springfox-swagger2 - 2.9.2 io.springfox springfox-swagger-ui - 2.9.2 - - cn.iocoder.mall - user-service-api - 1.0-SNAPSHOT - compile - - - cn.iocoder.mall - user-sdk - 1.0-SNAPSHOT - compile - - - - cn.iocoder.mall - admin-sdk - 1.0-SNAPSHOT - - - - org.mapstruct - mapstruct - ${org.mapstruct.version} - @@ -112,30 +90,14 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - org.mapstruct - mapstruct-processor - ${org.mapstruct.version} - - - org.springframework.boot spring-boot-maven-plugin - - true - - - \ No newline at end of file + diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/po/UserAddressAddPO.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/po/UserAddressAddPO.java index bc31804ee..0109e6bb9 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/po/UserAddressAddPO.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/po/UserAddressAddPO.java @@ -2,6 +2,8 @@ package cn.iocoder.mall.user.application.po; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; @@ -14,6 +16,8 @@ import java.io.Serializable; * @time 2019-04-06 14:13 */ @ApiModel("用户地址") +@Data +@Accessors(chain = true) public class UserAddressAddPO implements Serializable { /** @@ -43,49 +47,4 @@ public class UserAddressAddPO implements Serializable { @Size(min = 10, max = 100, message = "地址在 10 ~ 100 字之间!") private String address; - @Override - public String toString() { - return "UserAddressAddPO{" + - "areaNo='" + areaNo + '\'' + - ", name='" + name + '\'' + - ", mobile='" + mobile + '\'' + - ", address='" + address + '\'' + - '}'; - } - - public String getAreaNo() { - return areaNo; - } - - public UserAddressAddPO setAreaNo(String areaNo) { - this.areaNo = areaNo; - return this; - } - - public String getName() { - return name; - } - - public UserAddressAddPO setName(String name) { - this.name = name; - return this; - } - - public String getMobile() { - return mobile; - } - - public UserAddressAddPO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getAddress() { - return address; - } - - public UserAddressAddPO setAddress(String address) { - this.address = address; - return this; - } } diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/po/UserAddressUpdatePO.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/po/UserAddressUpdatePO.java index 551607482..634f93a7b 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/po/UserAddressUpdatePO.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/po/UserAddressUpdatePO.java @@ -2,6 +2,8 @@ package cn.iocoder.mall.user.application.po; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; @@ -14,6 +16,8 @@ import java.io.Serializable; * @time 2019-04-06 14:13 */ @ApiModel("用户地址-更新") +@Data +@Accessors(chain = true) public class UserAddressUpdatePO implements Serializable { @@ -50,59 +54,4 @@ public class UserAddressUpdatePO implements Serializable { @Size(min = 10, max = 100, message = "地址在 10 ~ 100 字之间!") private String address; - @Override - public String toString() { - return "UserAddressUpdatePO{" + - "id=" + id + - ", areaNo='" + areaNo + '\'' + - ", name='" + name + '\'' + - ", mobile='" + mobile + '\'' + - ", address='" + address + '\'' + - '}'; - } - - public Integer getId() { - return id; - } - - public UserAddressUpdatePO setId(Integer id) { - this.id = id; - return this; - } - - public String getAreaNo() { - return areaNo; - } - - public UserAddressUpdatePO setAreaNo(String areaNo) { - this.areaNo = areaNo; - return this; - } - - public String getName() { - return name; - } - - public UserAddressUpdatePO setName(String name) { - this.name = name; - return this; - } - - public String getMobile() { - return mobile; - } - - public UserAddressUpdatePO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getAddress() { - return address; - } - - public UserAddressUpdatePO setAddress(String address) { - this.address = address; - return this; - } } diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/admins/AdminsUserPageVO.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/admins/AdminsUserPageVO.java index 07b0e57f7..0d0365304 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/admins/AdminsUserPageVO.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/admins/AdminsUserPageVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.user.application.vo.admins; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.List; @ApiModel("用户分页 VO") +@Data +@Accessors(chain = true) public class AdminsUserPageVO { @ApiModelProperty(value = "用户数组") @@ -13,22 +17,4 @@ public class AdminsUserPageVO { @ApiModelProperty(value = "用户总数") private Integer count; - public List getUsers() { - return users; - } - - public AdminsUserPageVO setUsers(List users) { - this.users = users; - return this; - } - - public Integer getCount() { - return count; - } - - public AdminsUserPageVO setCount(Integer count) { - this.count = count; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/admins/AdminsUserVO.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/admins/AdminsUserVO.java index f1f550790..04f1af62c 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/admins/AdminsUserVO.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/admins/AdminsUserVO.java @@ -2,10 +2,14 @@ package cn.iocoder.mall.user.application.vo.admins; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; @ApiModel("用户 VO") +@Data +@Accessors(chain = true) public class AdminsUserVO { @ApiModelProperty(value = "用户编号", required = true, example = "1") @@ -21,58 +25,4 @@ public class AdminsUserVO { @ApiModelProperty(value = "创建时间", required = true, example = "时间戳格式") private Date createTime; - public Integer getId() { - return id; - } - - public AdminsUserVO setId(Integer id) { - this.id = id; - return this; - } - - public String getMobile() { - return mobile; - } - - public AdminsUserVO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getNickname() { - return nickname; - } - - public AdminsUserVO setNickname(String nickname) { - this.nickname = nickname; - return this; - } - - public String getAvatar() { - return avatar; - } - - public AdminsUserVO setAvatar(String avatar) { - this.avatar = avatar; - return this; - } - - public Integer getStatus() { - return status; - } - - public AdminsUserVO setStatus(Integer status) { - this.status = status; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public AdminsUserVO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/MobileRegisterVO.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/MobileRegisterVO.java index fa5ba739f..04c8debff 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/MobileRegisterVO.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/MobileRegisterVO.java @@ -2,8 +2,12 @@ package cn.iocoder.mall.user.application.vo.users; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; @ApiModel("手机注册结果 VO") +@Data +@Accessors(chain = true) public class MobileRegisterVO { @ApiModelProperty(value = "访问令牌", required = true, example = "2e3d7635c15e47e997611707a237859f") @@ -13,31 +17,4 @@ public class MobileRegisterVO { @ApiModelProperty(value = "过期时间，单位：秒", required = true, example = "2879") private Integer expiresIn; - public String getAccessToken() { - return accessToken; - } - - public MobileRegisterVO setAccessToken(String accessToken) { - this.accessToken = accessToken; - return this; - } - - public String getRefreshToken() { - return refreshToken; - } - - public MobileRegisterVO setRefreshToken(String refreshToken) { - this.refreshToken = refreshToken; - return this; - } - - public Integer getExpiresIn() { - return expiresIn; - } - - public MobileRegisterVO setExpiresIn(Integer expiresIn) { - this.expiresIn = expiresIn; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/UsersUserVO.java b/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/UsersUserVO.java index cb8171251..ca03b2d48 100644 --- a/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/UsersUserVO.java +++ b/user/user-application/src/main/java/cn/iocoder/mall/user/application/vo/users/UsersUserVO.java @@ -2,8 +2,12 @@ package cn.iocoder.mall.user.application.vo.users; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; @ApiModel("用户信息 VO") +@Data +@Accessors(chain = true) public class UsersUserVO { @ApiModelProperty(value = "用户编号", required = true, example = "123") @@ -15,40 +19,4 @@ public class UsersUserVO { @ApiModelProperty(value = "头像", required = true, example = "http://www.iocoder.cn/xxx.jpg") private String avatar; - public Integer getId() { - return id; - } - - public UsersUserVO setId(Integer id) { - this.id = id; - return this; - } - - public String getMobile() { - return mobile; - } - - public UsersUserVO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getNickname() { - return nickname; - } - - public UsersUserVO setNickname(String nickname) { - this.nickname = nickname; - return this; - } - - public String getAvatar() { - return avatar; - } - - public UsersUserVO setAvatar(String avatar) { - this.avatar = avatar; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-sdk/pom.xml b/user/user-sdk/pom.xml index 9aa1e6d7f..f595da36f 100644 --- a/user/user-sdk/pom.xml +++ b/user/user-sdk/pom.xml @@ -11,6 +11,19 @@ user-sdk + + cn.iocoder.mall + common-framework + 1.0-SNAPSHOT + compile + + + cn.iocoder.mall + user-service-api + 1.0-SNAPSHOT + compile + + org.springframework spring-context @@ -29,31 +42,20 @@ 5.1.5.RELEASE compile + com.alibaba dubbo - 2.6.5 - compile + javax.servlet servlet-api 2.5 provided - - cn.iocoder.mall - common-framework - 1.0-SNAPSHOT - compile - - - cn.iocoder.mall - user-service-api - 1.0-SNAPSHOT - compile - + - \ No newline at end of file + diff --git a/user/user-service-api/pom.xml b/user/user-service-api/pom.xml index 563b020b7..5220c770d 100644 --- a/user/user-service-api/pom.xml +++ b/user/user-service-api/pom.xml @@ -16,7 +16,21 @@ common-framework 1.0-SNAPSHOT + + + org.mapstruct + mapstruct + + + org.mapstruct + mapstruct-jdk8 + + + org.projectlombok + lombok + + - \ No newline at end of file + diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/OAuth2AccessTokenBO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/OAuth2AccessTokenBO.java index 1b7883149..5a88f334f 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/OAuth2AccessTokenBO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/OAuth2AccessTokenBO.java @@ -1,7 +1,12 @@ package cn.iocoder.mall.user.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; +@Data +@Accessors(chain = true) public class OAuth2AccessTokenBO implements Serializable { /** @@ -17,31 +22,4 @@ public class OAuth2AccessTokenBO implements Serializable { */ private Integer expiresIn; - public String getAccessToken() { - return accessToken; - } - - public OAuth2AccessTokenBO setAccessToken(String accessToken) { - this.accessToken = accessToken; - return this; - } - - public String getRefreshToken() { - return refreshToken; - } - - public OAuth2AccessTokenBO setRefreshToken(String refreshToken) { - this.refreshToken = refreshToken; - return this; - } - - public Integer getExpiresIn() { - return expiresIn; - } - - public OAuth2AccessTokenBO setExpiresIn(Integer expiresIn) { - this.expiresIn = expiresIn; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/OAuth2AuthenticationBO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/OAuth2AuthenticationBO.java index 424de512a..1de2d1c80 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/OAuth2AuthenticationBO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/OAuth2AuthenticationBO.java @@ -1,7 +1,12 @@ package cn.iocoder.mall.user.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; +@Data +@Accessors(chain = true) public class OAuth2AuthenticationBO implements Serializable { /** @@ -9,13 +14,4 @@ public class OAuth2AuthenticationBO implements Serializable { */ private Integer userId; - public Integer getUserId() { - return userId; - } - - public OAuth2AuthenticationBO setUserId(Integer userId) { - this.userId = userId; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserAddressBO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserAddressBO.java index 3c9ff30d1..484e2faa5 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserAddressBO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserAddressBO.java @@ -1,9 +1,14 @@ package cn.iocoder.mall.user.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + /** * @author Sin * @time 2019-04-06 13:28 */ +@Data +@Accessors(chain = true) public class UserAddressBO { @@ -32,69 +37,4 @@ public class UserAddressBO { */ private String address; - @Override - public String toString() { - return "UserAddressBO{" + - "id=" + id + - ", userId=" + userId + - ", areaNo='" + areaNo + '\'' + - ", name='" + name + '\'' + - ", mobile='" + mobile + '\'' + - ", address='" + address + '\'' + - '}'; - } - - public Integer getId() { - return id; - } - - public UserAddressBO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getUserId() { - return userId; - } - - public UserAddressBO setUserId(Integer userId) { - this.userId = userId; - return this; - } - - public String getAreaNo() { - return areaNo; - } - - public UserAddressBO setAreaNo(String areaNo) { - this.areaNo = areaNo; - return this; - } - - public String getName() { - return name; - } - - public UserAddressBO setName(String name) { - this.name = name; - return this; - } - - public String getMobile() { - return mobile; - } - - public UserAddressBO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getAddress() { - return address; - } - - public UserAddressBO setAddress(String address) { - this.address = address; - return this; - } } diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserAddressPageBO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserAddressPageBO.java index 4efe04158..c729b5fb1 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserAddressPageBO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserAddressPageBO.java @@ -1,5 +1,8 @@ package cn.iocoder.mall.user.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; import java.util.List; @@ -9,6 +12,8 @@ import java.util.List; * @author Sin * @time 2019-04-06 13:56 */ +@Data +@Accessors(chain = true) public class UserAddressPageBO implements Serializable { /** @@ -20,29 +25,4 @@ public class UserAddressPageBO implements Serializable { */ private List list; - @Override - public String toString() { - return "UserAddressPageBO{" + - "total=" + total + - ", list=" + list + - '}'; - } - - public Integer getTotal() { - return total; - } - - public UserAddressPageBO setTotal(Integer total) { - this.total = total; - return this; - } - - public List getList() { - return list; - } - - public UserAddressPageBO setList(List list) { - this.list = list; - return this; - } } diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserBO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserBO.java index c22cc735c..3a2f7f139 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserBO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserBO.java @@ -1,7 +1,12 @@ package cn.iocoder.mall.user.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; +@Data +@Accessors(chain = true) public class UserBO { /** @@ -32,57 +37,4 @@ public class UserBO { */ private Date createTime; - public Integer getId() { - return id; - } - - public UserBO setId(Integer id) { - this.id = id; - return this; - } - - public String getMobile() { - return mobile; - } - - public UserBO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getNickname() { - return nickname; - } - - public UserBO setNickname(String nickname) { - this.nickname = nickname; - return this; - } - - public String getAvatar() { - return avatar; - } - - public UserBO setAvatar(String avatar) { - this.avatar = avatar; - return this; - } - - public Integer getStatus() { - return status; - } - - public UserBO setStatus(Integer status) { - this.status = status; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public UserBO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } -} \ No newline at end of file +} diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserPageBO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserPageBO.java index 648ac3e85..19aae5b65 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserPageBO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/bo/UserPageBO.java @@ -1,7 +1,12 @@ package cn.iocoder.mall.user.api.bo; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.List; +@Data +@Accessors(chain = true) public class UserPageBO { /** @@ -13,22 +18,4 @@ public class UserPageBO { */ private Integer count; - public List getUsers() { - return users; - } - - public UserPageBO setUsers(List users) { - this.users = users; - return this; - } - - public Integer getCount() { - return count; - } - - public UserPageBO setCount(Integer count) { - this.count = count; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAccessLogAddDTO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAccessLogAddDTO.java index 2dcbf155c..1b50edb8a 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAccessLogAddDTO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAccessLogAddDTO.java @@ -1,11 +1,16 @@ package cn.iocoder.mall.user.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotNull; import java.util.Date; /** * 用户访问日志添加 DTO */ +@Data +@Accessors(chain = true) public class UserAccessLogAddDTO { /** @@ -56,76 +61,4 @@ public class UserAccessLogAddDTO { @NotNull(message = "响应时长不能为空") private Integer responseTime; - public Integer getUserId() { - return userId; - } - - public UserAccessLogAddDTO setUserId(Integer userId) { - this.userId = userId; - return this; - } - - public String getUri() { - return uri; - } - - public UserAccessLogAddDTO setUri(String uri) { - this.uri = uri; - return this; - } - - public String getQueryString() { - return queryString; - } - - public UserAccessLogAddDTO setQueryString(String queryString) { - this.queryString = queryString; - return this; - } - - public String getMethod() { - return method; - } - - public UserAccessLogAddDTO setMethod(String method) { - this.method = method; - return this; - } - - public String getUserAgent() { - return userAgent; - } - - public UserAccessLogAddDTO setUserAgent(String userAgent) { - this.userAgent = userAgent; - return this; - } - - public String getIp() { - return ip; - } - - public UserAccessLogAddDTO setIp(String ip) { - this.ip = ip; - return this; - } - - public Date getStartTime() { - return startTime; - } - - public UserAccessLogAddDTO setStartTime(Date startTime) { - this.startTime = startTime; - return this; - } - - public Integer getResponseTime() { - return responseTime; - } - - public UserAccessLogAddDTO setResponseTime(Integer responseTime) { - this.responseTime = responseTime; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAddressAddDTO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAddressAddDTO.java index 29e5112ce..d85c7bd98 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAddressAddDTO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAddressAddDTO.java @@ -1,5 +1,8 @@ package cn.iocoder.mall.user.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; /** @@ -8,6 +11,8 @@ import java.io.Serializable; * @author Sin * @time 2019-04-06 13:25 */ +@Data +@Accessors(chain = true) public class UserAddressAddDTO implements Serializable { /** @@ -31,59 +36,4 @@ public class UserAddressAddDTO implements Serializable { */ private String address; - @Override - public String toString() { - return "UserAddressAddDTO{" + - "userId=" + userId + - ", areaNo='" + areaNo + '\'' + - ", name='" + name + '\'' + - ", mobile='" + mobile + '\'' + - ", address='" + address + '\'' + - '}'; - } - - public Integer getUserId() { - return userId; - } - - public UserAddressAddDTO setUserId(Integer userId) { - this.userId = userId; - return this; - } - - public String getAreaNo() { - return areaNo; - } - - public UserAddressAddDTO setAreaNo(String areaNo) { - this.areaNo = areaNo; - return this; - } - - public String getName() { - return name; - } - - public UserAddressAddDTO setName(String name) { - this.name = name; - return this; - } - - public String getMobile() { - return mobile; - } - - public UserAddressAddDTO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getAddress() { - return address; - } - - public UserAddressAddDTO setAddress(String address) { - this.address = address; - return this; - } } diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAddressUpdateDTO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAddressUpdateDTO.java index af4363237..00f58eece 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAddressUpdateDTO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserAddressUpdateDTO.java @@ -1,5 +1,8 @@ package cn.iocoder.mall.user.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import java.io.Serializable; /** @@ -8,6 +11,8 @@ import java.io.Serializable; * @author Sin * @time 2019-04-06 13:28 */ +@Data +@Accessors(chain = true) public class UserAddressUpdateDTO implements Serializable { /** @@ -35,69 +40,4 @@ public class UserAddressUpdateDTO implements Serializable { */ private String address; - @Override - public String toString() { - return "UserAddressUpdateDTO{" + - "id=" + id + - ", userId=" + userId + - ", areaNo='" + areaNo + '\'' + - ", name='" + name + '\'' + - ", mobile='" + mobile + '\'' + - ", address='" + address + '\'' + - '}'; - } - - public Integer getId() { - return id; - } - - public UserAddressUpdateDTO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getUserId() { - return userId; - } - - public UserAddressUpdateDTO setUserId(Integer userId) { - this.userId = userId; - return this; - } - - public String getAreaNo() { - return areaNo; - } - - public UserAddressUpdateDTO setAreaNo(String areaNo) { - this.areaNo = areaNo; - return this; - } - - public String getName() { - return name; - } - - public UserAddressUpdateDTO setName(String name) { - this.name = name; - return this; - } - - public String getMobile() { - return mobile; - } - - public UserAddressUpdateDTO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getAddress() { - return address; - } - - public UserAddressUpdateDTO setAddress(String address) { - this.address = address; - return this; - } } diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserPageDTO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserPageDTO.java index 3be215353..afceb4095 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserPageDTO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserPageDTO.java @@ -1,7 +1,12 @@ package cn.iocoder.mall.user.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + import javax.validation.constraints.NotNull; +@Data +@Accessors(chain = true) public class UserPageDTO { /** @@ -16,31 +21,4 @@ public class UserPageDTO { @NotNull(message = "每页条数不能为空") private Integer pageSize; - public Integer getPageNo() { - return pageNo; - } - - public String getNickname() { - return nickname; - } - - public UserPageDTO setNickname(String nickname) { - this.nickname = nickname; - return this; - } - - public UserPageDTO setPageNo(Integer pageNo) { - this.pageNo = pageNo; - return this; - } - - public Integer getPageSize() { - return pageSize; - } - - public UserPageDTO setPageSize(Integer pageSize) { - this.pageSize = pageSize; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserUpdateDTO.java b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserUpdateDTO.java index b4def8cf2..83dea3ff3 100644 --- a/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserUpdateDTO.java +++ b/user/user-service-api/src/main/java/cn/iocoder/mall/user/api/dto/UserUpdateDTO.java @@ -1,8 +1,13 @@ package cn.iocoder.mall.user.api.dto; +import lombok.Data; +import lombok.experimental.Accessors; + /** * 用户更新 DTO */ +@Data +@Accessors(chain = true) public class UserUpdateDTO { /** @@ -18,31 +23,4 @@ public class UserUpdateDTO { */ private String avatar; - public Integer getId() { - return id; - } - - public UserUpdateDTO setId(Integer id) { - this.id = id; - return this; - } - - public String getNickname() { - return nickname; - } - - public UserUpdateDTO setNickname(String nickname) { - this.nickname = nickname; - return this; - } - - public String getAvatar() { - return avatar; - } - - public UserUpdateDTO setAvatar(String avatar) { - this.avatar = avatar; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-service-impl/pom.xml b/user/user-service-impl/pom.xml index 78bc287de..7c93c432c 100644 --- a/user/user-service-impl/pom.xml +++ b/user/user-service-impl/pom.xml @@ -15,12 +15,7 @@ user-service-impl - - com.alibaba - dubbo - 2.6.5 - compile - + cn.iocoder.mall user-service-api @@ -40,12 +35,11 @@ org.mybatis.spring.boot mybatis-spring-boot-starter - 2.0.0 + - org.mapstruct - mapstruct - ${org.mapstruct.version} + com.alibaba + dubbo @@ -56,20 +50,8 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - org.mapstruct - mapstruct-processor - ${org.mapstruct.version} - - - - \ No newline at end of file + diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/MobileCodeDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/MobileCodeDO.java index 749d614dd..aec91c673 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/MobileCodeDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/MobileCodeDO.java @@ -1,8 +1,13 @@ package cn.iocoder.mall.user.biz.dataobject; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; // TODO 优化，IP +@Data +@Accessors(chain = true) public class MobileCodeDO { /** @@ -38,76 +43,4 @@ public class MobileCodeDO { */ private Date usedTime; - public Integer getId() { - return id; - } - - public MobileCodeDO setId(Integer id) { - this.id = id; - return this; - } - - public String getMobile() { - return mobile; - } - - public MobileCodeDO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getCode() { - return code; - } - - public MobileCodeDO setCode(String code) { - this.code = code; - return this; - } - - public Integer getTodayIndex() { - return todayIndex; - } - - public MobileCodeDO setTodayIndex(Integer todayIndex) { - this.todayIndex = todayIndex; - return this; - } - - public Boolean getUsed() { - return used; - } - - public MobileCodeDO setUsed(Boolean used) { - this.used = used; - return this; - } - - public Integer getUsedUserId() { - return usedUserId; - } - - public MobileCodeDO setUsedUserId(Integer usedUserId) { - this.usedUserId = usedUserId; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public MobileCodeDO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - - public Date getUsedTime() { - return usedTime; - } - - public MobileCodeDO setUsedTime(Date usedTime) { - this.usedTime = usedTime; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/OAuth2AccessTokenDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/OAuth2AccessTokenDO.java index e56922fd7..79875d7fc 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/OAuth2AccessTokenDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/OAuth2AccessTokenDO.java @@ -1,7 +1,12 @@ package cn.iocoder.mall.user.biz.dataobject; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; +@Data +@Accessors(chain = true) public class OAuth2AccessTokenDO { /** @@ -29,57 +34,4 @@ public class OAuth2AccessTokenDO { */ private Date createTime; - public String getId() { - return id; - } - - public OAuth2AccessTokenDO setId(String id) { - this.id = id; - return this; - } - - public String getRefreshToken() { - return refreshToken; - } - - public OAuth2AccessTokenDO setRefreshToken(String refreshToken) { - this.refreshToken = refreshToken; - return this; - } - - public Integer getUserId() { - return userId; - } - - public OAuth2AccessTokenDO setUserId(Integer userId) { - this.userId = userId; - return this; - } - - public Date getExpiresTime() { - return expiresTime; - } - - public OAuth2AccessTokenDO setExpiresTime(Date expiresTime) { - this.expiresTime = expiresTime; - return this; - } - - public Boolean getValid() { - return valid; - } - - public OAuth2AccessTokenDO setValid(Boolean valid) { - this.valid = valid; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public OAuth2AccessTokenDO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } -} \ No newline at end of file +} diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/OAuth2RefreshTokenDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/OAuth2RefreshTokenDO.java index 3fbedfdd2..a9232cf6a 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/OAuth2RefreshTokenDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/OAuth2RefreshTokenDO.java @@ -1,5 +1,8 @@ package cn.iocoder.mall.user.biz.dataobject; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; /** @@ -7,6 +10,8 @@ import java.util.Date; * * idx_uid */ +@Data +@Accessors(chain = true) public class OAuth2RefreshTokenDO { /** @@ -30,49 +35,4 @@ public class OAuth2RefreshTokenDO { */ private Date createTime; - public String getId() { - return id; - } - - public OAuth2RefreshTokenDO setId(String id) { - this.id = id; - return this; - } - - public Integer getUserId() { - return userId; - } - - public OAuth2RefreshTokenDO setUserId(Integer userId) { - this.userId = userId; - return this; - } - - public Boolean getValid() { - return valid; - } - - public OAuth2RefreshTokenDO setValid(Boolean valid) { - this.valid = valid; - return this; - } - - public Date getExpiresTime() { - return expiresTime; - } - - public OAuth2RefreshTokenDO setExpiresTime(Date expiresTime) { - this.expiresTime = expiresTime; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public OAuth2RefreshTokenDO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - } diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserAccessLogDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserAccessLogDO.java index 3ebde3bfb..e91f70bc2 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserAccessLogDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserAccessLogDO.java @@ -1,12 +1,16 @@ package cn.iocoder.mall.user.biz.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; /** * 用户访问日志 DO */ +@Data +@Accessors(chain = true) public class UserAccessLogDO extends DeletableDO { /** @@ -48,85 +52,4 @@ public class UserAccessLogDO extends DeletableDO { */ private Integer responseTime; - public Integer getId() { - return id; - } - - public UserAccessLogDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getUserId() { - return userId; - } - - public UserAccessLogDO setUserId(Integer userId) { - this.userId = userId; - return this; - } - - public String getUri() { - return uri; - } - - public UserAccessLogDO setUri(String uri) { - this.uri = uri; - return this; - } - - public String getQueryString() { - return queryString; - } - - public UserAccessLogDO setQueryString(String queryString) { - this.queryString = queryString; - return this; - } - - public String getMethod() { - return method; - } - - public UserAccessLogDO setMethod(String method) { - this.method = method; - return this; - } - - public String getUserAgent() { - return userAgent; - } - - public UserAccessLogDO setUserAgent(String userAgent) { - this.userAgent = userAgent; - return this; - } - - public String getIp() { - return ip; - } - - public UserAccessLogDO setIp(String ip) { - this.ip = ip; - return this; - } - - public Date getStartTime() { - return startTime; - } - - public UserAccessLogDO setStartTime(Date startTime) { - this.startTime = startTime; - return this; - } - - public Integer getResponseTime() { - return responseTime; - } - - public UserAccessLogDO setResponseTime(Integer responseTime) { - this.responseTime = responseTime; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserAddressDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserAddressDO.java index c57dab881..7d5a05efc 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserAddressDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserAddressDO.java @@ -1,6 +1,8 @@ package cn.iocoder.mall.user.biz.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * 用户地址信息 @@ -8,6 +10,8 @@ import cn.iocoder.common.framework.dataobject.DeletableDO; * @author Sin * @time 2019-04-06 13:22 */ +@Data +@Accessors(chain = true) public class UserAddressDO extends DeletableDO { /** @@ -35,69 +39,4 @@ public class UserAddressDO extends DeletableDO { */ private String address; - @Override - public String toString() { - return "UserAddressDO{" + - "id=" + id + - ", userId=" + userId + - ", areaNo='" + areaNo + '\'' + - ", name='" + name + '\'' + - ", mobile='" + mobile + '\'' + - ", address='" + address + '\'' + - '}'; - } - - public Integer getId() { - return id; - } - - public UserAddressDO setId(Integer id) { - this.id = id; - return this; - } - - public Integer getUserId() { - return userId; - } - - public UserAddressDO setUserId(Integer userId) { - this.userId = userId; - return this; - } - - public String getAreaNo() { - return areaNo; - } - - public UserAddressDO setAreaNo(String areaNo) { - this.areaNo = areaNo; - return this; - } - - public String getName() { - return name; - } - - public UserAddressDO setName(String name) { - this.name = name; - return this; - } - - public String getMobile() { - return mobile; - } - - public UserAddressDO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getAddress() { - return address; - } - - public UserAddressDO setAddress(String address) { - this.address = address; - return this; - } } diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserDO.java index d43dfd6ca..d6d13f203 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserDO.java @@ -1,12 +1,16 @@ package cn.iocoder.mall.user.biz.dataobject; import cn.iocoder.common.framework.dataobject.DeletableDO; +import lombok.Data; +import lombok.experimental.Accessors; /** * 用户实体，存储用户基本数据。 * * idx_mobile 唯一索引 */ +@Data +@Accessors(chain = true) public class UserDO extends DeletableDO { /** @@ -33,49 +37,5 @@ public class UserDO extends DeletableDO { */ private Integer status; - public Integer getId() { - return id; - } - public UserDO setId(Integer id) { - this.id = id; - return this; - } - - public String getMobile() { - return mobile; - } - - public UserDO setMobile(String mobile) { - this.mobile = mobile; - return this; - } - - public String getNickname() { - return nickname; - } - - public UserDO setNickname(String nickname) { - this.nickname = nickname; - return this; - } - - public String getAvatar() { - return avatar; - } - - public UserDO setAvatar(String avatar) { - this.avatar = avatar; - return this; - } - - public Integer getStatus() { - return status; - } - - public UserDO setStatus(Integer status) { - this.status = status; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserLoginLogDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserLoginLogDO.java index 8d5491e74..14c287de0 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserLoginLogDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserLoginLogDO.java @@ -1,4 +1,9 @@ package cn.iocoder.mall.user.biz.dataobject; +import lombok.Data; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) public class UserLoginLogDO { } diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserRegisterDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserRegisterDO.java index 0437051e9..920cbfbba 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserRegisterDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserRegisterDO.java @@ -1,10 +1,15 @@ package cn.iocoder.mall.user.biz.dataobject; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; /** * 用户注册信息 */ +@Data +@Accessors(chain = true) public class UserRegisterDO { /** @@ -20,23 +25,4 @@ public class UserRegisterDO { // TODO 芋艿 ua // TODO 芋艿 方式，手机注册、qq 等等 - - public Integer getId() { - return id; - } - - public UserRegisterDO setId(Integer id) { - this.id = id; - return this; - } - - public Date getCreateTime() { - return createTime; - } - - public UserRegisterDO setCreateTime(Date createTime) { - this.createTime = createTime; - return this; - } - -} \ No newline at end of file +} diff --git a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserThirdAuthDO.java b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserThirdAuthDO.java index ce363119c..dc6d42407 100644 --- a/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserThirdAuthDO.java +++ b/user/user-service-impl/src/main/java/cn/iocoder/mall/user/biz/dataobject/UserThirdAuthDO.java @@ -1,10 +1,15 @@ package cn.iocoder.mall.user.biz.dataobject; +import lombok.Data; +import lombok.experimental.Accessors; + import java.util.Date; /** * 用户三方开放平台授权，例如：QQ / 微博 / 微信等等。 */ +@Data +@Accessors(chain = true) public class UserThirdAuthDO { /** @@ -63,4 +68,4 @@ public class UserThirdAuthDO { */ private String extras; -} \ No newline at end of file +}