diff --git a/yshop-generator/src/main/java/co/yixiang/domain/ColumnConfig.java b/yshop-generator/src/main/java/co/gen/domain/ColumnConfig.java similarity index 96% rename from yshop-generator/src/main/java/co/yixiang/domain/ColumnConfig.java rename to yshop-generator/src/main/java/co/gen/domain/ColumnConfig.java index bf4793ec..e60f53c9 100644 --- a/yshop-generator/src/main/java/co/yixiang/domain/ColumnConfig.java +++ b/yshop-generator/src/main/java/co/gen/domain/ColumnConfig.java @@ -1,6 +1,6 @@ -package co.yixiang.domain; +package co.gen.domain; -import co.yixiang.utils.GenUtil; +import co.gen.utils.GenUtil; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/yshop-generator/src/main/java/co/yixiang/domain/GenConfig.java b/yshop-generator/src/main/java/co/gen/domain/GenConfig.java similarity index 97% rename from yshop-generator/src/main/java/co/yixiang/domain/GenConfig.java rename to yshop-generator/src/main/java/co/gen/domain/GenConfig.java index 1efbae6d..54a95503 100644 --- a/yshop-generator/src/main/java/co/yixiang/domain/GenConfig.java +++ b/yshop-generator/src/main/java/co/gen/domain/GenConfig.java @@ -1,4 +1,4 @@ -package co.yixiang.domain; +package co.gen.domain; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/yshop-generator/src/main/java/co/yixiang/domain/vo/ColumnInfo.java b/yshop-generator/src/main/java/co/gen/domain/vo/ColumnInfo.java similarity index 96% rename from yshop-generator/src/main/java/co/yixiang/domain/vo/ColumnInfo.java rename to yshop-generator/src/main/java/co/gen/domain/vo/ColumnInfo.java index b7c66f27..ce95b086 100644 --- a/yshop-generator/src/main/java/co/yixiang/domain/vo/ColumnInfo.java +++ b/yshop-generator/src/main/java/co/gen/domain/vo/ColumnInfo.java @@ -1,4 +1,4 @@ -package co.yixiang.domain.vo; +package co.gen.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/yshop-generator/src/main/java/co/yixiang/domain/vo/TableInfo.java b/yshop-generator/src/main/java/co/gen/domain/vo/TableInfo.java similarity index 94% rename from yshop-generator/src/main/java/co/yixiang/domain/vo/TableInfo.java rename to yshop-generator/src/main/java/co/gen/domain/vo/TableInfo.java index a1770cd2..681a0c77 100644 --- a/yshop-generator/src/main/java/co/yixiang/domain/vo/TableInfo.java +++ b/yshop-generator/src/main/java/co/gen/domain/vo/TableInfo.java @@ -1,4 +1,4 @@ -package co.yixiang.domain.vo; +package co.gen.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/yshop-generator/src/main/java/co/yixiang/rest/GenConfigController.java b/yshop-generator/src/main/java/co/gen/rest/GenConfigController.java similarity index 91% rename from yshop-generator/src/main/java/co/yixiang/rest/GenConfigController.java rename to yshop-generator/src/main/java/co/gen/rest/GenConfigController.java index 3e2ea586..957d2191 100644 --- a/yshop-generator/src/main/java/co/yixiang/rest/GenConfigController.java +++ b/yshop-generator/src/main/java/co/gen/rest/GenConfigController.java @@ -1,7 +1,7 @@ -package co.yixiang.rest; +package co.gen.rest; -import co.yixiang.domain.GenConfig; -import co.yixiang.service.GenConfigService; +import co.gen.service.GenConfigService; +import co.gen.domain.GenConfig; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.http.HttpStatus; diff --git a/yshop-generator/src/main/java/co/yixiang/rest/GeneratorController.java b/yshop-generator/src/main/java/co/gen/rest/GeneratorController.java similarity index 96% rename from yshop-generator/src/main/java/co/yixiang/rest/GeneratorController.java rename to yshop-generator/src/main/java/co/gen/rest/GeneratorController.java index 5cc6e575..859a4eaa 100644 --- a/yshop-generator/src/main/java/co/yixiang/rest/GeneratorController.java +++ b/yshop-generator/src/main/java/co/gen/rest/GeneratorController.java @@ -1,8 +1,8 @@ -package co.yixiang.rest; +package co.gen.rest; -import co.yixiang.domain.ColumnConfig; -import co.yixiang.service.GenConfigService; -import co.yixiang.service.GeneratorService; +import co.gen.service.GenConfigService; +import co.gen.service.GeneratorService; +import co.gen.domain.ColumnConfig; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import co.yixiang.exception.BadRequestException; diff --git a/yshop-generator/src/main/java/co/yixiang/service/GenConfigService.java b/yshop-generator/src/main/java/co/gen/service/GenConfigService.java similarity index 86% rename from yshop-generator/src/main/java/co/yixiang/service/GenConfigService.java rename to yshop-generator/src/main/java/co/gen/service/GenConfigService.java index 1a4c57df..e64988ae 100644 --- a/yshop-generator/src/main/java/co/yixiang/service/GenConfigService.java +++ b/yshop-generator/src/main/java/co/gen/service/GenConfigService.java @@ -1,6 +1,6 @@ -package co.yixiang.service; +package co.gen.service; -import co.yixiang.domain.GenConfig; +import co.gen.domain.GenConfig; /** * @author Zheng Jie diff --git a/yshop-generator/src/main/java/co/yixiang/service/GeneratorService.java b/yshop-generator/src/main/java/co/gen/service/GeneratorService.java similarity index 94% rename from yshop-generator/src/main/java/co/yixiang/service/GeneratorService.java rename to yshop-generator/src/main/java/co/gen/service/GeneratorService.java index ae0f1573..90895fbb 100644 --- a/yshop-generator/src/main/java/co/yixiang/service/GeneratorService.java +++ b/yshop-generator/src/main/java/co/gen/service/GeneratorService.java @@ -1,7 +1,7 @@ -package co.yixiang.service; +package co.gen.service; -import co.yixiang.domain.ColumnConfig; -import co.yixiang.domain.GenConfig; +import co.gen.domain.ColumnConfig; +import co.gen.domain.GenConfig; import org.springframework.http.ResponseEntity; import org.springframework.scheduling.annotation.Async; import javax.servlet.http.HttpServletRequest; diff --git a/yshop-generator/src/main/java/co/yixiang/service/impl/GenConfigServiceImpl.java b/yshop-generator/src/main/java/co/gen/service/impl/GenConfigServiceImpl.java similarity index 84% rename from yshop-generator/src/main/java/co/yixiang/service/impl/GenConfigServiceImpl.java rename to yshop-generator/src/main/java/co/gen/service/impl/GenConfigServiceImpl.java index a18cbe15..b4766121 100644 --- a/yshop-generator/src/main/java/co/yixiang/service/impl/GenConfigServiceImpl.java +++ b/yshop-generator/src/main/java/co/gen/service/impl/GenConfigServiceImpl.java @@ -1,14 +1,11 @@ -package co.yixiang.service.impl; +package co.gen.service.impl; import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.domain.GenConfig; -import co.yixiang.service.GenConfigService; -import co.yixiang.service.mapper.GenConfigMapper; +import co.gen.domain.GenConfig; +import co.gen.service.GenConfigService; +import co.gen.service.mapper.GenConfigMapper; import co.yixiang.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import org.springframework.cache.annotation.CacheConfig; -import org.springframework.cache.annotation.CachePut; -import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import java.io.File; diff --git a/yshop-generator/src/main/java/co/yixiang/service/impl/GeneratorServiceImpl.java b/yshop-generator/src/main/java/co/gen/service/impl/GeneratorServiceImpl.java similarity index 96% rename from yshop-generator/src/main/java/co/yixiang/service/impl/GeneratorServiceImpl.java rename to yshop-generator/src/main/java/co/gen/service/impl/GeneratorServiceImpl.java index a495e515..610dba26 100644 --- a/yshop-generator/src/main/java/co/yixiang/service/impl/GeneratorServiceImpl.java +++ b/yshop-generator/src/main/java/co/gen/service/impl/GeneratorServiceImpl.java @@ -1,16 +1,16 @@ -package co.yixiang.service.impl; +package co.gen.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ZipUtil; import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.domain.ColumnConfig; -import co.yixiang.domain.GenConfig; -import co.yixiang.service.mapper.ColumnInfoMapper; -import co.yixiang.utils.GenUtil; -import co.yixiang.domain.vo.TableInfo; +import co.gen.domain.ColumnConfig; +import co.gen.domain.GenConfig; +import co.gen.service.mapper.ColumnInfoMapper; +import co.gen.utils.GenUtil; +import co.gen.domain.vo.TableInfo; import co.yixiang.exception.BadRequestException; -import co.yixiang.service.GeneratorService; +import co.gen.service.GeneratorService; import co.yixiang.utils.FileUtil; import co.yixiang.utils.PageUtil; import co.yixiang.utils.StringUtils; diff --git a/yshop-generator/src/main/java/co/yixiang/service/mapper/ColumnInfoMapper.java b/yshop-generator/src/main/java/co/gen/service/mapper/ColumnInfoMapper.java similarity index 75% rename from yshop-generator/src/main/java/co/yixiang/service/mapper/ColumnInfoMapper.java rename to yshop-generator/src/main/java/co/gen/service/mapper/ColumnInfoMapper.java index 6fec6202..fde0cf86 100644 --- a/yshop-generator/src/main/java/co/yixiang/service/mapper/ColumnInfoMapper.java +++ b/yshop-generator/src/main/java/co/gen/service/mapper/ColumnInfoMapper.java @@ -1,7 +1,7 @@ -package co.yixiang.service.mapper; +package co.gen.service.mapper; +import co.gen.domain.ColumnConfig; import co.yixiang.common.mapper.CoreMapper; -import co.yixiang.domain.ColumnConfig; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; diff --git a/yshop-generator/src/main/java/co/yixiang/service/mapper/GenConfigMapper.java b/yshop-generator/src/main/java/co/gen/service/mapper/GenConfigMapper.java similarity index 76% rename from yshop-generator/src/main/java/co/yixiang/service/mapper/GenConfigMapper.java rename to yshop-generator/src/main/java/co/gen/service/mapper/GenConfigMapper.java index e1abaccf..dba3a0b9 100644 --- a/yshop-generator/src/main/java/co/yixiang/service/mapper/GenConfigMapper.java +++ b/yshop-generator/src/main/java/co/gen/service/mapper/GenConfigMapper.java @@ -1,7 +1,7 @@ -package co.yixiang.service.mapper; +package co.gen.service.mapper; +import co.gen.domain.GenConfig; import co.yixiang.common.mapper.CoreMapper; -import co.yixiang.domain.GenConfig; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; diff --git a/yshop-generator/src/main/java/co/yixiang/utils/ColUtil.java b/yshop-generator/src/main/java/co/gen/utils/ColUtil.java similarity index 96% rename from yshop-generator/src/main/java/co/yixiang/utils/ColUtil.java rename to yshop-generator/src/main/java/co/gen/utils/ColUtil.java index a00097b9..6878567a 100644 --- a/yshop-generator/src/main/java/co/yixiang/utils/ColUtil.java +++ b/yshop-generator/src/main/java/co/gen/utils/ColUtil.java @@ -1,4 +1,4 @@ -package co.yixiang.utils; +package co.gen.utils; import org.apache.commons.configuration.*; diff --git a/yshop-generator/src/main/java/co/yixiang/utils/GenUtil.java b/yshop-generator/src/main/java/co/gen/utils/GenUtil.java similarity index 99% rename from yshop-generator/src/main/java/co/yixiang/utils/GenUtil.java rename to yshop-generator/src/main/java/co/gen/utils/GenUtil.java index 95c3d23a..f46c6046 100644 --- a/yshop-generator/src/main/java/co/yixiang/utils/GenUtil.java +++ b/yshop-generator/src/main/java/co/gen/utils/GenUtil.java @@ -1,10 +1,12 @@ -package co.yixiang.utils; +package co.gen.utils; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.template.*; +import co.gen.domain.GenConfig; +import co.yixiang.utils.FileUtil; +import co.yixiang.utils.StringUtils; import lombok.extern.slf4j.Slf4j; -import co.yixiang.domain.GenConfig; -import co.yixiang.domain.ColumnConfig; +import co.gen.domain.ColumnConfig; import org.springframework.util.ObjectUtils; import java.io.File; import java.io.FileWriter; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java index c44b8ec2..0befb8a8 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCombination.java @@ -12,7 +12,7 @@ import java.io.Serializable; * @date 2020-05-13 */ @Data -@TableName(value="yx_store_combination") +@TableName("yx_store_combination") public class YxStoreCombination implements Serializable { @TableId diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCoupon.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCoupon.java index 35b36649..06bb3e02 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCoupon.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCoupon.java @@ -1,12 +1,8 @@ package co.yixiang.modules.activity.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import javax.persistence.*; -import javax.validation.constraints.*; import java.math.BigDecimal; import java.io.Serializable; @@ -14,73 +10,52 @@ import java.io.Serializable; * @author xuwenbo * @date 2020-05-13 */ -@Entity @Data -@Table(name="yx_store_coupon") +@TableName("yx_store_coupon") public class YxStoreCoupon implements Serializable { /** 优惠券表ID */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId private Integer id; /** 优惠券名称 */ - @Column(name = "title",nullable = false) - @NotBlank private String title; /** 兑换消耗积分值 */ - @Column(name = "integral",nullable = false) - @NotNull private Integer integral; /** 兑换的优惠券面值 */ - @Column(name = "coupon_price",nullable = false) - @NotNull private BigDecimal couponPrice; /** 最低消费多少金额可用优惠券 */ - @Column(name = "use_min_price",nullable = false) - @NotNull private BigDecimal useMinPrice; /** 优惠券有效期限（单位：天） */ - @Column(name = "coupon_time",nullable = false) - @NotNull private Integer couponTime; /** 排序 */ - @Column(name = "sort",nullable = false) - @NotNull private Integer sort; /** 状态（0：关闭，1：开启） */ - @Column(name = "status",nullable = false) - @NotNull private Integer status; /** 兑换项目添加时间 */ - @Column(name = "add_time",nullable = false) - @NotNull private Integer addTime; /** 是否删除 */ - @Column(name = "is_del",nullable = false) - @NotNull private Integer isDel; public void copy(YxStoreCoupon source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssue.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssue.java index 5f873a64..658fa78c 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssue.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssue.java @@ -1,12 +1,8 @@ package co.yixiang.modules.activity.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import javax.persistence.*; -import javax.validation.constraints.*; import java.sql.Timestamp; import java.io.Serializable; @@ -14,79 +10,59 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-13 */ -@Entity @Data -@Table(name="yx_store_coupon_issue") +@TableName("yx_store_coupon_issue") public class YxStoreCouponIssue implements Serializable { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId private Integer id; - @Column(name = "cname") private String cname; /** 优惠券ID */ - @Column(name = "cid") private Integer cid; /** 优惠券领取开启时间 */ - @Column(name = "start_time") private Integer startTime; /** 优惠券领取结束时间 */ - @Column(name = "end_time") private Integer endTime; /** 优惠券领取数量 */ - @Column(name = "total_count") private Integer totalCount; /** 优惠券剩余领取数量 */ - @Column(name = "remain_count") private Integer remainCount; /** 是否无限张数 */ - @Column(name = "is_permanent",nullable = false) - @NotNull private Integer isPermanent; /** 1 正常 0 未开启 -1 已无效 */ - @Column(name = "status",nullable = false) - @NotNull private Integer status; - @Column(name = "is_del",nullable = false) - @NotNull private Integer isDel; /** 优惠券添加时间 */ - @Column(name = "add_time") private Integer addTime; - @Column(name = "end_time_date",nullable = false) - @NotNull private Timestamp endTimeDate; - @Column(name = "start_time_date",nullable = false) - @NotNull private Timestamp startTimeDate; public void copy(YxStoreCouponIssue source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssueUser.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssueUser.java index f2c48698..b2dfae7e 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssueUser.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponIssueUser.java @@ -1,45 +1,35 @@ package co.yixiang.modules.activity.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import javax.persistence.*; -import javax.validation.constraints.*; import java.io.Serializable; /** * @author hupeng * @date 2020-05-13 */ -@Entity @Data -@Table(name="yx_store_coupon_issue_user") +@TableName("yx_store_coupon_issue_user") public class YxStoreCouponIssueUser implements Serializable { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId private Integer id; /** 领取优惠券用户ID */ - @Column(name = "uid") private Integer uid; /** 优惠券前台领取ID */ - @Column(name = "issue_coupon_id") private Integer issueCouponId; /** 领取时间 */ - @Column(name = "add_time") private Integer addTime; public void copy(YxStoreCouponIssueUser source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java index 191036e1..5eac52f1 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreCouponUser.java @@ -1,12 +1,8 @@ package co.yixiang.modules.activity.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import javax.persistence.*; -import javax.validation.constraints.*; import java.math.BigDecimal; import java.io.Serializable; @@ -14,85 +10,60 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-13 */ -@Entity @Data -@Table(name="yx_store_coupon_user") +@TableName("yx_store_coupon_user") public class YxStoreCouponUser implements Serializable { /** 优惠券发放记录id */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId private Integer id; /** 兑换的项目id */ - @Column(name = "cid",nullable = false) - @NotNull private Integer cid; /** 优惠券所属用户 */ - @Column(name = "uid",nullable = false) - @NotNull private Integer uid; /** 优惠券名称 */ - @Column(name = "coupon_title",nullable = false) - @NotBlank private String couponTitle; /** 优惠券的面值 */ - @Column(name = "coupon_price",nullable = false) - @NotNull private BigDecimal couponPrice; /** 最低消费多少金额可用优惠券 */ - @Column(name = "use_min_price",nullable = false) - @NotNull private BigDecimal useMinPrice; /** 优惠券创建时间 */ - @Column(name = "add_time",nullable = false) - @NotNull private Integer addTime; /** 优惠券结束时间 */ - @Column(name = "end_time",nullable = false) - @NotNull private Integer endTime; /** 使用时间 */ - @Column(name = "use_time",nullable = false) - @NotNull private Integer useTime; /** 获取方式 */ - @Column(name = "type",nullable = false) - @NotBlank private String type; /** 状态（0：未使用，1：已使用, 2:已过期） */ - @Column(name = "status",nullable = false) - @NotNull private Integer status; /** 是否有效 */ - @Column(name = "is_fail",nullable = false) - @NotNull private Integer isFail; public void copy(YxStoreCouponUser source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java index 78780455..7ac2e27e 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java @@ -1,12 +1,8 @@ package co.yixiang.modules.activity.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import javax.persistence.*; -import javax.validation.constraints.*; import java.math.BigDecimal; import java.io.Serializable; @@ -14,107 +10,74 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-12 */ -@Entity @Data -@Table(name="yx_store_pink") +@TableName("yx_store_pink") public class YxStorePink implements Serializable { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId private Integer id; /** 用户id */ - @Column(name = "uid",nullable = false) - @NotNull private Integer uid; /** 订单id 生成 */ - @Column(name = "order_id",nullable = false) - @NotBlank private String orderId; /** 订单id 数据库 */ - @Column(name = "order_id_key",nullable = false) - @NotNull private Integer orderIdKey; /** 购买商品个数 */ - @Column(name = "total_num",nullable = false) - @NotNull private Integer totalNum; /** 购买总金额 */ - @Column(name = "total_price",nullable = false) - @NotNull private BigDecimal totalPrice; /** 拼团产品id */ - @Column(name = "cid",nullable = false) - @NotNull private Integer cid; /** 产品id */ - @Column(name = "pid",nullable = false) - @NotNull private Integer pid; /** 拼图总人数 */ - @Column(name = "people",nullable = false) - @NotNull private Integer people; /** 拼团产品单价 */ - @Column(name = "price",nullable = false) - @NotNull private BigDecimal price; /** 开始时间 */ - @Column(name = "add_time",nullable = false) - @NotBlank private String addTime; - @Column(name = "stop_time",nullable = false) - @NotBlank private String stopTime; /** 团长id 0为团长 */ - @Column(name = "k_id",nullable = false) - @NotNull private Integer kId; /** 是否发送模板消息0未发送1已发送 */ - @Column(name = "is_tpl",nullable = false) - @NotNull private Integer isTpl; /** 是否退款 0未退款 1已退款 */ - @Column(name = "is_refund",nullable = false) - @NotNull private Integer isRefund; /** 状态1进行中2已完成3未完成 */ - @Column(name = "status",nullable = false) - @NotNull private Integer status; public void copy(YxStorePink source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java index ed7d3cfb..eadb8251 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreSeckill.java @@ -1,12 +1,8 @@ package co.yixiang.modules.activity.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import javax.persistence.*; -import javax.validation.constraints.*; import java.sql.Timestamp; import java.math.BigDecimal; import java.io.Serializable; @@ -15,177 +11,122 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-13 */ -@Entity @Data -@Table(name="yx_store_seckill") +@TableName("yx_store_seckill") public class YxStoreSeckill implements Serializable { /** 商品秒杀产品表id */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId private Integer id; /** 商品id */ - @Column(name = "product_id",nullable = false) - @NotNull private Integer productId; /** 推荐图 */ - @Column(name = "image",nullable = false) - @NotBlank private String image; /** 轮播图 */ - @Column(name = "images",nullable = false) - @NotBlank private String images; /** 活动标题 */ - @Column(name = "title",nullable = false) - @NotBlank private String title; /** 简介 */ - @Column(name = "info",nullable = false) - @NotBlank private String info; /** 价格 */ - @Column(name = "price",nullable = false) - @NotNull private BigDecimal price; /** 成本 */ - @Column(name = "cost",nullable = false) - @NotNull private BigDecimal cost; /** 原价 */ - @Column(name = "ot_price",nullable = false) - @NotNull private BigDecimal otPrice; /** 返多少积分 */ - @Column(name = "give_integral",nullable = false) - @NotNull private BigDecimal giveIntegral; /** 排序 */ - @Column(name = "sort",nullable = false) - @NotNull private Integer sort; /** 库存 */ - @Column(name = "stock",nullable = false) - @NotNull private Integer stock; /** 销量 */ - @Column(name = "sales",nullable = false) - @NotNull private Integer sales; /** 单位名 */ - @Column(name = "unit_name",nullable = false) - @NotBlank private String unitName; /** 邮费 */ - @Column(name = "postage",nullable = false) - @NotNull private BigDecimal postage; /** 内容 */ - @Column(name = "description") private String description; /** 开始时间 */ - @Column(name = "start_time",nullable = false) - @NotNull private Integer startTime; /** 结束时间 */ - @Column(name = "stop_time",nullable = false) - @NotNull private Integer stopTime; /** 添加时间 */ - @Column(name = "add_time",nullable = false) - @NotBlank private String addTime; /** 产品状态 */ - @Column(name = "status",nullable = false) - @NotNull private Integer status; /** 是否包邮 */ - @Column(name = "is_postage",nullable = false) - @NotNull private Integer isPostage; /** 热门推荐 */ - @Column(name = "is_hot",nullable = false) - @NotNull private Integer isHot; /** 删除 0未删除1已删除 */ - @Column(name = "is_del",nullable = false) - @NotNull private Integer isDel; /** 最多秒杀几个 */ - @Column(name = "num",nullable = false) - @NotNull private Integer num; /** 显示 */ - @Column(name = "is_show",nullable = false) - @NotNull private Integer isShow; - @Column(name = "end_time_date",nullable = false) - @NotNull private Timestamp endTimeDate; - @Column(name = "start_time_date",nullable = false) - @NotNull private Timestamp startTimeDate; /** 时间段id */ - @Column(name = "time_id") private Integer timeId; public void copy(YxStoreSeckill source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreVisit.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreVisit.java index 89c385b1..9904d8f5 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreVisit.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStoreVisit.java @@ -1,70 +1,55 @@ package co.yixiang.modules.activity.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import javax.persistence.*; -import javax.validation.constraints.*; import java.io.Serializable; /** * @author hupeng * @date 2020-05-13 */ -@Entity @Data -@Table(name="yx_store_visit") +@TableName("yx_store_visit") public class YxStoreVisit implements Serializable { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId private Integer id; /** 产品ID */ - @Column(name = "product_id") private Integer productId; /** 产品类型 */ - @Column(name = "product_type") private String productType; /** 产品分类ID */ - @Column(name = "cate_id") private Integer cateId; /** 产品类型 */ - @Column(name = "type") private String type; /** 用户ID */ - @Column(name = "uid") private Integer uid; /** 访问次数 */ - @Column(name = "count") private Integer count; /** 备注描述 */ - @Column(name = "content") private String content; /** 添加时间 */ - @Column(name = "add_time") private Integer addTime; public void copy(YxStoreVisit source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxUserExtract.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxUserExtract.java index bedcffe2..f1278be2 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxUserExtract.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxUserExtract.java @@ -1,12 +1,8 @@ package co.yixiang.modules.activity.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import javax.persistence.*; -import javax.validation.constraints.*; import java.math.BigDecimal; import java.io.Serializable; @@ -14,84 +10,67 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-13 */ -@Entity @Data -@Table(name="yx_user_extract") +@TableName("yx_user_extract") public class YxUserExtract implements Serializable { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId private Integer id; - @Column(name = "uid") private Integer uid; /** 名称 */ - @Column(name = "real_name") private String realName; /** bank = 银行卡 alipay = 支付宝wx=微信 */ - @Column(name = "extract_type") private String extractType; /** 银行卡 */ - @Column(name = "bank_code") private String bankCode; /** 开户地址 */ - @Column(name = "bank_address") private String bankAddress; /** 支付宝账号 */ - @Column(name = "alipay_code") private String alipayCode; /** 提现金额 */ - @Column(name = "extract_price") private BigDecimal extractPrice; - @Column(name = "mark") private String mark; - @Column(name = "balance") private BigDecimal balance; /** 无效原因 */ - @Column(name = "fail_msg") private String failMsg; - @Column(name = "fail_time") private Integer failTime; /** 添加时间 */ - @Column(name = "add_time") private Integer addTime; /** -1 未通过 0 审核中 1 已提现 */ - @Column(name = "status") private Integer status; /** 微信号 */ - @Column(name = "wechat") private String wechat; public void copy(YxUserExtract source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCombinationRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCombinationRepository.java deleted file mode 100644 index 7f1382cc..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCombinationRepository.java +++ /dev/null @@ -1,18 +0,0 @@ -package co.yixiang.modules.activity.repository; - -import co.yixiang.modules.activity.domain.YxStoreCombination; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; - -/** -* @author hupeng -* @date 2019-11-18 -*/ -public interface StoreCombinationRepository extends JpaRepository, JpaSpecificationExecutor { - @Modifying - @Query(value = "update yx_store_combination set is_show = ?1 where id = ?2",nativeQuery = true) - void updateOnsale(int status, int id); - -} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponIssueRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponIssueRepository.java deleted file mode 100644 index d530fdb3..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponIssueRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package co.yixiang.modules.activity.repository; - -import co.yixiang.modules.activity.domain.YxStoreCouponIssue; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2019-11-09 -*/ -public interface StoreCouponIssueRepository extends JpaRepository, JpaSpecificationExecutor { -} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponIssueUserRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponIssueUserRepository.java deleted file mode 100644 index 173b2e05..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponIssueUserRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package co.yixiang.modules.activity.repository; - -import co.yixiang.modules.activity.domain.YxStoreCouponIssueUser; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2019-11-09 -*/ -public interface StoreCouponIssueUserRepository extends JpaRepository, JpaSpecificationExecutor { -} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponRepository.java deleted file mode 100644 index 5f4d7760..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package co.yixiang.modules.activity.repository; - -import co.yixiang.modules.activity.domain.YxStoreCoupon; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2019-11-09 -*/ -public interface StoreCouponRepository extends JpaRepository, JpaSpecificationExecutor { -} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponUserRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponUserRepository.java deleted file mode 100644 index 83e70eb4..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreCouponUserRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package co.yixiang.modules.activity.repository; - -import co.yixiang.modules.activity.domain.YxStoreCouponUser; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2019-11-10 -*/ -public interface StoreCouponUserRepository extends JpaRepository, JpaSpecificationExecutor { -} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StorePinkRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StorePinkRepository.java deleted file mode 100644 index 8cbe904f..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StorePinkRepository.java +++ /dev/null @@ -1,20 +0,0 @@ -package co.yixiang.modules.activity.repository; - -import co.yixiang.modules.activity.domain.YxStorePink; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2019-11-18 -*/ -public interface StorePinkRepository extends JpaRepository, JpaSpecificationExecutor { - int countByCid(int cid); - - int countByCidAndKId(int cid, int kid); - - int countByKId(int kid); - - YxStorePink findByOrderIdKey(int id); - -} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreSeckillRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreSeckillRepository.java deleted file mode 100644 index c43fdd5d..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreSeckillRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package co.yixiang.modules.activity.repository; - -import co.yixiang.modules.activity.domain.YxStoreSeckill; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author xuwenbo -* @date 2019-12-14 -*/ -public interface StoreSeckillRepository extends JpaRepository, JpaSpecificationExecutor { -} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreVisitRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreVisitRepository.java deleted file mode 100644 index 692f02d6..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/StoreVisitRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package co.yixiang.modules.activity.repository; - -import co.yixiang.modules.activity.domain.YxStoreVisit; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2019-11-18 -*/ -public interface StoreVisitRepository extends JpaRepository, JpaSpecificationExecutor { - int countByProductIdAndProductType(int productId, String productType); -} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/UserExtractRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/UserExtractRepository.java deleted file mode 100644 index 99682f7b..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/repository/UserExtractRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package co.yixiang.modules.activity.repository; - -import co.yixiang.modules.activity.domain.YxUserExtract; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2019-11-14 -*/ -public interface UserExtractRepository extends JpaRepository, JpaSpecificationExecutor { -} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxExpress.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxExpress.java index b5672545..b4fba968 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxExpress.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxExpress.java @@ -1,55 +1,51 @@ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import javax.persistence.*; -import javax.validation.constraints.*; import java.io.Serializable; /** * @author hupeng * @date 2020-05-12 */ -@Entity + @Data -@Table(name="yx_express") +@TableName("yx_express") public class YxExpress implements Serializable { /** 快递公司id */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + //@Column(name = "id") private Integer id; /** 快递公司简称 */ - @Column(name = "code",unique = true,nullable = false) - @NotBlank + //@Column(name = "code",unique = true,nullable = false) + //@NotBlank private String code; /** 快递公司全称 */ - @Column(name = "name",nullable = false) - @NotBlank + //@Column(name = "name",nullable = false) + //@NotBlank private String name; /** 排序 */ - @Column(name = "sort",nullable = false) - @NotNull + //@Column(name = "sort",nullable = false) + //@NotNull private Integer sort; /** 是否显示 */ - @Column(name = "is_show",nullable = false) - @NotNull + //@Column(name = "is_show",nullable = false) + //@NotNull private Integer isShow; public void copy(YxExpress source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterial.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterial.java index 930dd714..f0771773 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterial.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterial.java @@ -1,8 +1,6 @@ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; @@ -14,73 +12,73 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-12 */ -@Entity + @Data -@Table(name="yx_material") +@TableName("yx_material") public class YxMaterial implements Serializable { /** PK */ - @Id - @Column(name = "id") + @TableId + //@Column(name = "id") private String id; /** 所属租户 */ - @Column(name = "user_id",nullable = false) - @NotBlank + //@Column(name = "user_id",nullable = false) + //@NotBlank private String userId; /** 逻辑删除标记（0：显示；1：隐藏） */ - @Column(name = "del_flag",nullable = false) - @NotBlank + //@Column(name = "del_flag",nullable = false) + //@NotBlank @TableLogic @TableField(fill=FieldFill.INSERT_UPDATE) private Boolean delFlag; /** 创建时间 */ - @Column(name = "create_time",nullable = false) - @NotNull + //@Column(name = "create_time",nullable = false) + //@NotNull @TableField(fill= FieldFill.INSERT) private Timestamp createTime; /** 最后更新时间 */ - @Column(name = "update_time",nullable = false) - @NotNull + //@Column(name = "update_time",nullable = false) + //@NotNull @TableField(fill= FieldFill.INSERT_UPDATE) private Timestamp updateTime; /** 创建者ID */ - @Column(name = "create_id") + //@Column(name = "create_id") private String createId; /** 类型1、图片；2、视频 */ - @Column(name = "type",nullable = false) - @NotBlank + //@Column(name = "type",nullable = false) + //@NotBlank private String type; /** 分组ID */ - @Column(name = "group_id") + //@Column(name = "group_id") private String groupId; /** 素材名 */ - @Column(name = "name",nullable = false) - @NotBlank + //@Column(name = "name",nullable = false) + //@NotBlank private String name; /** 素材链接 */ - @Column(name = "url") + //@Column(name = "url") private String url; public void copy(YxMaterial source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterialGroup.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterialGroup.java index a73b8dd6..2f1ec872 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterialGroup.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterialGroup.java @@ -1,12 +1,8 @@ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import javax.persistence.*; -import javax.validation.constraints.*; import java.sql.Timestamp; import java.io.Serializable; @@ -14,57 +10,57 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-12 */ -@Entity + @Data -@Table(name="yx_material_group") +@TableName("yx_material_group") public class YxMaterialGroup implements Serializable { /** PK */ - @Id - @Column(name = "id") + @TableId + //@Column(name = "id") private String id; /** 所属租户 */ - @Column(name = "user_id",nullable = false) - @NotBlank + //@Column(name = "user_id",nullable = false) + //@NotBlank private String userId; /** 逻辑删除标记（0：显示；1：隐藏） */ - @Column(name = "del_flag",nullable = false) - @NotBlank + //@Column(name = "del_flag",nullable = false) + //@NotBlank @TableLogic @TableField(fill=FieldFill.INSERT_UPDATE) private Boolean delFlag; /** 创建时间 */ - @Column(name = "create_time",nullable = false) - @NotNull + //@Column(name = "create_time",nullable = false) + //@NotNull @TableField(fill= FieldFill.INSERT) private Timestamp createTime; /** 最后更新时间 */ - @Column(name = "update_time",nullable = false) - @NotNull + //@Column(name = "update_time",nullable = false) + //@NotNull @TableField(fill= FieldFill.INSERT_UPDATE) private Timestamp updateTime; /** 创建者ID */ - @Column(name = "create_id") + //@Column(name = "create_id") private String createId; /** 分组名 */ - @Column(name = "name",nullable = false) - @NotBlank + //@Column(name = "name",nullable = false) + //@NotBlank private String name; public void copy(YxMaterialGroup source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCart.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCart.java index 9bd3935d..d775d690 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCart.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCart.java @@ -1,102 +1,98 @@ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import javax.persistence.*; -import javax.validation.constraints.*; import java.io.Serializable; /** * @author hupeng * @date 2020-05-12 */ -@Entity + @Data -@Table(name="yx_store_cart") +@TableName("yx_store_cart") public class YxStoreCart implements Serializable { /** 购物车表ID */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + //@Column(name = "id") private Long id; /** 用户ID */ - @Column(name = "uid",nullable = false) - @NotNull + //@Column(name = "uid",nullable = false) + //@NotNull private Integer uid; /** 类型 */ - @Column(name = "type",nullable = false) - @NotBlank + //@Column(name = "type",nullable = false) + //@NotBlank private String type; /** 商品ID */ - @Column(name = "product_id",nullable = false) - @NotNull + //@Column(name = "product_id",nullable = false) + //@NotNull private Integer productId; /** 商品属性 */ - @Column(name = "product_attr_unique",nullable = false) - @NotBlank + //@Column(name = "product_attr_unique",nullable = false) + //@NotBlank private String productAttrUnique; /** 商品数量 */ - @Column(name = "cart_num",nullable = false) - @NotNull + //@Column(name = "cart_num",nullable = false) + //@NotNull private Integer cartNum; /** 添加时间 */ - @Column(name = "add_time",nullable = false) - @NotNull + //@Column(name = "add_time",nullable = false) + //@NotNull private Integer addTime; /** 0 = 未购买 1 = 已购买 */ - @Column(name = "is_pay",nullable = false) - @NotNull + //@Column(name = "is_pay",nullable = false) + //@NotNull private Integer isPay; /** 是否删除 */ - @Column(name = "is_del",nullable = false) - @NotNull + //@Column(name = "is_del",nullable = false) + //@NotNull private Integer isDel; /** 是否为立即购买 */ - @Column(name = "is_new",nullable = false) - @NotNull + //@Column(name = "is_new",nullable = false) + //@NotNull private Integer isNew; /** 拼团id */ - @Column(name = "combination_id") + //@Column(name = "combination_id") private Integer combinationId; /** 秒杀产品ID */ - @Column(name = "seckill_id",nullable = false) - @NotNull + //@Column(name = "seckill_id",nullable = false) + //@NotNull private Integer seckillId; /** 砍价id */ - @Column(name = "bargain_id",nullable = false) - @NotNull + //@Column(name = "bargain_id",nullable = false) + //@NotNull private Integer bargainId; public void copy(YxStoreCart source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java index fe5dc0fa..f34109dd 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java @@ -1,68 +1,64 @@ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import javax.persistence.*; -import javax.validation.constraints.*; import java.io.Serializable; /** * @author hupeng * @date 2020-05-12 */ -@Entity + @Data -@Table(name="yx_store_category") +@TableName("yx_store_category") public class YxStoreCategory implements Serializable { /** 商品分类表ID */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + //@Column(name = "id") private Integer id; /** 父id */ - @Column(name = "pid",nullable = false) - @NotNull + //@Column(name = "pid",nullable = false) + //@NotNull private Integer pid; /** 分类名称 */ - @Column(name = "cate_name",nullable = false) - @NotBlank + //@Column(name = "cate_name",nullable = false) + //@NotBlank private String cateName; /** 排序 */ - @Column(name = "sort") + //@Column(name = "sort") private Integer sort; /** 图标 */ - @Column(name = "pic") + //@Column(name = "pic") private String pic; /** 是否推荐 */ - @Column(name = "is_show") + //@Column(name = "is_show") private Integer isShow; /** 添加时间 */ - @Column(name = "add_time") + //@Column(name = "add_time") private Integer addTime; /** 删除状态 */ - @Column(name = "is_del") + //@Column(name = "is_del") private Integer isDel; public void copy(YxStoreCategory source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java index 2af5214a..cd4f3c1d 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java @@ -1,12 +1,8 @@ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import javax.persistence.*; -import javax.validation.constraints.*; import java.math.BigDecimal; import java.io.Serializable; @@ -14,306 +10,306 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-12 */ -@Entity + @Data -@Table(name="yx_store_order") +@TableName("yx_store_order") public class YxStoreOrder implements Serializable { /** 订单ID */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + //@Column(name = "id") private Integer id; /** 订单号 */ - @Column(name = "order_id",nullable = false) - @NotBlank + //@Column(name = "order_id",nullable = false) + //@NotBlank private String orderId; /** 额外订单号 */ - @Column(name = "extend_order_id") + //@Column(name = "extend_order_id") private String extendOrderId; /** 用户id */ - @Column(name = "uid",nullable = false) - @NotNull + //@Column(name = "uid",nullable = false) + //@NotNull private Integer uid; /** 用户姓名 */ - @Column(name = "real_name",nullable = false) - @NotBlank + //@Column(name = "real_name",nullable = false) + //@NotBlank private String realName; /** 用户电话 */ - @Column(name = "user_phone",nullable = false) - @NotBlank + //@Column(name = "user_phone",nullable = false) + //@NotBlank private String userPhone; /** 详细地址 */ - @Column(name = "user_address",nullable = false) - @NotBlank + //@Column(name = "user_address",nullable = false) + //@NotBlank private String userAddress; /** 购物车id */ - @Column(name = "cart_id",nullable = false) - @NotBlank + //@Column(name = "cart_id",nullable = false) + //@NotBlank private String cartId; /** 运费金额 */ - @Column(name = "freight_price",nullable = false) - @NotNull + //@Column(name = "freight_price",nullable = false) + //@NotNull private BigDecimal freightPrice; /** 订单商品总数 */ - @Column(name = "total_num",nullable = false) - @NotNull + //@Column(name = "total_num",nullable = false) + //@NotNull private Integer totalNum; /** 订单总价 */ - @Column(name = "total_price",nullable = false) - @NotNull + //@Column(name = "total_price",nullable = false) + //@NotNull private BigDecimal totalPrice; /** 邮费 */ - @Column(name = "total_postage",nullable = false) - @NotNull + //@Column(name = "total_postage",nullable = false) + //@NotNull private BigDecimal totalPostage; /** 实际支付金额 */ - @Column(name = "pay_price",nullable = false) - @NotNull + //@Column(name = "pay_price",nullable = false) + //@NotNull private BigDecimal payPrice; /** 支付邮费 */ - @Column(name = "pay_postage",nullable = false) - @NotNull + //@Column(name = "pay_postage",nullable = false) + //@NotNull private BigDecimal payPostage; /** 抵扣金额 */ - @Column(name = "deduction_price",nullable = false) - @NotNull + //@Column(name = "deduction_price",nullable = false) + //@NotNull private BigDecimal deductionPrice; /** 优惠券id */ - @Column(name = "coupon_id",nullable = false) - @NotNull + //@Column(name = "coupon_id",nullable = false) + //@NotNull private Integer couponId; /** 优惠券金额 */ - @Column(name = "coupon_price",nullable = false) - @NotNull + //@Column(name = "coupon_price",nullable = false) + //@NotNull private BigDecimal couponPrice; /** 支付状态 */ - @Column(name = "paid",nullable = false) - @NotNull + //@Column(name = "paid",nullable = false) + //@NotNull private Integer paid; /** 支付时间 */ - @Column(name = "pay_time") + //@Column(name = "pay_time") private Integer payTime; /** 支付方式 */ - @Column(name = "pay_type",nullable = false) - @NotBlank + //@Column(name = "pay_type",nullable = false) + //@NotBlank private String payType; /** 创建时间 */ - @Column(name = "add_time",nullable = false) - @NotNull + //@Column(name = "add_time",nullable = false) + //@NotNull private Integer addTime; /** 订单状态（-1 : 申请退款 -2 : 退货成功 0：待发货；1：待收货；2：已收货；3：待评价；-1：已退款） */ - @Column(name = "status",nullable = false) - @NotNull + //@Column(name = "status",nullable = false) + //@NotNull private Integer status; /** 0 未退款 1 申请中 2 已退款 */ - @Column(name = "refund_status",nullable = false) - @NotNull + //@Column(name = "refund_status",nullable = false) + //@NotNull private Integer refundStatus; /** 退款图片 */ - @Column(name = "refund_reason_wap_img") + //@Column(name = "refund_reason_wap_img") private String refundReasonWapImg; /** 退款用户说明 */ - @Column(name = "refund_reason_wap_explain") + //@Column(name = "refund_reason_wap_explain") private String refundReasonWapExplain; /** 退款时间 */ - @Column(name = "refund_reason_time") + //@Column(name = "refund_reason_time") private Integer refundReasonTime; /** 前台退款原因 */ - @Column(name = "refund_reason_wap") + //@Column(name = "refund_reason_wap") private String refundReasonWap; /** 不退款的理由 */ - @Column(name = "refund_reason") + //@Column(name = "refund_reason") private String refundReason; /** 退款金额 */ - @Column(name = "refund_price",nullable = false) - @NotNull + //@Column(name = "refund_price",nullable = false) + //@NotNull private BigDecimal refundPrice; /** 快递公司编号 */ - @Column(name = "delivery_sn") + //@Column(name = "delivery_sn") private String deliverySn; /** 快递名称/送货人姓名 */ - @Column(name = "delivery_name") + //@Column(name = "delivery_name") private String deliveryName; /** 发货类型 */ - @Column(name = "delivery_type") + //@Column(name = "delivery_type") private String deliveryType; /** 快递单号/手机号 */ - @Column(name = "delivery_id") + //@Column(name = "delivery_id") private String deliveryId; /** 消费赚取积分 */ - @Column(name = "gain_integral",nullable = false) - @NotNull + //@Column(name = "gain_integral",nullable = false) + //@NotNull private BigDecimal gainIntegral; /** 使用积分 */ - @Column(name = "use_integral",nullable = false) - @NotNull + //@Column(name = "use_integral",nullable = false) + //@NotNull private BigDecimal useIntegral; /** 给用户退了多少积分 */ - @Column(name = "back_integral") + //@Column(name = "back_integral") private BigDecimal backIntegral; /** 备注 */ - @Column(name = "mark",nullable = false) - @NotBlank + //@Column(name = "mark",nullable = false) + //@NotBlank private String mark; /** 是否删除 */ - @Column(name = "is_del",nullable = false) - @NotNull + //@Column(name = "is_del",nullable = false) + //@NotNull private Integer isDel; /** 唯一id(md5加密)类似id */ @TableField(value = "`unique`") - @NotBlank + //@NotBlank private String unique; /** 管理员备注 */ - @Column(name = "remark") + //@Column(name = "remark") private String remark; /** 商户ID */ - @Column(name = "mer_id",nullable = false) - @NotNull + //@Column(name = "mer_id",nullable = false) + //@NotNull private Integer merId; - @Column(name = "is_mer_check",nullable = false) - @NotNull + //@Column(name = "is_mer_check",nullable = false) + //@NotNull private Integer isMerCheck; /** 拼团产品id0一般产品 */ - @Column(name = "combination_id") + //@Column(name = "combination_id") private Integer combinationId; /** 拼团id 0没有拼团 */ - @Column(name = "pink_id",nullable = false) - @NotNull + //@Column(name = "pink_id",nullable = false) + //@NotNull private Integer pinkId; /** 成本价 */ - @Column(name = "cost",nullable = false) - @NotNull + //@Column(name = "cost",nullable = false) + //@NotNull private BigDecimal cost; /** 秒杀产品ID */ - @Column(name = "seckill_id",nullable = false) - @NotNull + //@Column(name = "seckill_id",nullable = false) + //@NotNull private Integer seckillId; /** 砍价id */ - @Column(name = "bargain_id") + //@Column(name = "bargain_id") private Integer bargainId; /** 核销码 */ - @Column(name = "verify_code",nullable = false) - @NotBlank + //@Column(name = "verify_code",nullable = false) + //@NotBlank private String verifyCode; /** 门店id */ - @Column(name = "store_id",nullable = false) - @NotNull + //@Column(name = "store_id",nullable = false) + //@NotNull private Integer storeId; /** 配送方式 1=快递 ，2=门店自提 */ - @Column(name = "shipping_type",nullable = false) - @NotNull + //@Column(name = "shipping_type",nullable = false) + //@NotNull private Integer shippingType; /** 支付渠道(0微信公众号1微信小程序) */ - @Column(name = "is_channel") + //@Column(name = "is_channel") private Integer isChannel; - @Column(name = "is_remind") + //@Column(name = "is_remind") private Integer isRemind; - @Column(name = "is_system_del") + //@Column(name = "is_system_del") private Integer isSystemDel; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderCartInfo.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderCartInfo.java index c1476eab..fd4f657d 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderCartInfo.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderCartInfo.java @@ -1,54 +1,54 @@ package co.yixiang.modules.shop.domain; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import javax.persistence.*; -import javax.validation.constraints.*; import java.io.Serializable; /** * @author hupeng * @date 2020-05-12 */ -@Entity + @Data -@Table(name="yx_store_order_cart_info") +@TableName("yx_store_order_cart_info") public class YxStoreOrderCartInfo implements Serializable { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + //@Column(name = "id") private Integer id; /** 订单id */ - @Column(name = "oid",nullable = false) - @NotNull + //@Column(name = "oid",nullable = false) + //@NotNull private Integer oid; /** 购物车id */ - @Column(name = "cart_id",nullable = false) - @NotNull + //@Column(name = "cart_id",nullable = false) + //@NotNull private Integer cartId; /** 商品ID */ - @Column(name = "product_id",nullable = false) - @NotNull + //@Column(name = "product_id",nullable = false) + //@NotNull private Integer productId; /** 购买东西的详细信息 */ - @Column(name = "cart_info",nullable = false) - @NotBlank + //@Column(name = "cart_info",nullable = false) + //@NotBlank private String cartInfo; /** 唯一id */ @TableField(value = "`unique`") - @NotBlank + //@NotBlank private String unique; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderStatus.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderStatus.java index 7820a700..463086e2 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderStatus.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderStatus.java @@ -1,8 +1,6 @@ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; @@ -13,42 +11,42 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-12 */ -@Entity + @Data -@Table(name="yx_store_order_status") +@TableName("yx_store_order_status") public class YxStoreOrderStatus implements Serializable { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + //@Column(name = "id") private Integer id; /** 订单id */ - @Column(name = "oid",nullable = false) - @NotNull + //@Column(name = "oid",nullable = false) + //@NotNull private Integer oid; /** 操作类型 */ - @Column(name = "change_type",nullable = false) - @NotBlank + //@Column(name = "change_type",nullable = false) + //@NotBlank private String changeType; /** 操作备注 */ - @Column(name = "change_message",nullable = false) - @NotBlank + //@Column(name = "change_message",nullable = false) + //@NotBlank private String changeMessage; /** 操作时间 */ - @Column(name = "change_time",nullable = false) - @NotNull + //@Column(name = "change_time",nullable = false) + //@NotNull private Integer changeTime; public void copy(YxStoreOrderStatus source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java index a8140fdb..465cb0ce 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java @@ -1,8 +1,6 @@ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; @@ -14,202 +12,202 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-12 */ -@Entity + @Data -@Table(name="yx_store_product") +@TableName("yx_store_product") public class YxStoreProduct implements Serializable { /** 商品id */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + //@Column(name = "id") private Integer id; /** 商户Id(0为总后台管理员创建,不为0的时候是商户后台创建) */ - @Column(name = "mer_id") + //@Column(name = "mer_id") private Integer merId; /** 商品图片 */ - @Column(name = "image",nullable = false) - @NotBlank + //@Column(name = "image",nullable = false) + //@NotBlank private String image; /** 轮播图 */ - @Column(name = "slider_image",nullable = false) - @NotBlank + //@Column(name = "slider_image",nullable = false) + //@NotBlank private String sliderImage; /** 商品名称 */ - @Column(name = "store_name",nullable = false) - @NotBlank + //@Column(name = "store_name",nullable = false) + //@NotBlank private String storeName; /** 商品简介 */ - @Column(name = "store_info",nullable = false) - @NotBlank + //@Column(name = "store_info",nullable = false) + //@NotBlank private String storeInfo; /** 关键字 */ - @Column(name = "keyword",nullable = false) - @NotBlank + //@Column(name = "keyword",nullable = false) + //@NotBlank private String keyword; /** 产品条码（一维码） */ - @Column(name = "bar_code") + //@Column(name = "bar_code") private String barCode; /** 分类id */ - @Column(name = "cate_id",nullable = false) - @NotBlank + //@Column(name = "cate_id",nullable = false) + //@NotBlank private String cateId; /** 商品价格 */ - @Column(name = "price",nullable = false) - @NotNull + //@Column(name = "price",nullable = false) + //@NotNull private BigDecimal price; /** 会员价格 */ - @Column(name = "vip_price") + //@Column(name = "vip_price") private BigDecimal vipPrice; /** 市场价 */ - @Column(name = "ot_price") + //@Column(name = "ot_price") private BigDecimal otPrice; /** 邮费 */ - @Column(name = "postage") + //@Column(name = "postage") private BigDecimal postage; /** 单位名 */ - @Column(name = "unit_name") + //@Column(name = "unit_name") private String unitName; /** 排序 */ - @Column(name = "sort") + //@Column(name = "sort") private Integer sort; /** 销量 */ - @Column(name = "sales") + //@Column(name = "sales") private Integer sales; /** 库存 */ - @Column(name = "stock") + //@Column(name = "stock") private Integer stock; /** 状态（0：未上架，1：上架） */ - @Column(name = "is_show") + //@Column(name = "is_show") private Integer isShow; /** 是否热卖 */ - @Column(name = "is_hot") + //@Column(name = "is_hot") private Integer isHot; /** 是否优惠 */ - @Column(name = "is_benefit") + //@Column(name = "is_benefit") private Integer isBenefit; /** 是否精品 */ - @Column(name = "is_best") + //@Column(name = "is_best") private Integer isBest; /** 是否新品 */ - @Column(name = "is_new") + //@Column(name = "is_new") private Integer isNew; /** 产品描述 */ - @Column(name = "description") + //@Column(name = "description") private String description; /** 添加时间 */ - @Column(name = "add_time") + //@Column(name = "add_time") private Integer addTime; /** 是否包邮 */ - @Column(name = "is_postage") + //@Column(name = "is_postage") private Integer isPostage; /** 是否删除 */ - @Column(name = "is_del") + //@Column(name = "is_del") private Integer isDel; /** 商户是否代理 0不可代理1可代理 */ - @Column(name = "mer_use") + //@Column(name = "mer_use") private Integer merUse; /** 获得积分 */ - @Column(name = "give_integral") + //@Column(name = "give_integral") private BigDecimal giveIntegral; /** 成本价 */ - @Column(name = "cost") + //@Column(name = "cost") private BigDecimal cost; /** 秒杀状态 0 未开启 1已开启 */ - @Column(name = "is_seckill") + //@Column(name = "is_seckill") private Integer isSeckill; /** 砍价状态 0未开启 1开启 */ - @Column(name = "is_bargain") + //@Column(name = "is_bargain") private Integer isBargain; /** 是否优品推荐 */ - @Column(name = "is_good") + //@Column(name = "is_good") private Integer isGood; /** 虚拟销量 */ - @Column(name = "ficti") + //@Column(name = "ficti") private Integer ficti; /** 浏览量 */ - @Column(name = "browse") + //@Column(name = "browse") private Integer browse; /** 产品二维码地址(用户小程序海报) */ - @Column(name = "code_path",nullable = false) - @NotBlank + //@Column(name = "code_path",nullable = false) + //@NotBlank private String codePath; /** 淘宝京东1688类型 */ - @Column(name = "soure_link") + //@Column(name = "soure_link") private String soureLink; public void copy(YxStoreProduct source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttr.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttr.java index 30fed80c..903bec7e 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttr.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttr.java @@ -1,8 +1,6 @@ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; @@ -13,36 +11,36 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-12 */ -@Entity + @Data -@Table(name="yx_store_product_attr") +@TableName("yx_store_product_attr") public class YxStoreProductAttr implements Serializable { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + //@Column(name = "id") private Integer id; /** 商品ID */ - @Column(name = "product_id",nullable = false) - @NotNull + //@Column(name = "product_id",nullable = false) + //@NotNull private Integer productId; /** 属性名 */ - @Column(name = "attr_name",nullable = false) - @NotBlank + //@Column(name = "attr_name",nullable = false) + //@NotBlank private String attrName; /** 属性值 */ - @Column(name = "attr_values",nullable = false) - @NotBlank + //@Column(name = "attr_values",nullable = false) + //@NotBlank private String attrValues; public void copy(YxStoreProductAttr source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrResult.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrResult.java index c731a6c4..d5159243 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrResult.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrResult.java @@ -1,8 +1,6 @@ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; @@ -13,36 +11,36 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-12 */ -@Entity + @Data -@Table(name="yx_store_product_attr_result") +@TableName("yx_store_product_attr_result") public class YxStoreProductAttrResult implements Serializable { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + //@Column(name = "id") private Integer id; /** 商品ID */ - @Column(name = "product_id",nullable = false) - @NotNull + //@Column(name = "product_id",nullable = false) + //@NotNull private Integer productId; /** 商品属性参数 */ - @Column(name = "result",nullable = false) - @NotBlank + //@Column(name = "result",nullable = false) + //@NotBlank private String result; /** 上次修改时间 */ - @Column(name = "change_time",nullable = false) - @NotNull + //@Column(name = "change_time",nullable = false) + //@NotNull private Integer changeTime; public void copy(YxStoreProductAttrResult source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java index 357c6790..e5deed78 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java @@ -1,8 +1,6 @@ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; @@ -14,60 +12,60 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-12 */ -@Entity + @Data -@Table(name="yx_store_product_attr_value") +@TableName("yx_store_product_attr_value") public class YxStoreProductAttrValue implements Serializable { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + //@Column(name = "id") private Integer id; /** 商品ID */ - @Column(name = "product_id",nullable = false) - @NotNull + //@Column(name = "product_id",nullable = false) + //@NotNull private Integer productId; /** 商品属性索引值 (attr_value|attr_value[|....]) */ - @Column(name = "suk",nullable = false) - @NotBlank + //@Column(name = "suk",nullable = false) + //@NotBlank private String suk; /** 属性对应的库存 */ - @Column(name = "stock",nullable = false) - @NotNull + //@Column(name = "stock",nullable = false) + //@NotNull private Integer stock; /** 销量 */ - @Column(name = "sales") + //@Column(name = "sales") private Integer sales; /** 属性金额 */ - @Column(name = "price",nullable = false) - @NotNull + //@Column(name = "price",nullable = false) + //@NotNull private BigDecimal price; /** 图片 */ - @Column(name = "image") + //@Column(name = "image") private String image; /** 唯一值 */ @TableField(value = "`unique`") - @NotBlank + //@NotBlank private String unique; /** 成本价 */ - @Column(name = "cost",nullable = false) - @NotNull + //@Column(name = "cost",nullable = false) + //@NotNull private BigDecimal cost; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductReply.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductReply.java index a5f39b9f..79567641 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductReply.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductReply.java @@ -1,8 +1,6 @@ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; @@ -13,97 +11,97 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-12 */ -@Entity + @Data -@Table(name="yx_store_product_reply") +@TableName("yx_store_product_reply") public class YxStoreProductReply implements Serializable { /** 评论ID */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + //@Column(name = "id") private Integer id; /** 用户ID */ - @Column(name = "uid",nullable = false) - @NotNull + //@Column(name = "uid",nullable = false) + //@NotNull private Integer uid; /** 订单ID */ - @Column(name = "oid",nullable = false) - @NotNull + //@Column(name = "oid",nullable = false) + //@NotNull private Integer oid; /** 唯一id */ @TableField(value = "`unique`") - @NotBlank + //@NotBlank private String unique; /** 产品id */ - @Column(name = "product_id",nullable = false) - @NotNull + //@Column(name = "product_id",nullable = false) + //@NotNull private Integer productId; /** 某种商品类型(普通商品、秒杀商品） */ - @Column(name = "reply_type",nullable = false) - @NotBlank + //@Column(name = "reply_type",nullable = false) + //@NotBlank private String replyType; /** 商品分数 */ - @Column(name = "product_score",nullable = false) - @NotNull + //@Column(name = "product_score",nullable = false) + //@NotNull private Integer productScore; /** 服务分数 */ - @Column(name = "service_score",nullable = false) - @NotNull + //@Column(name = "service_score",nullable = false) + //@NotNull private Integer serviceScore; /** 评论内容 */ - @Column(name = "comment",nullable = false) - @NotBlank + //@Column(name = "comment",nullable = false) + //@NotBlank private String comment; /** 评论图片 */ - @Column(name = "pics",nullable = false) - @NotBlank + //@Column(name = "pics",nullable = false) + //@NotBlank private String pics; /** 评论时间 */ - @Column(name = "add_time",nullable = false) - @NotNull + //@Column(name = "add_time",nullable = false) + //@NotNull private Integer addTime; /** 管理员回复内容 */ - @Column(name = "merchant_reply_content") + //@Column(name = "merchant_reply_content") private String merchantReplyContent; /** 管理员回复时间 */ - @Column(name = "merchant_reply_time") + //@Column(name = "merchant_reply_time") private Integer merchantReplyTime; /** 0未删除1已删除 */ - @Column(name = "is_del",nullable = false) - @NotNull + //@Column(name = "is_del",nullable = false) + //@NotNull private Integer isDel; /** 0未回复1已回复 */ - @Column(name = "is_reply",nullable = false) - @NotNull + //@Column(name = "is_reply",nullable = false) + //@NotNull private Integer isReply; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemConfig.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemConfig.java index 482d5419..05a8b934 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemConfig.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemConfig.java @@ -1,8 +1,6 @@ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; @@ -13,40 +11,40 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-12 */ -@Entity + @Data -@Table(name="yx_system_config") +@TableName("yx_system_config") public class YxSystemConfig implements Serializable { /** 配置id */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + //@Column(name = "id") private Integer id; /** 字段名称 */ - @Column(name = "menu_name",nullable = false) - @NotBlank + //@Column(name = "menu_name",nullable = false) + //@NotBlank private String menuName; /** 默认值 */ - @Column(name = "value") + //@Column(name = "value") private String value; /** 排序 */ - @Column(name = "sort") + //@Column(name = "sort") private Integer sort; /** 是否隐藏 */ - @Column(name = "status") + //@Column(name = "status") private Integer status; public void copy(YxSystemConfig source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java index 64b5dfdd..39c604ad 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java @@ -1,8 +1,6 @@ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; @@ -13,48 +11,48 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-12 */ -@Entity + @Data -@Table(name="yx_system_group_data") +@TableName("yx_system_group_data") public class YxSystemGroupData implements Serializable { /** 组合数据详情ID */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + //@Column(name = "id") private Integer id; /** 对应的数据名称 */ - @Column(name = "group_name",nullable = false) - @NotBlank + //@Column(name = "group_name",nullable = false) + //@NotBlank private String groupName; /** 数据组对应的数据值（json数据） */ - @Column(name = "value",nullable = false) - @NotBlank + //@Column(name = "value",nullable = false) + //@NotBlank private String value; /** 添加数据时间 */ - @Column(name = "add_time",nullable = false) - @NotNull + //@Column(name = "add_time",nullable = false) + //@NotNull private Integer addTime; /** 数据排序 */ - @Column(name = "sort") + //@Column(name = "sort") private Integer sort; /** 状态（1：开启；2：关闭；） */ - @Column(name = "status",nullable = false) - @NotNull + //@Column(name = "status",nullable = false) + //@NotNull private Integer status; public void copy(YxSystemGroupData source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStore.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStore.java index 0f6c76fc..00d70273 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStore.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStore.java @@ -1,8 +1,6 @@ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; @@ -13,96 +11,96 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-12 */ -@Entity + @Data -@Table(name="yx_system_store") +@TableName("yx_system_store") public class YxSystemStore implements Serializable { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + //@Column(name = "id") private Integer id; /** 门店名称 */ - @Column(name = "name",nullable = false) - @NotBlank + //@Column(name = "name",nullable = false) + //@NotBlank private String name; /** 简介 */ - @Column(name = "introduction",nullable = false) - @NotBlank + //@Column(name = "introduction",nullable = false) + //@NotBlank private String introduction; /** 手机号码 */ - @Column(name = "phone",nullable = false) - @NotBlank + //@Column(name = "phone",nullable = false) + //@NotBlank private String phone; /** 省市区 */ - @Column(name = "address",nullable = false) - @NotBlank + //@Column(name = "address",nullable = false) + //@NotBlank private String address; /** 详细地址 */ - @Column(name = "detailed_address",nullable = false) - @NotBlank + //@Column(name = "detailed_address",nullable = false) + //@NotBlank private String detailedAddress; /** 门店logo */ - @Column(name = "image",nullable = false) - @NotBlank + //@Column(name = "image",nullable = false) + //@NotBlank private String image; /** 纬度 */ - @Column(name = "latitude",nullable = false) - @NotBlank + //@Column(name = "latitude",nullable = false) + //@NotBlank private String latitude; /** 经度 */ - @Column(name = "longitude",nullable = false) - @NotBlank + //@Column(name = "longitude",nullable = false) + //@NotBlank private String longitude; /** 核销有效日期 */ - @Column(name = "valid_time",nullable = false) - @NotBlank + //@Column(name = "valid_time",nullable = false) + //@NotBlank private String validTime; /** 每日营业开关时间 */ - @Column(name = "day_time",nullable = false) - @NotBlank + //@Column(name = "day_time",nullable = false) + //@NotBlank private String dayTime; /** 添加时间 */ - @Column(name = "add_time",nullable = false) - @NotNull + //@Column(name = "add_time",nullable = false) + //@NotNull private Integer addTime; /** 是否显示 */ - @Column(name = "is_show",nullable = false) - @NotNull + //@Column(name = "is_show",nullable = false) + //@NotNull private Integer isShow; /** 是否删除 */ - @Column(name = "is_del",nullable = false) - @NotNull + //@Column(name = "is_del",nullable = false) + //@NotNull private Integer isDel; public void copy(YxSystemStore source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStoreStaff.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStoreStaff.java index a354ec30..7af172f4 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStoreStaff.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStoreStaff.java @@ -1,8 +1,6 @@ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; @@ -13,75 +11,75 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-12 */ -@Entity + @Data -@Table(name="yx_system_store_staff") +@TableName("yx_system_store_staff") public class YxSystemStoreStaff implements Serializable { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + //@Column(name = "id") private Integer id; /** 微信用户id */ - @Column(name = "uid",nullable = false) - @NotNull + //@Column(name = "uid",nullable = false) + //@NotNull private Integer uid; /** 店员头像 */ - @Column(name = "avatar",nullable = false) - @NotBlank + //@Column(name = "avatar",nullable = false) + //@NotBlank private String avatar; /** 门店id */ - @Column(name = "store_id",nullable = false) - @NotNull + //@Column(name = "store_id",nullable = false) + //@NotNull private Integer storeId; /** 店员名称 */ - @Column(name = "staff_name",nullable = false) - @NotBlank + //@Column(name = "staff_name",nullable = false) + //@NotBlank private String staffName; /** 手机号码 */ - @Column(name = "phone",nullable = false) - @NotBlank + //@Column(name = "phone",nullable = false) + //@NotBlank private String phone; /** 核销开关 */ - @Column(name = "verify_status",nullable = false) - @NotNull + //@Column(name = "verify_status",nullable = false) + //@NotNull private Integer verifyStatus; /** 状态 */ - @Column(name = "status") + //@Column(name = "status") private Integer status; /** 添加时间 */ - @Column(name = "add_time") + //@Column(name = "add_time") private Integer addTime; /** 微信昵称 */ - @Column(name = "nickname",nullable = false) - @NotBlank + //@Column(name = "nickname",nullable = false) + //@NotBlank private String nickname; /** 所属门店 */ - @Column(name = "store_name") + //@Column(name = "store_name") private String storeName; public void copy(YxSystemStoreStaff source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java index f79585be..b4c50bdf 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java @@ -1,8 +1,6 @@ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; @@ -14,97 +12,97 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-12 */ -@Entity + @Data -@Table(name="yx_system_user_level") +@TableName("yx_system_user_level") public class YxSystemUserLevel implements Serializable { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + //@Column(name = "id") private Integer id; /** 商户id */ - @Column(name = "mer_id",nullable = false) - @NotNull + //@Column(name = "mer_id",nullable = false) + //@NotNull private Integer merId; /** 会员名称 */ - @Column(name = "name",nullable = false) - @NotBlank + //@Column(name = "name",nullable = false) + //@NotBlank private String name; /** 购买金额 */ - @Column(name = "money",nullable = false) - @NotNull + //@Column(name = "money",nullable = false) + //@NotNull private BigDecimal money; /** 有效时间 */ - @Column(name = "valid_date",nullable = false) - @NotNull + //@Column(name = "valid_date",nullable = false) + //@NotNull private Integer validDate; /** 是否为永久会员 */ - @Column(name = "is_forever",nullable = false) - @NotNull + //@Column(name = "is_forever",nullable = false) + //@NotNull private Integer isForever; /** 是否购买,1=购买,0=不购买 */ - @Column(name = "is_pay",nullable = false) - @NotNull + //@Column(name = "is_pay",nullable = false) + //@NotNull private Integer isPay; /** 是否显示 1=显示,0=隐藏 */ - @Column(name = "is_show",nullable = false) - @NotNull + //@Column(name = "is_show",nullable = false) + //@NotNull private Integer isShow; /** 会员等级 */ - @Column(name = "grade",nullable = false) - @NotNull + //@Column(name = "grade",nullable = false) + //@NotNull private Integer grade; /** 享受折扣 */ - @Column(name = "discount",nullable = false) - @NotNull + //@Column(name = "discount",nullable = false) + //@NotNull private BigDecimal discount; /** 会员卡背景 */ - @Column(name = "image",nullable = false) - @NotBlank + //@Column(name = "image",nullable = false) + //@NotBlank private String image; /** 会员图标 */ - @Column(name = "icon",nullable = false) - @NotBlank + //@Column(name = "icon",nullable = false) + //@NotBlank private String icon; /** 说明 */ @TableField(value = "`explain`") - @NotBlank + //@NotBlank private String explain; /** 添加时间 */ - @Column(name = "add_time",nullable = false) - @NotNull + //@Column(name = "add_time",nullable = false) + //@NotNull private Integer addTime; /** 是否删除.1=删除,0=未删除 */ - @Column(name = "is_del",nullable = false) - @NotNull + //@Column(name = "is_del",nullable = false) + //@NotNull private Integer isDel; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserTask.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserTask.java index b7fd9f46..ddd1534e 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserTask.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserTask.java @@ -1,8 +1,6 @@ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; @@ -13,78 +11,78 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-12 */ -@Entity + @Data -@Table(name="yx_system_user_task") +@TableName("yx_system_user_task") public class YxSystemUserTask implements Serializable { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + //@Column(name = "id") private Integer id; /** 任务名称 */ - @Column(name = "name",nullable = false) - @NotBlank + //@Column(name = "name",nullable = false) + //@NotBlank private String name; /** 配置原名 */ - @Column(name = "real_name",nullable = false) - @NotBlank + //@Column(name = "real_name",nullable = false) + //@NotBlank private String realName; /** 任务类型 */ - @Column(name = "task_type",nullable = false) - @NotBlank + //@Column(name = "task_type",nullable = false) + //@NotBlank private String taskType; /** 限定数 */ - @Column(name = "number",nullable = false) - @NotNull + //@Column(name = "number",nullable = false) + //@NotNull private Integer number; /** 等级id */ - @Column(name = "level_id",nullable = false) - @NotNull + //@Column(name = "level_id",nullable = false) + //@NotNull private Integer levelId; /** 排序 */ - @Column(name = "sort",nullable = false) - @NotNull + //@Column(name = "sort",nullable = false) + //@NotNull private Integer sort; /** 是否显示 */ - @Column(name = "is_show",nullable = false) - @NotNull + //@Column(name = "is_show",nullable = false) + //@NotNull private Integer isShow; /** 是否务必达成任务,1务必达成,0=满足其一 */ - @Column(name = "is_must",nullable = false) - @NotNull + //@Column(name = "is_must",nullable = false) + //@NotNull private Integer isMust; /** 任务说明 */ - @Column(name = "illustrate",nullable = false) - @NotBlank + //@Column(name = "illustrate",nullable = false) + //@NotBlank private String illustrate; /** 新增时间 */ - @Column(name = "add_time",nullable = false) - @NotNull + //@Column(name = "add_time",nullable = false) + //@NotNull private Integer addTime; public void copy(YxSystemUserTask source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUser.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUser.java index cc35ffac..908b45bd 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUser.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUser.java @@ -21,183 +21,183 @@ public class YxUser implements Serializable { /** 用户账户(跟accout一样) */ - @Column(name = "username") + //@Column(name = "username") private String username; /** 用户账号 */ - @Column(name = "account",nullable = false) - @NotBlank + //@Column(name = "account",nullable = false) + //@NotBlank private String account; /** 用户密码（跟pwd） */ - @Column(name = "password") + //@Column(name = "password") private String password; /** 用户密码 */ - @Column(name = "pwd",nullable = false) - @NotBlank + //@Column(name = "pwd",nullable = false) + //@NotBlank private String pwd; /** 真实姓名 */ - @Column(name = "real_name") + //@Column(name = "real_name") private String realName; /** 生日 */ - @Column(name = "birthday") + //@Column(name = "birthday") private Integer birthday; /** 身份证号码 */ - @Column(name = "card_id") + //@Column(name = "card_id") private String cardId; /** 用户备注 */ - @Column(name = "mark") + //@Column(name = "mark") private String mark; /** 合伙人id */ - @Column(name = "partner_id") + //@Column(name = "partner_id") private Integer partnerId; /** 用户分组id */ - @Column(name = "group_id") + //@Column(name = "group_id") private Integer groupId; /** 用户昵称 */ - @Column(name = "nickname") + //@Column(name = "nickname") private String nickname; /** 用户头像 */ - @Column(name = "avatar") + //@Column(name = "avatar") private String avatar; /** 手机号码 */ - @Column(name = "phone") + //@Column(name = "phone") private String phone; /** 添加时间 */ - @Column(name = "add_time",nullable = false) - @NotNull + //@Column(name = "add_time",nullable = false) + //@NotNull private Integer addTime; /** 添加ip */ - @Column(name = "add_ip") + //@Column(name = "add_ip") private String addIp; /** 最后一次登录时间 */ - @Column(name = "last_time",nullable = false) - @NotNull + //@Column(name = "last_time",nullable = false) + //@NotNull private Integer lastTime; /** 最后一次登录ip */ - @Column(name = "last_ip") + //@Column(name = "last_ip") private String lastIp; /** 用户余额 */ - @Column(name = "now_money",nullable = false) - @NotNull + //@Column(name = "now_money",nullable = false) + //@NotNull private BigDecimal nowMoney; /** 佣金金额 */ - @Column(name = "brokerage_price",nullable = false) - @NotNull + //@Column(name = "brokerage_price",nullable = false) + //@NotNull private BigDecimal brokeragePrice; /** 用户剩余积分 */ - @Column(name = "integral",nullable = false) - @NotNull + //@Column(name = "integral",nullable = false) + //@NotNull private BigDecimal integral; /** 连续签到天数 */ - @Column(name = "sign_num",nullable = false) - @NotNull + //@Column(name = "sign_num",nullable = false) + //@NotNull private Integer signNum; /** 1为正常，0为禁止 */ - @Column(name = "status",nullable = false) - @NotNull + //@Column(name = "status",nullable = false) + //@NotNull private Integer status; /** 等级 */ - @Column(name = "level",nullable = false) - @NotNull + //@Column(name = "level",nullable = false) + //@NotNull private Integer level; /** 推广元id */ - @Column(name = "spread_uid",nullable = false) - @NotNull + //@Column(name = "spread_uid",nullable = false) + //@NotNull private Integer spreadUid; /** 推广员关联时间 */ - @Column(name = "spread_time",nullable = false) - @NotNull + //@Column(name = "spread_time",nullable = false) + //@NotNull private Integer spreadTime; /** 用户类型 */ - @Column(name = "user_type",nullable = false) - @NotBlank + //@Column(name = "user_type",nullable = false) + //@NotBlank private String userType; /** 是否为推广员 */ - @Column(name = "is_promoter",nullable = false) - @NotNull + //@Column(name = "is_promoter",nullable = false) + //@NotNull private Integer isPromoter; /** 用户购买次数 */ - @Column(name = "pay_count") + //@Column(name = "pay_count") private Integer payCount; /** 下级人数 */ - @Column(name = "spread_count") + //@Column(name = "spread_count") private Integer spreadCount; /** 清理会员时间 */ - @Column(name = "clean_time") + //@Column(name = "clean_time") private Integer cleanTime; /** 详细地址 */ - @Column(name = "addres",nullable = false) - @NotBlank + //@Column(name = "addres",nullable = false) + //@NotBlank private String addres; /** 管理员编号 */ - @Column(name = "adminid") + //@Column(name = "adminid") private Integer adminid; /** 用户登陆类型，h5,wechat,routine */ - @Column(name = "login_type",nullable = false) - @NotBlank + //@Column(name = "login_type",nullable = false) + //@NotBlank private String loginType; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserBill.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserBill.java index c2a8e01f..b5304e6a 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserBill.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserBill.java @@ -1,8 +1,6 @@ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; @@ -14,85 +12,85 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-12 */ -@Entity + @Data -@Table(name="yx_user_bill") +@TableName("yx_user_bill") public class YxUserBill implements Serializable { /** 用户账单id */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + //@Column(name = "id") private Integer id; /** 用户uid */ - @Column(name = "uid",nullable = false) - @NotNull + //@Column(name = "uid",nullable = false) + //@NotNull private Integer uid; /** 关联id */ - @Column(name = "link_id",nullable = false) - @NotBlank + //@Column(name = "link_id",nullable = false) + //@NotBlank private String linkId; /** 0 = 支出 1 = 获得 */ - @Column(name = "pm",nullable = false) - @NotNull + //@Column(name = "pm",nullable = false) + //@NotNull private Integer pm; /** 账单标题 */ - @Column(name = "title",nullable = false) - @NotBlank + //@Column(name = "title",nullable = false) + //@NotBlank private String title; /** 明细种类 */ - @Column(name = "category",nullable = false) - @NotBlank + //@Column(name = "category",nullable = false) + //@NotBlank private String category; /** 明细类型 */ - @Column(name = "type",nullable = false) - @NotBlank + //@Column(name = "type",nullable = false) + //@NotBlank private String type; /** 明细数字 */ - @Column(name = "number",nullable = false) - @NotNull + //@Column(name = "number",nullable = false) + //@NotNull private BigDecimal number; /** 剩余 */ - @Column(name = "balance",nullable = false) - @NotNull + //@Column(name = "balance",nullable = false) + //@NotNull private BigDecimal balance; /** 备注 */ - @Column(name = "mark",nullable = false) - @NotBlank + //@Column(name = "mark",nullable = false) + //@NotBlank private String mark; /** 添加时间 */ - @Column(name = "add_time",nullable = false) - @NotNull + //@Column(name = "add_time",nullable = false) + //@NotNull private Integer addTime; /** 0 = 带确定 1 = 有效 -1 = 无效 */ - @Column(name = "status",nullable = false) - @NotNull + //@Column(name = "status",nullable = false) + //@NotNull private Integer status; public void copy(YxUserBill source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserRecharge.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserRecharge.java index 007ac682..cbb4add4 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserRecharge.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserRecharge.java @@ -1,8 +1,6 @@ package co.yixiang.modules.shop.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; @@ -14,63 +12,63 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-12 */ -@Entity + @Data -@Table(name="yx_user_recharge") +@TableName("yx_user_recharge") public class YxUserRecharge implements Serializable { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + //@Column(name = "id") private Integer id; /** 充值用户UID */ - @Column(name = "uid") + //@Column(name = "uid") private Integer uid; /** 订单号 */ - @Column(name = "order_id",unique = true) + //@Column(name = "order_id",unique = true) private String orderId; /** 充值金额 */ - @Column(name = "price") + //@Column(name = "price") private BigDecimal price; /** 充值类型 */ - @Column(name = "recharge_type") + //@Column(name = "recharge_type") private String rechargeType; /** 是否充值 */ - @Column(name = "paid") + //@Column(name = "paid") private Integer paid; /** 充值支付时间 */ - @Column(name = "pay_time") + //@Column(name = "pay_time") private Integer payTime; /** 充值时间 */ - @Column(name = "add_time") + //@Column(name = "add_time") private Integer addTime; /** 退款金额 */ - @Column(name = "refund_price") + //@Column(name = "refund_price") private BigDecimal refundPrice; /** 昵称 */ - @Column(name = "nickname") + //@Column(name = "nickname") private String nickname; public void copy(YxUserRecharge source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxWechatUser.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxWechatUser.java index c0e55574..56a6c1c3 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxWechatUser.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxWechatUser.java @@ -1,13 +1,8 @@ package co.yixiang.modules.shop.domain; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; - -import javax.persistence.Column; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.io.Serializable; @@ -24,124 +19,124 @@ public class YxWechatUser implements Serializable { /** 只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段 */ - @Column(name = "unionid") + //@Column(name = "unionid") private String unionid; /** 用户的标识，对当前公众号唯一 */ - @Column(name = "openid",unique = true) + //@Column(name = "openid",unique = true) private String openid; /** 小程序唯一身份ID */ - @Column(name = "routine_openid") + //@Column(name = "routine_openid") private String routineOpenid; /** 用户的昵称 */ - @Column(name = "nickname",nullable = false) - @NotBlank + //@Column(name = "nickname",nullable = false) + //@NotBlank private String nickname; /** 用户头像 */ - @Column(name = "headimgurl",nullable = false) - @NotBlank + //@Column(name = "headimgurl",nullable = false) + //@NotBlank private String headimgurl; /** 用户的性别，值为1时是男性，值为2时是女性，值为0时是未知 */ - @Column(name = "sex",nullable = false) - @NotNull + //@Column(name = "sex",nullable = false) + //@NotNull private Integer sex; /** 用户所在城市 */ - @Column(name = "city",nullable = false) - @NotBlank + //@Column(name = "city",nullable = false) + //@NotBlank private String city; /** 用户的语言，简体中文为zh_CN */ - @Column(name = "language",nullable = false) - @NotBlank + //@Column(name = "language",nullable = false) + //@NotBlank private String language; /** 用户所在省份 */ - @Column(name = "province",nullable = false) - @NotBlank + //@Column(name = "province",nullable = false) + //@NotBlank private String province; /** 用户所在国家 */ - @Column(name = "country",nullable = false) - @NotBlank + //@Column(name = "country",nullable = false) + //@NotBlank private String country; /** 公众号运营者对粉丝的备注，公众号运营者可在微信公众平台用户管理界面对粉丝添加备注 */ - @Column(name = "remark") + //@Column(name = "remark") private String remark; /** 用户所在的分组ID（兼容旧的用户分组接口） */ - @Column(name = "groupid") + //@Column(name = "groupid") private Integer groupid; /** 用户被打上的标签ID列表 */ - @Column(name = "tagid_list") + //@Column(name = "tagid_list") private String tagidList; /** 用户是否订阅该公众号标识 */ - @Column(name = "subscribe") + //@Column(name = "subscribe") private Integer subscribe; /** 关注公众号时间 */ - @Column(name = "subscribe_time") + //@Column(name = "subscribe_time") private Integer subscribeTime; /** 添加时间 */ - @Column(name = "add_time") + //@Column(name = "add_time") private Integer addTime; /** 一级推荐人 */ - @Column(name = "stair") + //@Column(name = "stair") private Integer stair; /** 二级推荐人 */ - @Column(name = "second") + //@Column(name = "second") private Integer second; /** 一级推荐人订单 */ - @Column(name = "order_stair") + //@Column(name = "order_stair") private Integer orderStair; /** 二级推荐人订单 */ - @Column(name = "order_second") + //@Column(name = "order_second") private Integer orderSecond; /** 佣金 */ - @Column(name = "now_money") + //@Column(name = "now_money") private BigDecimal nowMoney; /** 小程序用户会话密匙 */ - @Column(name = "session_key") + //@Column(name = "session_key") private String sessionKey; /** 用户类型 */ - @Column(name = "user_type") + //@Column(name = "user_type") private String userType; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/UserMoneyDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/UserMoneyDTO.java index e8ca278e..132e0383 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/UserMoneyDTO.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/UserMoneyDTO.java @@ -13,11 +13,11 @@ import java.io.Serializable; **/ @Data public class UserMoneyDTO implements Serializable { - @NotNull(message = "参数缺失") + //@NotNull(message = "参数缺失") private Integer uid; - @NotNull(message = "请选择修改余额方式") + //@NotNull(message = "请选择修改余额方式") private Integer ptype; - @NotNull(message = "金额必填") + //@NotNull(message = "金额必填") @Min(message = "最低金额为0",value = 0) private Double money; } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java index b5fb28b6..e5115a66 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java @@ -7,7 +7,8 @@ import co.yixiang.enums.OrderInfoEnum; import co.yixiang.exception.BadRequestException; import co.yixiang.exception.EntityExistException; import co.yixiang.modules.activity.domain.YxStorePink; -import co.yixiang.modules.activity.repository.StorePinkRepository; +import co.yixiang.modules.activity.service.YxStorePinkService; +import co.yixiang.modules.activity.service.mapper.YxStorePinkMapper; import co.yixiang.modules.shop.domain.*; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.modules.shop.service.*; @@ -54,7 +55,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl 0 || combinationId > 0){ - YxStorePink storePink = storePinkRepository.findByOrderIdKey(id); + YxStorePink storePink = storePinkService.getOne(new QueryWrapper(). + eq("order_id_key",id)); if(ObjectUtil.isNull(storePink)) { str = "[拼团订单]"; }else{ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/param/ExpressParam.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/param/ExpressParam.java index 9aceb031..43443b71 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/param/ExpressParam.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/param/ExpressParam.java @@ -11,7 +11,7 @@ import java.io.Serializable; **/ @Data public class ExpressParam implements Serializable { - //@NotBlank() + ////@NotBlank() private String orderCode; private String shipperCode; private String logisticCode; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/AlipayConfig.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/AlipayConfig.java index cae5cc6c..96384338 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/domain/AlipayConfig.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/AlipayConfig.java @@ -1,73 +1,74 @@ package co.yixiang.tools.domain; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import javax.persistence.*; import java.io.Serializable; /** * @author hupeng * @date 2020-05-13 */ -@Entity + @Data -@Table(name="alipay_config") +@TableName("alipay_config") public class AlipayConfig implements Serializable { /** 主键 */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + // @Column(name = "id") private Long id; /** 应用ID */ - @Column(name = "app_id") + // @Column(name = "app_id") private String appId; /** 编码 */ - @Column(name = "charset") + // @Column(name = "charset") private String charset; /** 类型 固定格式json */ - @Column(name = "format") + // @Column(name = "format") private String format; /** 网关地址 */ - @Column(name = "gateway_url") + // @Column(name = "gateway_url") private String gatewayUrl; /** 异步回调 */ - @Column(name = "notify_url") + // @Column(name = "notify_url") private String notifyUrl; /** 私钥 */ - @Column(name = "private_key") + // @Column(name = "private_key") private String privateKey; /** 公钥 */ - @Column(name = "public_key") + // @Column(name = "public_key") private String publicKey; /** 回调地址 */ - @Column(name = "return_url") + // @Column(name = "return_url") private String returnUrl; /** 签名方式 */ - @Column(name = "sign_type") + // @Column(name = "sign_type") private String signType; /** 商户号 */ - @Column(name = "sys_service_provider_id") + // @Column(name = "sys_service_provider_id") private String sysServiceProviderId; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/EmailConfig.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/EmailConfig.java index 367a2ca0..6497bcc2 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/domain/EmailConfig.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/EmailConfig.java @@ -1,4 +1,6 @@ package co.yixiang.tools.domain; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; @@ -9,40 +11,40 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-13 */ -@Entity + @Data -@Table(name="email_config") +@TableName("email_config") public class EmailConfig implements Serializable { /** ID */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + // @Column(name = "id") private Long id; /** 收件人 */ - @Column(name = "from_user") + // @Column(name = "from_user") private String fromUser; /** 邮件服务器SMTP地址 */ - @Column(name = "host") + // @Column(name = "host") private String host; /** 密码 */ - @Column(name = "pass") + // @Column(name = "pass") private String pass; /** 端口 */ - @Column(name = "port") + // @Column(name = "port") private String port; /** 发件者用户名 */ - @Column(name = "user") + // @Column(name = "user") private String user; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java index 2c5a95f8..387b4261 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java @@ -1,4 +1,6 @@ package co.yixiang.tools.domain; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; @@ -12,54 +14,54 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-13 */ -@Entity + @Data -@Table(name="local_storage") +@TableName("local_storage") public class LocalStorage implements Serializable { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + // @Column(name = "id") private Long id; /** 文件真实的名称 */ - @Column(name = "real_name") + // @Column(name = "real_name") private String realName; /** 文件名 */ - @Column(name = "name") + // @Column(name = "name") private String name; /** 后缀 */ - @Column(name = "suffix") + // @Column(name = "suffix") private String suffix; /** 路径 */ - @Column(name = "path") + // @Column(name = "path") private String path; /** 类型 */ - @Column(name = "type") + // @Column(name = "type") private String type; /** 大小 */ - @Column(name = "size") + // @Column(name = "size") private String size; /** 操作人 */ - @Column(name = "operate") + // @Column(name = "operate") private String operate; /** 创建日期 */ - @Column(name = "create_time") + // @Column(name = "create_time") @TableField(fill= FieldFill.INSERT) private Timestamp createTime; public LocalStorage(String realName,String name, String suffix, String path, String type, String size, String operate) { diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/Picture.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/Picture.java index 9354a131..e9df3d90 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/domain/Picture.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/Picture.java @@ -1,4 +1,6 @@ package co.yixiang.tools.domain; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; @@ -12,61 +14,61 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-13 */ -@Entity + @Data -@Table(name="picture") +@TableName("picture") public class Picture implements Serializable { /** ID */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + // @Column(name = "id") private Long id; /** 上传日期 */ - @Column(name = "create_time") + // @Column(name = "create_time") @TableField(fill= FieldFill.INSERT) private Timestamp createTime; /** 删除的URL */ - @Column(name = "delete_url") + // @Column(name = "delete_url") private String deleteUrl; /** 图片名称 */ - @Column(name = "filename") + // @Column(name = "filename") private String filename; /** 图片高度 */ - @Column(name = "height") + // @Column(name = "height") private String height; /** 图片大小 */ - @Column(name = "size") + // @Column(name = "size") private String size; /** 图片地址 */ - @Column(name = "url") + // @Column(name = "url") private String url; /** 用户名称 */ - @Column(name = "username") + // @Column(name = "username") private String username; /** 图片宽度 */ - @Column(name = "width") + // @Column(name = "width") private String width; /** 文件的MD5值 */ - @Column(name = "md5code") + // @Column(name = "md5code") private String md5code; public void copy(Picture source){ diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuConfig.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuConfig.java index a88bb16b..e35e0998 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuConfig.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuConfig.java @@ -1,4 +1,6 @@ package co.yixiang.tools.domain; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; @@ -10,46 +12,46 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-13 */ -@Entity + @Data -@Table(name="qiniu_config") +@TableName("qiniu_config") public class QiniuConfig implements Serializable { /** ID */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + // @Column(name = "id") private Long id; /** accessKey */ - @Column(name = "access_key") + // @Column(name = "access_key") private String accessKey; /** Bucket 识别符 */ - @Column(name = "bucket") + // @Column(name = "bucket") private String bucket; /** 外链域名 */ - @Column(name = "host",nullable = false) + // @Column(name = "host",nullable = false) @NotBlank private String host; /** secretKey */ - @Column(name = "secret_key") + // @Column(name = "secret_key") private String secretKey; /** 空间类型 */ - @Column(name = "type") + // @Column(name = "type") private String type; /** 机房 */ - @Column(name = "zone") + // @Column(name = "zone") private String zone; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuContent.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuContent.java index d0b60c30..dc8df42d 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuContent.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuContent.java @@ -1,4 +1,6 @@ package co.yixiang.tools.domain; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; @@ -12,50 +14,50 @@ import java.io.Serializable; * @author hupeng * @date 2020-05-13 */ -@Entity + @Data -@Table(name="qiniu_content") +@TableName("qiniu_content") public class QiniuContent implements Serializable { /** ID */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) + // @Column(name = "id") private Long id; /** Bucket 识别符 */ - @Column(name = "bucket") + // @Column(name = "bucket") private String bucket; /** 文件名称 */ - @Column(name = "name") + // @Column(name = "name") private String name; /** 文件大小 */ - @Column(name = "size") + // @Column(name = "size") private String size; /** 文件类型：私有或公开 */ - @Column(name = "type") + // @Column(name = "type") private String type; /** 上传或同步的时间 */ - @Column(name = "update_time") + // @Column(name = "update_time") @TableField(fill= FieldFill.INSERT_UPDATE) private Timestamp updateTime; /** 文件url */ - @Column(name = "url") + // @Column(name = "url") private String url; - @Column(name = "suffix") + // @Column(name = "suffix") private String suffix; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/VerificationCode.java b/yshop-tools/src/main/java/co/yixiang/tools/domain/VerificationCode.java index 690e30f1..27b1d2d4 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/domain/VerificationCode.java +++ b/yshop-tools/src/main/java/co/yixiang/tools/domain/VerificationCode.java @@ -1,11 +1,12 @@ package co.yixiang.tools.domain; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import org.hibernate.annotations.CreationTimestamp; -import javax.persistence.*; import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.sql.Timestamp; @@ -15,14 +16,13 @@ import java.sql.Timestamp; * @date 2018-12-26 */ @Data -@Entity @AllArgsConstructor @NoArgsConstructor -@Table(name = "verification_code") +@TableName("verification_code") public class VerificationCode implements Serializable { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) + @TableId + //@GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; private String code; @@ -34,16 +34,14 @@ public class VerificationCode implements Serializable { private Boolean status = true; /** 类型 ：phone 和 email */ - @NotBlank private String type; /** 具体的phone与email */ - @NotBlank private String value; /** 创建日期 */ @CreationTimestamp - @Column(name = "create_time") + // @Column(name = "create_time") private Timestamp createTime; public VerificationCode(String code, String scenes, @NotBlank String type, @NotBlank String value) { diff --git a/yshop-tools/src/main/java/co/yixiang/tools/repository/VerificationCodeRepository.java b/yshop-tools/src/main/java/co/yixiang/tools/repository/VerificationCodeRepository.java deleted file mode 100644 index 80802889..00000000 --- a/yshop-tools/src/main/java/co/yixiang/tools/repository/VerificationCodeRepository.java +++ /dev/null @@ -1,20 +0,0 @@ -package co.yixiang.tools.repository; - -import co.yixiang.tools.domain.VerificationCode; -import org.springframework.data.jpa.repository.JpaRepository; - -/** - * @author Zheng Jie - * @date 2018-12-26 - */ -public interface VerificationCodeRepository extends JpaRepository { - - /** - * 获取有效的验证码 - * @param scenes 业务场景，如重置密码，重置邮箱等等 - * @param type 类型 - * @param value 值 - * @return VerificationCode - */ - VerificationCode findByScenesAndTypeAndValueAndStatusIsTrue(String scenes, String type, String value); -}