From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java | 190 ++++++++++++++++++++++++++++++++---------------
1 files changed, 129 insertions(+), 61 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java
index af80d0b..1b855f4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java
@@ -1,17 +1,15 @@
package com.yeshi.fanli.entity.bus.user;
+import java.io.Serializable;
import java.math.BigDecimal;
import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
import javax.persistence.Transient;
+import org.yeshi.utils.mybatis.Table;
+
import com.google.gson.annotations.Expose;
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
/**
* 鐢ㄦ埛淇℃伅
@@ -19,93 +17,81 @@
* @author Administrator
*
*/
-@Entity
-@Table(name = "`yeshi_ec_user`")
-@org.yeshi.utils.mybatis.Table("yeshi_ec_user")
-public class UserInfo {
+@Table("yeshi_ec_user")
+public class UserInfo implements Serializable{
+ /**
+ *
+ */
public static int STATE_NORMAL = 0;// 姝ｅ父鐘舵��
public static int STATE_DELETE = 1;// 鍒犻櫎鐘舵��
public static int STATE_FORBIDDEN = 2;// 灏佺鐘舵��
+ public static int STATE_DELETE_OUT_OF_DATE = 4;// 鐢ㄦ埛闀挎湡涓嶆椿璺冭鍒犻櫎
- @Id
- // @GeneratedValue(strategy = GenerationType.SEQUENCE)
@Column(name = "id")
- @org.yeshi.utils.mybatis.Column(name = "id")
@Expose
private Long id;
/**
* 娣樺疂openId
*/
@Expose
- @Column(name = "identifycode", length = 128)
- @org.yeshi.utils.mybatis.Column(name = "identifycode")
+ @Column(name = "identifycode")
private String openid;
@Column(name = "login_type")
- @org.yeshi.utils.mybatis.Column(name = "login_type")
@Expose
private Integer loginType;// 1-娣樺疂
@Column(name = "wx_open_id")
- @org.yeshi.utils.mybatis.Column(name = "wx_open_id")
@Expose
private String wxOpenId;
@Column(name = "wx_union_id")
- @org.yeshi.utils.mybatis.Column(name = "wx_union_id")
@Expose
private String wxUnionId;
- @org.yeshi.utils.mybatis.Column(name = "nick_name")
- @Column(name = "nick_name", length = 128)
+ @Column(name = "nick_name")
@Expose
private String nickName;// 鏄电О
- @org.yeshi.utils.mybatis.Column(name = "tbName")
+ @Column(name = "tbName")
@Expose
private String tbName; // 娣樺疂鏄电О
- @org.yeshi.utils.mybatis.Column(name = "tbPic")
+ @Column(name = "tbPic")
private String tbPic;// 娣樺疂澶村儚
- @org.yeshi.utils.mybatis.Column(name = "wxName")
+ @Column(name = "wxName")
@Expose
private String wxName;
- @org.yeshi.utils.mybatis.Column(name = "wxPic")
+ @Column(name = "wxPic")
private String wxPic;
- @org.yeshi.utils.mybatis.Column(name = "portrait")
- @Column(name = "portrait", length = 512)
+ @Column(name = "portrait")
@Expose
private String portrait;// 澶村儚
- @org.yeshi.utils.mybatis.Column(name = "createtime")
+ @Column(name = "createtime")
@Expose
private Long createtime;
- @org.yeshi.utils.mybatis.Column(name = "last_logintime")
@Column(name = "last_logintime")
@Expose
private Long lastLoginTime;// 鏈�杩戜竴娆＄櫥褰曟椂闂�
- @org.yeshi.utils.mybatis.Column(name = "loginip")
- @Column(name = "loginip", length = 30)
+ @Column(name = "loginip")
@Expose
private String lastLoginIp;// 鏈�杩戜竴娆＄櫥褰旾P
- @org.yeshi.utils.mybatis.Column(name = "tuiguang_code")
- @Column(name = "tuiguang_code", length = 30)
+ @Column(name = "type")
@Expose
- private String tuiGuangCode;// 鎺ㄥ箍鐮�
+ private Integer type;// 鐢ㄦ埛绫诲瀷 0-鏅�氱敤鎴� 1-铏氭嫙鐢ㄦ埛
- @org.yeshi.utils.mybatis.Column(name = "appid")
- @Column(name = "appid", length = 30)
+ @Column(name = "appid")
@Expose
private String appId;//
- @org.yeshi.utils.mybatis.Column(name = "my_hongBao")
- @Column(name = "my_hongBao", length = 8)
+ @Column(name = "my_hongBao")
@Expose
// @Type(type = "big_decimal")
private BigDecimal myHongBao; // 鎴戠殑绾㈠寘
@@ -120,38 +106,87 @@
@Expose
private BigDecimal canOpenHongBao;
- @org.yeshi.utils.mybatis.Column(name = "pay_password")
@Column(name = "pay_password")
private String payPassword;
- @org.yeshi.utils.mybatis.Column(name = "sid")
- @ManyToOne
- @JoinColumn(name = "sid")
- private System system;
+ @Column(name = "sid")
+ private BusinessSystem system;
- @org.yeshi.utils.mybatis.Column(name = "rank")
+ @Column(name = "rank")
@Expose
- private Integer rank;// 0 鏅�� 1 閾� 2閾� 3 閲�
+ private Integer rank;// 0 鏅�� 1 閾� 2閾� 3 閲�
- @org.yeshi.utils.mybatis.Column(name = "phone")
- @Column(name = "phone", length = 16)
+ @Column(name = "phone")
@Expose
private String phone; // 鐢佃瘽鍙风爜
- @org.yeshi.utils.mybatis.Column(name = "state")
+ @Column(name = "state")
private Integer state; // 鐢ㄦ埛鐨勭姸鎬�
- @org.yeshi.utils.mybatis.Column(name = "state_desc")
- @Column(name = "state_desc") // 鐢ㄦ埛鐘舵�佺畝浠�
+ @Column(name = "state_desc")
private String stateDesc;
+
+ @Column(name = "platform")
+ private String platform;//鏉ユ簮骞冲彴
+
+ public String getPlatform() {
+ return platform;
+ }
+
+ public void setPlatform(String platform) {
+ this.platform = platform;
+ }
@Transient
@Expose
private String rankIcon;// 绛夌骇鍥炬爣
+ // 鎬у埆: 1-濂� 2-鐢�
@Transient
@Expose
- private String rankNamePicture;// 绛夌骇鍚嶇О鍥剧墖
+ private Integer sex;
+
+ // 寰俊鍙�
+ @Transient
+ @Expose
+ private String weiXin;
+
+ // 浜岀淮鐮�
+ @Transient
+ @Expose
+ private String erCode;
+
+ // 寰俊鎻愮ず璇�
+ @Transient
+ @Expose
+ private String weiXinTip;
+
+ @Transient
+ @Expose
+ private String rankNamePicture;// 绛夌骇鍚嶇О鍥剧墖
+ @Transient
+ private String taoBaoUid;// 娣樺疂鐨勭敤鎴稩D
+
+ // 鏄惁涓篤IP
+ @Transient
+ @Expose
+ private boolean vip;
+
+ public boolean isVip() {
+ return vip;
+ }
+
+ public void setVip(boolean vip) {
+ this.vip = vip;
+ }
+
+ public String getTaoBaoUid() {
+ return taoBaoUid;
+ }
+
+ public void setTaoBaoUid(String taoBaoUid) {
+ this.taoBaoUid = taoBaoUid;
+ }
public Integer getState() {
return state;
@@ -185,6 +220,7 @@
this.rankIcon = rankIcon;
}
+ // TODO
public UserInfo() {
openid = "";
wxOpenId = "";
@@ -195,7 +231,7 @@
tbPic = "";
portrait = "";
myHongBao = BigDecimal.valueOf(0);
- state=0;
+ state = 0;
}
public UserInfo(long id) {
@@ -275,14 +311,6 @@
this.appId = appId;
}
- public String getTuiGuangCode() {
- return tuiGuangCode;
- }
-
- public void setTuiGuangCode(String tuiGuangCode) {
- this.tuiGuangCode = tuiGuangCode;
- }
-
public Long getId() {
return id;
}
@@ -347,11 +375,11 @@
this.lastLoginIp = lastLoginIp;
}
- public System getSystem() {
+ public BusinessSystem getSystem() {
return system;
}
- public void setSystem(System system) {
+ public void setSystem(BusinessSystem system) {
this.system = system;
}
@@ -395,6 +423,46 @@
this.payPassword = payPassword;
}
+ public Integer getSex() {
+ return sex;
+ }
+
+ public void setSex(Integer sex) {
+ this.sex = sex;
+ }
+
+ public String getWeiXin() {
+ return weiXin;
+ }
+
+ public void setWeiXin(String weiXin) {
+ this.weiXin = weiXin;
+ }
+
+ public String getWeiXinTip() {
+ return weiXinTip;
+ }
+
+ public void setWeiXinTip(String weiXinTip) {
+ this.weiXinTip = weiXinTip;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public String getErCode() {
+ return erCode;
+ }
+
+ public void setErCode(String erCode) {
+ this.erCode = erCode;
+ }
+
@Override
public int hashCode() {
final int prime = 31;
--
Gitblit v1.8.0