fanli/src/main/java/com/yeshi/fanli/entity/bus/invite/SpreadUserImg.java
@@ -2,46 +2,37 @@ 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.Table; import javax.persistence.Transient; import org.yeshi.utils.mybatis.Column; import org.yeshi.utils.mybatis.Table; import com.google.gson.annotations.Expose; @Entity @Table(name = "yeshi_ec_spread_user_img") @org.yeshi.utils.mybatis.Table("yeshi_ec_spread_user_img") @Table("yeshi_ec_spread_user_img") public class SpreadUserImg { @Id @GeneratedValue(strategy = GenerationType.AUTO) @Column(name = "si_id") @org.yeshi.utils.mybatis.Column(name="si_id") @Column(name="si_id") @Expose private Long id; @org.yeshi.utils.mybatis.Column(name="si_uid") @Column(name = "si_uid") @Column(name="si_uid") @Expose private Long uid; @org.yeshi.utils.mybatis.Column(name="si_type") @Column(name = "si_type") @Column(name="si_type") @Expose private Integer type; @org.yeshi.utils.mybatis.Column(name="si_url") @Expose @Column(name="si_url") @Expose private String url; @org.yeshi.utils.mybatis.Column(name="si_createtime") @Expose @Column(name="si_createtime") @Expose private Date createtime; @Transient fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/Honest.java
@@ -11,7 +11,6 @@ import com.yeshi.fanli.entity.common.JumpDetail; @Entity @Table(name="yeshi_ec_honest") public class Honest implements Serializable{ fanli/src/main/java/com/yeshi/fanli/entity/bus/recommend/RecommendBanner.java
@@ -18,8 +18,6 @@ @Column(name = "id") private Long id; // @ManyToOne(fetch = FetchType.EAGER) // @JoinColumn(name = "jumpid") @Column(name="jumpid") private JumpDetail jumpDetail;// 跳转详情 @Column(name = "params") fanli/src/main/java/com/yeshi/fanli/entity/bus/user/AccountMessage.java
@@ -1,13 +1,7 @@ package com.yeshi.fanli.entity.bus.user; 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.ManyToOne; import javax.persistence.Table; import org.yeshi.utils.mybatis.Column; import org.yeshi.utils.mybatis.Table; import com.google.gson.annotations.Expose; @@ -17,41 +11,33 @@ * * @date 2018年1月29日 */ @Entity @Table(name="yeshi_ec_account_message") @org.yeshi.utils.mybatis.Table("yeshi_ec_account_message") @Table("yeshi_ec_account_message") public class AccountMessage { @org.yeshi.utils.mybatis.Column(name="id") @Id @GeneratedValue(strategy=GenerationType.AUTO) @Expose @Column(name="id") private Long id; @org.yeshi.utils.mybatis.Column(name="uid") @ManyToOne @JoinColumn(name="uid") @Column(name="uid") private UserInfo userInfo; @org.yeshi.utils.mybatis.Column(name="title") @Column(name="title") @Expose private String title; @org.yeshi.utils.mybatis.Column(name="content") @Column(name="content") @Expose private String content; @org.yeshi.utils.mybatis.Column(name="createTime") @Column(name="createTime") @Expose private Long createTime; @org.yeshi.utils.mybatis.Column(name="isOpen") @Column(name="isOpen") @Expose private Boolean isOpen; @org.yeshi.utils.mybatis.Column(name="system_msg_id") @Expose @Column(name="system_msg_id") @Expose private Long systemMsgId; public Long getId() { fanli/src/main/java/com/yeshi/fanli/entity/bus/user/BindingAccount.java
@@ -1,14 +1,8 @@ package com.yeshi.fanli.entity.bus.user; 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; @@ -18,34 +12,26 @@ * * @date 2018年1月29日 */ @Entity @Table(name="yeshi_ec_binding_account") @org.yeshi.utils.mybatis.Table("yeshi_ec_binding_account") @Table("yeshi_ec_binding_account") public class BindingAccount { public static final int TYPE_ALIPAY=1; public static final int TYPE_WXPAY=2; @Id @GeneratedValue(strategy=GenerationType.AUTO) @Column(name="`id`") @Expose @org.yeshi.utils.mybatis.Column(name="id") @Column(name="id") private Long id; @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "uid") @org.yeshi.utils.mybatis.Column(name="uid") @Column(name="uid") private UserInfo userInfo; @Expose @org.yeshi.utils.mybatis.Column(name="account") @Column(name="account") private String account; @Expose @org.yeshi.utils.mybatis.Column(name="type") @Column(name="type") private Integer type; //1.支付宝 2.微信 @Expose @org.yeshi.utils.mybatis.Column(name="name") @Column(name="name") private String name; public Long getId() { fanli/src/main/java/com/yeshi/fanli/entity/bus/user/HongBaoManage.java
@@ -1,11 +1,7 @@ package com.yeshi.fanli.entity.bus.user; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; import org.yeshi.utils.mybatis.Column; import org.yeshi.utils.mybatis.Table; /** * 红包相关参数设置 @@ -13,24 +9,15 @@ * * @date 2018年1月29日 */ @Entity @Table(name="yeshi_ec_hongbao_manage") @org.yeshi.utils.mybatis.Table("yeshi_ec_hongbao_manage") @Table("yeshi_ec_hongbao_manage") public class HongBaoManage { @Id @GeneratedValue(strategy = GenerationType.AUTO) @Column(name = "id") @org.yeshi.utils.mybatis.Column(name="id") @Column(name="id") private Long id; @Column(name="`key`") @org.yeshi.utils.mybatis.Column(name="key") @Column(name="key") private String key; @Column(name="`value`") @org.yeshi.utils.mybatis.Column(name="value") @Column(name="value") private String value; @Column(name="`remark`") @org.yeshi.utils.mybatis.Column(name="remark") @Column(name="remark") private String remark; public HongBaoManage() { fanli/src/main/java/com/yeshi/fanli/entity/bus/user/LostOrder.java
@@ -1,10 +1,5 @@ package com.yeshi.fanli.entity.bus.user; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Transient; import org.yeshi.utils.mybatis.Column; @@ -33,8 +28,6 @@ public final static int TYPE_TAOBAO = 1; @Id @GeneratedValue(strategy = GenerationType.AUTO) @Expose @Column(name = "id") private Long id; @@ -55,14 +48,10 @@ private Long handleTime; @Column(name = "uid") @ManyToOne @JoinColumn(name = "uid") @Expose private UserInfo userInfo; @Column(name = "oid") @ManyToOne @JoinColumn(name = "oid") @Expose private Order order; @Column(name = "remake") @@ -73,7 +62,6 @@ private String judge;// 系统判定:如果用户在本系统购买并成功上传过订单,且上传的丢失订单后6位相同的话,那么系统判定为匹配 @Column(name = "result_code") @javax.persistence.Column(name = "result_code") @Expose private Integer resultCode;// 第三方平台订单爬取结果 @Column(name = "ip_info") fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Order.java
@@ -4,13 +4,9 @@ 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 javax.persistence.UniqueConstraint; @@ -22,7 +18,6 @@ * @author Administrator * */ @Entity @Table(name = "yeshi_ec_order", uniqueConstraints = @UniqueConstraint(columnNames = { "orderid", "order_type" }) ) @org.yeshi.utils.mybatis.Table("yeshi_ec_order") public class Order { @@ -68,8 +63,6 @@ private Long createtime;// 创建时间 付款时间 @org.yeshi.utils.mybatis.Column(name = "uid") @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "uid") @Expose private UserInfo userInfo; @@ -116,11 +109,6 @@ */ @org.yeshi.utils.mybatis.Column(name = "version") private Integer version; // @OneToMany(fetch = FetchType.EAGER) // @JoinTable(name = "yeshi_ec_order_item", joinColumns = { @JoinColumn(name = "oid") }, inverseJoinColumns = { // @JoinColumn(name = "id") }) // private List<OrderItem> orderItemList = new ArrayList<OrderItem>(); public Order() { money = BigDecimal.valueOf(0); fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ShamUser.java
@@ -11,7 +11,6 @@ import com.google.gson.annotations.Expose; //假用户 @Entity @Table(name = "yeshi_ec_sham_user") @org.yeshi.utils.mybatis.Table("yeshi_ec_sham_user") public class ShamUser { fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java
@@ -19,7 +19,6 @@ * * @date 2018年1月29日 */ @Entity @Table(name = "yeshi_ec_threeSale") @org.yeshi.utils.mybatis.Table("yeshi_ec_threeSale") public class ThreeSale { @@ -40,13 +39,11 @@ public ThreeSale() { } @ManyToOne @JoinColumn(name = "boss_id") @Column(name = "boss_id") private UserInfo boss;// 邀请者 @OneToOne @JoinColumn(name = "worker_id") @Column(name = "worker_id") private UserInfo worker; // 被邀请者 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSaleExtraInfo.java
@@ -3,13 +3,9 @@ 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; /** @@ -17,7 +13,6 @@ * * @date 2018年11月20日 */ @Entity @Table(name = "yeshi_ec_threesale_extra_info") @org.yeshi.utils.mybatis.Table("yeshi_ec_threesale_extra_info") public class ThreeSaleExtraInfo { @@ -28,33 +23,27 @@ @org.yeshi.utils.mybatis.Column(name = "tf_id") private Long id; @JoinColumn(name = "tf_boss_id") @ManyToOne(fetch = FetchType.EAGER) @org.yeshi.utils.mybatis.Column(name = "tf_boss_id") private UserInfo boss;//邀请者 @JoinColumn(name = "tf_worker_id") @ManyToOne(fetch = FetchType.EAGER) @org.yeshi.utils.mybatis.Column(name = "tf_worker_id") private UserInfo worker; //被邀请者 @JoinColumn(name = "tf_nickname") @org.yeshi.utils.mybatis.Column(name = "tf_nickname") private String nickname; // 备注名 @JoinColumn(name = "tf_remind_boss") @org.yeshi.utils.mybatis.Column(name = "tf_remind_boss") private Integer remindBoss; // 提示boss绑定微信 1 已提醒 @JoinColumn(name = "tf_remind_worker") @org.yeshi.utils.mybatis.Column(name = "tf_remind_worker") private Integer remindWorker; // 提示worker绑定微信 1 已提醒 @JoinColumn(name = "tf_createtime") @org.yeshi.utils.mybatis.Column(name = "tf_createtime") private Date createTime; // 创建时间 @JoinColumn(name = "tf_updatetime") @org.yeshi.utils.mybatis.Column(name = "tf_updatetime") private Date updateTime; // 更新时间 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSaleRank.java
@@ -12,7 +12,6 @@ * * @date 2018年1月29日 */ @Entity @Table(name="yeshi_ec_three_sale_rank") public class ThreeSaleRank { fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java
@@ -108,8 +108,6 @@ private String payPassword; @Column(name = "sid") @ManyToOne @JoinColumn(name = "sid") private BusinessSystem system; @Column(name = "rank") fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserRankings.java
@@ -18,7 +18,6 @@ * * @date 2018年7月27日 */ @Entity @Table(name = "yeshi_ec_rankings_record") @org.yeshi.utils.mybatis.Table("yeshi_ec_rankings_record") public class UserRankings { @@ -30,43 +29,33 @@ @org.yeshi.utils.mybatis.Column(name = "r_id") private Long id; @JoinColumn(name = "r_show_id") @org.yeshi.utils.mybatis.Column(name = "r_show_id") private String showId; // 显示id @JoinColumn(name = "r_nick_name") @org.yeshi.utils.mybatis.Column(name = "r_nick_name") private String nickName;// 名称 @JoinColumn(name = "r_portrait") @org.yeshi.utils.mybatis.Column(name = "r_portrait") private String portrait; //头像url @JoinColumn(name = "r_trade_reward") @org.yeshi.utils.mybatis.Column(name = "r_trade_reward") private BigDecimal tradeReward; // 自购奖励 @JoinColumn(name = "r_share_reward") @org.yeshi.utils.mybatis.Column(name = "r_share_reward") private BigDecimal shareReward; // 分享奖励 @JoinColumn(name = "r_trade_state") @org.yeshi.utils.mybatis.Column(name = "r_trade_state") private Integer tradeState; // 自购在线状态 @JoinColumn(name = "r_share_state") @org.yeshi.utils.mybatis.Column(name = "r_share_state") private Integer shareState; // 分享在线状态 @JoinColumn(name = "r_trade_time") @org.yeshi.utils.mybatis.Column(name = "r_trade_time") private Date tradeTime; // 自购榜 最后入榜时间 @JoinColumn(name = "r_share_time") @org.yeshi.utils.mybatis.Column(name = "r_share_time") private Date shareTime; // 分享榜 最后入榜时间 @JoinColumn(name = "r_createtime") @org.yeshi.utils.mybatis.Column(name = "r_createtime") private Date createtime; // 创建时间 fanli/src/main/java/com/yeshi/fanli/entity/common/DataMonitor.java
@@ -17,7 +17,6 @@ * @author Administrator * */ @Entity @Table(name = "`yeshi_ec_monitor_data`") @org.yeshi.utils.mybatis.Table("yeshi_ec_monitor_data") public class DataMonitor { fanli/src/main/java/com/yeshi/fanli/entity/common/JumpDetailV2.java
@@ -18,7 +18,6 @@ * * @date 2018年10月23日 */ @Entity @Table(name = "yeshi_ec_action_jumpdetail_v2") @org.yeshi.utils.mybatis.Table("yeshi_ec_action_jumpdetail_v2") public class JumpDetailV2 implements Serializable { fanli/src/main/java/com/yeshi/fanli/entity/push/DeviceTokenIOS.java
@@ -10,7 +10,6 @@ import org.yeshi.utils.mybatis.Column; import org.yeshi.utils.mybatis.Table; @Entity @Table("yeshi_ec_uid_devicetoken_ios") public class DeviceTokenIOS { fanli/src/main/java/com/yeshi/fanli/entity/push/PushQueueRecord.java
@@ -10,7 +10,6 @@ import javax.persistence.Table; @Entity @Table(name="yeshi_ec_push_queue") @org.yeshi.utils.mybatis.Table("yeshi_ec_push_queue") public class PushQueueRecord { fanli/src/main/java/com/yeshi/fanli/entity/system/BusinessSystem.java
@@ -16,7 +16,6 @@ * @author Administrator * */ @Entity @Table(name = "yeshi_ec_system") @org.yeshi.utils.mybatis.Table("yeshi_ec_system") public class BusinessSystem implements Serializable{ fanli/src/main/java/com/yeshi/fanli/entity/taobao/TBPid.java
@@ -8,7 +8,6 @@ import org.yeshi.utils.mybatis.Column; @Entity @Table(name = "yeshi_ec_pid") @org.yeshi.utils.mybatis.Table("yeshi_ec_pid") public class TBPid { fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaobaoMeterial.java
@@ -8,7 +8,6 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.Table; /** @@ -18,7 +17,6 @@ * * @date 2018年8月24日 */ @Entity @Table(name = "yeshi_ec_taobao_meterial") @org.yeshi.utils.mybatis.Table("yeshi_ec_taobao_meterial") public class TaobaoMeterial implements Serializable{ @@ -35,24 +33,19 @@ @org.yeshi.utils.mybatis.Column(name = "tm_id") private Long id; @JoinColumn(name = "tm_class_name") @org.yeshi.utils.mybatis.Column(name = "tm_class_name") private String className;// 名称 @JoinColumn(name = "tm_super_name") @org.yeshi.utils.mybatis.Column(name = "tm_super_name") private String superName; // 上级类目 @JoinColumn(name = "tm_material_id") @org.yeshi.utils.mybatis.Column(name = "tm_material_id") private Integer materialId; // 通用物料id @JoinColumn(name = "tm_createtime") @org.yeshi.utils.mybatis.Column(name = "tm_createtime") private Date createtime; // 创建时间 @JoinColumn(name = "tm_updatetime") @org.yeshi.utils.mybatis.Column(name = "tm_updatetime") private Date updatetime; // 更新时间(修改时间)