Merge remote-tracking branch 'origin/div' into div

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java

@@ -1,12 +1,8 @@
package com.yeshi.fanli.entity.bus.user;



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.OneToOne;

import javax.persistence.Table;

import javax.persistence.Transient;



@@ -19,27 +15,36 @@
 *

 * @date 2018年1月29日

 */

@Entity

@Table(name = "yeshi_ec_threeSale")

@org.yeshi.utils.mybatis.Table("yeshi_ec_threeSale")

public class ThreeSale {

   // 邀请状态

   public static int STATE_SUCCESS = 1;// 成功

   public static int STATE_NOT_SUCCESS = 0;// 尚未成功



   // 脱离状态

   public static int EXPIRE_NORMAL = 0;// 正常状态

   public static int EXPIRE_OUTOFDATE = 1;// 过期状态



   public static int EXPIRE_BREAK = 1;// 邀请关系脱离

   public static int EXPIRE_BREAK_VIP = 2; // vip脱离关系

   public static int EXPIRE_BREAK_VIP_DEL3 = 3; // 直接脱离关系删除

   public static int EXPIRE_BREAK_VIP_DEL4 = 4; // 间接脱离关系删除

   public static int EXPIRE_BREAK_VIP_DEL34 = 34; // 直接、间接脱离关系删除



   @Id

   @GeneratedValue(strategy = GenerationType.AUTO)

   @Column(name = "id")

   private Long id;



   @ManyToOne

   @JoinColumn(name = "boss_id")

   public ThreeSale(Long id) {

      this.id = id;

   }



   public ThreeSale() {

   }



   @Column(name = "boss_id")

   private UserInfo boss;// 邀请者



   @OneToOne

   @JoinColumn(name = "worker_id")

   @Column(name = "worker_id")

   private UserInfo worker; // 被邀请者



@@ -61,6 +66,10 @@


   @Transient

   private ThreeSaleExtraInfo threeSaleExtraInfo;



   // 上上级关系状态

   @Transient

   private Boolean stateSuper;



   public Long getId() {

      return id;

@@ -134,4 +143,12 @@
      this.threeSaleExtraInfo = threeSaleExtraInfo;

   }



   public Boolean getStateSuper() {

      return stateSuper;

   }



   public void setStateSuper(Boolean stateSuper) {

      this.stateSuper = stateSuper;

   }



}