fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/Special.java
@@ -3,15 +3,8 @@ import java.io.Serializable; import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; import org.yeshi.utils.mybatis.Column; import org.yeshi.utils.mybatis.Table; import com.google.gson.annotations.Expose; import com.yeshi.fanli.entity.common.JumpDetailV2; @@ -23,91 +16,72 @@ * * @date 2018年10月23日 */ @Entity @Table(name = "yeshi_ec_special") @org.yeshi.utils.mybatis.Table("yeshi_ec_special") @Table("yeshi_ec_special") public class Special implements Serializable { private static final long serialVersionUID = 1L; @Id @Column(name = "b_id") @GeneratedValue(strategy = GenerationType.AUTO) @org.yeshi.utils.mybatis.Column(name = "b_id") private Long id; // 名称 @Expose @JoinColumn(name = "b_name") @org.yeshi.utils.mybatis.Column(name = "b_name") @Column(name = "b_name") private String name; // 唯一标识 @JoinColumn(name = "b_card") @org.yeshi.utils.mybatis.Column(name = "b_card") @Column(name = "b_card") private String card; // 标识管理id @Expose @JoinColumn(name = "b_card_id") @org.yeshi.utils.mybatis.Column(name = "b_card_id") @Column(name = "b_card_id") private Long cardId; // 主图 @Expose @JoinColumn(name = "b_main_picture") @org.yeshi.utils.mybatis.Column(name = "b_main_picture") @Column(name = "b_main_picture") private String picture; // 附图 @Expose @JoinColumn(name = "b_sub_picture") @org.yeshi.utils.mybatis.Column(name = "b_sub_picture") @Column(name = "b_sub_picture") private String subPicture; // 跳转详情 @Expose @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "b_jumpid") @org.yeshi.utils.mybatis.Column(name = "b_jumpid") @Column(name = "b_jumpid") private JumpDetailV2 jumpDetail; // 跳转参数 @Expose @JoinColumn(name = "b_params") @org.yeshi.utils.mybatis.Column(name = "b_params") @Column(name = "b_params") private String params; // 排序 @JoinColumn(name = "b_orderby") @org.yeshi.utils.mybatis.Column(name = "b_orderby") @Column(name = "b_orderby") private Integer orderby; // 状态 @JoinColumn(name = "b_state") @org.yeshi.utils.mybatis.Column(name = "b_state") @Column(name = "b_state") private Long state; // 显示类型 @Expose @JoinColumn(name = "b_show_type") @org.yeshi.utils.mybatis.Column(name = "b_show_type") @Column(name = "b_show_type") private String showType; // 备注 @JoinColumn(name = "b_remark") @org.yeshi.utils.mybatis.Column(name = "b_remark") @Column(name = "b_remark") private String remark; // 创建时间 @JoinColumn(name = "b_createtime") @org.yeshi.utils.mybatis.Column(name = "b_createtime") @Column(name = "b_createtime") private Date createtime; // 更新时间 @JoinColumn(name = "b_updatetime") @org.yeshi.utils.mybatis.Column(name = "b_updatetime") @Column(name = "b_updatetime") private Date updatetime; fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SpecialCard.java
@@ -4,14 +4,8 @@ import java.util.Date; import java.util.List; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.Table; import javax.persistence.Transient; import org.yeshi.utils.mybatis.Column; import org.yeshi.utils.mybatis.Table; import com.yeshi.fanli.entity.system.BusinessSystem; @@ -22,49 +16,38 @@ * * @date 2018年10月23日 */ @Entity @Table(name = "yeshi_ec_special_card") @org.yeshi.utils.mybatis.Table("yeshi_ec_special_card") @Table("yeshi_ec_special_card") public class SpecialCard implements Serializable{ private static final long serialVersionUID = 1L; @Id @Column(name = "cd_id") @GeneratedValue(strategy = GenerationType.AUTO) @org.yeshi.utils.mybatis.Column(name = "cd_id") private Long id; // 名称 @JoinColumn(name = "cd_name") @org.yeshi.utils.mybatis.Column(name = "cd_name") @Column(name = "cd_name") private String name; // 匹配标识 @JoinColumn(name = "cd_card") @org.yeshi.utils.mybatis.Column(name = "cd_card") @Column(name = "cd_card") private String card; // 匹配标识 @JoinColumn(name = "cd_state") @org.yeshi.utils.mybatis.Column(name = "cd_state") @Column(name = "cd_state") private Integer state; // 创建时间 @JoinColumn(name = "cd_createtime") @org.yeshi.utils.mybatis.Column(name = "cd_createtime") @Column(name = "cd_createtime") private Date createtime; // 更新时间(修改时间) @JoinColumn(name = "cd_updatetime") @org.yeshi.utils.mybatis.Column(name = "cd_updatetime") @Column(name = "cd_updatetime") private Date updatetime; @Transient private Long totalSpecial; @Transient // 系统关联列表 private Long totalSpecial; // 系统关联列表 private List<BusinessSystem> systemList; fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SuperSpecial.java
@@ -2,15 +2,8 @@ import java.io.Serializable; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; import org.yeshi.utils.mybatis.Column; import org.yeshi.utils.mybatis.Table; import com.yeshi.fanli.entity.system.BusinessSystem; @@ -21,29 +14,20 @@ * * @date 2018年10月23日 */ @Entity @Table(name = "yeshi_ec_super_special") @org.yeshi.utils.mybatis.Table("yeshi_ec_super_special") @Table("yeshi_ec_super_special") public class SuperSpecial implements Serializable { private static final long serialVersionUID = 1L; @Id @Column(name = "sup_id") @GeneratedValue(strategy = GenerationType.AUTO) @org.yeshi.utils.mybatis.Column(name = "sup_id") private Long id; // 名称 @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "sup_special_id") @org.yeshi.utils.mybatis.Column(name = "sup_special_id") @Column(name = "sup_special_id") private Special special; // 唯一标识 @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "sup_system_id") @org.yeshi.utils.mybatis.Column(name = "sup_system_id") @Column(name = "sup_system_id") private BusinessSystem system; public Long getId() { fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SuperSpecialCard.java
@@ -2,15 +2,8 @@ import java.io.Serializable; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; import org.yeshi.utils.mybatis.Column; import org.yeshi.utils.mybatis.Table; import com.yeshi.fanli.entity.system.BusinessSystem; @@ -21,29 +14,20 @@ * * @date 2018年11月08日 */ @Entity @Table(name = "yeshi_ec_super_special_card") @org.yeshi.utils.mybatis.Table("yeshi_ec_super_special_card") @Table("yeshi_ec_super_special_card") public class SuperSpecialCard implements Serializable { private static final long serialVersionUID = 1L; @Id @Column(name = "sp_id") @GeneratedValue(strategy = GenerationType.AUTO) @org.yeshi.utils.mybatis.Column(name = "sp_id") private Long id; // 专题管理 @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "sp_special_cid") @org.yeshi.utils.mybatis.Column(name = "sp_special_cid") @Column(name = "sp_special_cid") private SpecialCard specialCard; // 系统 @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "sp_system_id") @org.yeshi.utils.mybatis.Column(name = "sp_system_id") @Column(name = "sp_system_id") private BusinessSystem system; fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/BoutiqueAutoRule.java
@@ -1,19 +1,11 @@ package com.yeshi.fanli.entity.bus.lable; import java.io.Serializable; import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.Table; import javax.persistence.Transient; import org.springframework.format.annotation.DateTimeFormat; import org.yeshi.utils.mybatis.Column; import org.yeshi.utils.mybatis.Table; import com.yeshi.fanli.entity.common.AdminUser; @@ -25,15 +17,8 @@ * * @date 2018年8月2日 */ @Entity @Table(name = "yeshi_ec_boutique_auto_rule") @org.yeshi.utils.mybatis.Table("yeshi_ec_boutique_auto_rule") public class BoutiqueAutoRule implements Serializable{ /** * */ private static final long serialVersionUID = 1L; @Table("yeshi_ec_boutique_auto_rule") public class BoutiqueAutoRule { // 淘宝物料API public final static int TB_OPTIONAL = 1; @@ -47,142 +32,87 @@ @Id @Column(name = "sr_id") @GeneratedValue(strategy = GenerationType.AUTO) @org.yeshi.utils.mybatis.Column(name = "sr_id") private Long id; @JoinColumn(name = "sr_source") @org.yeshi.utils.mybatis.Column(name = "sr_source") @Column(name = "sr_source") private Integer source; // 来源 @JoinColumn(name = "sr_title") @org.yeshi.utils.mybatis.Column(name = "sr_title") @Column(name = "sr_title") private String title; // 任务名称 @JoinColumn(name = "sr_search_content") @org.yeshi.utils.mybatis.Column(name = "sr_search_content") @Column(name = "sr_search_content") private String searchContent; // 任务内容 @JoinColumn(name = "sr_class_name") @org.yeshi.utils.mybatis.Column(name = "sr_class_name") @Column(name = "sr_class_name") private String className; // 主类目 @JoinColumn(name = "sr_subclass_name") @org.yeshi.utils.mybatis.Column(name = "sr_subclass_name") @Column(name = "sr_subclass_name") private String subclassName; // 子类目 @JoinColumn(name = "sr_execute_day") @org.yeshi.utils.mybatis.Column(name = "sr_execute_day") @Column(name = "sr_execute_day") private String executeDay; // 执行相隔天数 @JoinColumn(name = "sr_execute_time") @org.yeshi.utils.mybatis.Column(name = "sr_execute_time") @Column(name = "sr_execute_time") private String executeTime; // 执行时间 @JoinColumn(name = "sr_cron_time") @org.yeshi.utils.mybatis.Column(name = "sr_cron_time") @Column(name = "sr_cron_time") private String cronTime; // cron执行时间 @JoinColumn(name = "sr_state") @org.yeshi.utils.mybatis.Column(name = "sr_state") @Column(name = "sr_state") private Integer state; // 状态:1启用 0停用 @JoinColumn(name = "sr_start_time") @org.yeshi.utils.mybatis.Column(name = "sr_start_time") @Column(name = "sr_start_time") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date startTime; // 生效时间 @JoinColumn(name = "sr_end_time") @org.yeshi.utils.mybatis.Column(name = "sr_end_time") @Column(name = "sr_end_time") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date endTime; // 失效时间 @JoinColumn(name = "sr_createtime") @org.yeshi.utils.mybatis.Column(name = "sr_createtime") @Column(name = "sr_createtime") private Date createtime; // 创建时间 @JoinColumn(name = "sr_updatetime") @org.yeshi.utils.mybatis.Column(name = "sr_updatetime") @Column(name = "sr_updatetime") private Date updatetime; // 更新时间(修改时间) @Transient private String key; // 搜索关键词 @Transient private String cateIds; // 官方推荐商品库投放ID;淘宝类目id集合 @Transient private Integer startSales; // 销量小值 @Transient private Integer endSales; // 销量大值 @Transient private Double startZkPrice; // 在售价范围小值 @Transient private Double endZkPrice; // 在售价范围大值 @Transient private Double startPrice; // 券后价范围小值 @Transient private Double endPrice; // 券后价范围大值 @Transient private Double startTkRate; // 佣金范围小值 @Transient private Double endTkRate; // 佣金范围大值 @Transient private Integer isTmall; // 是否天猫 @Transient private Integer hasCoupon; // 是否有券:1 有 0 无 @Transient private Integer freeShipment; // 是否包邮:1 有 0 无 @Transient private Integer needPrepay; // 是否消费保障:1有 0 无 @Transient private Integer npxLevel; // 牛皮癣程度,取值:1:不限,2:无,3:轻微 @Transient private Integer includePayRate30; // 成交转化是否高于行业均值 1 有 0 无 @Transient private Integer includeGoodRate; // 好评率是否高于行业均值 1 有 0 无 @Transient private Integer includeRfdRate; // 退款率是否低于行业均值 1 有 0 无 @Transient private String lableNames; // 标签名称:空格隔开 @Transient private String classNameChinese; // 淘宝类目名称 @Transient private Integer maxPage; // 请求最大页数 @Transient private int goodsSource; // 权重结束 @Transient private String sourceCalss; // 具体来源 @Transient private String systemCid;// 系统分类id @Transient private boolean calss9k9; // 是否9k9类目 @Transient private boolean flashSale; // 是否加入限时抢购 @Transient private int startWeight; // 权重起始 @Transient private int endWeight; // 权重结束 @Transient private AdminUser adminUser;