From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfo.java | 732 ++++++++++++++++++++++++++++----------------------------
1 files changed, 367 insertions(+), 365 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 1b855f4..48609ec 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
@@ -6,6 +6,7 @@
import javax.persistence.Column;
import javax.persistence.Transient;
+import com.yeshi.fanli.entity.SystemEnum;
import org.yeshi.utils.mybatis.Table;
import com.google.gson.annotations.Expose;
@@ -13,476 +14,477 @@
/**
* 鐢ㄦ埛淇℃伅
- *
- * @author Administrator
*
+ * @author Administrator
*/
@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;// 鐢ㄦ埛闀挎湡涓嶆椿璺冭鍒犻櫎
+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;// 鐢ㄦ埛闀挎湡涓嶆椿璺冭鍒犻櫎
- @Column(name = "id")
- @Expose
- private Long id;
- /**
- * 娣樺疂openId
- */
- @Expose
- @Column(name = "identifycode")
- private String openid;
+ @Column(name = "id")
+ @Expose
+ private Long id;
+ /**
+ * 娣樺疂openId
+ */
+ @Expose
+ @Column(name = "identifycode")
+ private String openid;
- @Column(name = "login_type")
- @Expose
- private Integer loginType;// 1-娣樺疂
+ @Column(name = "login_type")
+ @Expose
+ private Integer loginType;// 1-娣樺疂
- @Column(name = "wx_open_id")
- @Expose
- private String wxOpenId;
+ @Column(name = "wx_open_id")
+ @Expose
+ private String wxOpenId;
- @Column(name = "wx_union_id")
- @Expose
- private String wxUnionId;
+ @Column(name = "wx_union_id")
+ @Expose
+ private String wxUnionId;
- @Column(name = "nick_name")
- @Expose
- private String nickName;// 鏄电О
+ @Column(name = "nick_name")
+ @Expose
+ private String nickName;// 鏄电О
- @Column(name = "tbName")
- @Expose
- private String tbName; // 娣樺疂鏄电О
+ @Column(name = "tbName")
+ @Expose
+ private String tbName; // 娣樺疂鏄电О
- @Column(name = "tbPic")
- private String tbPic;// 娣樺疂澶村儚
+ @Column(name = "tbPic")
+ private String tbPic;// 娣樺疂澶村儚
- @Column(name = "wxName")
- @Expose
- private String wxName;
+ @Column(name = "wxName")
+ @Expose
+ private String wxName;
- @Column(name = "wxPic")
- private String wxPic;
+ @Column(name = "wxPic")
+ private String wxPic;
- @Column(name = "portrait")
- @Expose
- private String portrait;// 澶村儚
+ @Column(name = "portrait")
+ @Expose
+ private String portrait;// 澶村儚
- @Column(name = "createtime")
- @Expose
- private Long createtime;
+ @Column(name = "createtime")
+ @Expose
+ private Long createtime;
- @Column(name = "last_logintime")
- @Expose
- private Long lastLoginTime;// 鏈�杩戜竴娆＄櫥褰曟椂闂�
+ @Column(name = "last_logintime")
+ @Expose
+ private Long lastLoginTime;// 鏈�杩戜竴娆＄櫥褰曟椂闂�
- @Column(name = "loginip")
- @Expose
- private String lastLoginIp;// 鏈�杩戜竴娆＄櫥褰旾P
+ @Column(name = "loginip")
+ @Expose
+ private String lastLoginIp;// 鏈�杩戜竴娆＄櫥褰旾P
- @Column(name = "type")
- @Expose
- private Integer type;// 鐢ㄦ埛绫诲瀷 0-鏅�氱敤鎴� 1-铏氭嫙鐢ㄦ埛
+ @Column(name = "type")
+ @Expose
+ private Integer type;// 鐢ㄦ埛绫诲瀷 0-鏅�氱敤鎴� 1-铏氭嫙鐢ㄦ埛
- @Column(name = "appid")
- @Expose
- private String appId;//
+ @Column(name = "appid")
+ @Expose
+ private String appId;//
- @Column(name = "my_hongBao")
- @Expose
- // @Type(type = "big_decimal")
- private BigDecimal myHongBao; // 鎴戠殑绾㈠寘
+ @Column(name = "my_hongBao")
+ @Expose
+ // @Type(type = "big_decimal")
+ private BigDecimal myHongBao; // 鎴戠殑绾㈠寘
- @Transient
- @Expose
- private BigDecimal totalHongBao; // 绱鐨勭孩鍖�
- @Transient
- @Expose
- private BigDecimal noOpenHongBao; // 鏈墦寮�绾㈠寘
- @Transient
- @Expose
- private BigDecimal canOpenHongBao;
+ @Transient
+ @Expose
+ private BigDecimal totalHongBao; // 绱鐨勭孩鍖�
+ @Transient
+ @Expose
+ private BigDecimal noOpenHongBao; // 鏈墦寮�绾㈠寘
+ @Transient
+ @Expose
+ private BigDecimal canOpenHongBao;
- @Column(name = "pay_password")
- private String payPassword;
+ @Column(name = "pay_password")
+ private String payPassword;
- @Column(name = "sid")
- private BusinessSystem system;
+ @Column(name = "system")
+ private SystemEnum system;
- @Column(name = "rank")
- @Expose
- private Integer rank;// 0 鏅�� 1 閾� 2閾� 3 閲�
- @Column(name = "phone")
- @Expose
- private String phone; // 鐢佃瘽鍙风爜
+ @Column(name = "rank")
+ @Expose
+ private Integer rank;// 0 鏅�� 1 閾� 2閾� 3 閲�
- @Column(name = "state")
- private Integer state; // 鐢ㄦ埛鐨勭姸鎬�
+ @Column(name = "phone")
+ @Expose
+ private String phone; // 鐢佃瘽鍙风爜
- @Column(name = "state_desc")
- private String stateDesc;
-
- @Column(name = "platform")
- private String platform;//鏉ユ簮骞冲彴
+ @Column(name = "state")
+ private Integer state; // 鐢ㄦ埛鐨勭姸鎬�
- public String getPlatform() {
- return platform;
- }
+ @Column(name = "state_desc")
+ private String stateDesc;
- public void setPlatform(String platform) {
- this.platform = platform;
- }
+ @Column(name = "platform")
+ private String platform;//鏉ユ簮骞冲彴
- @Transient
- @Expose
- private String rankIcon;// 绛夌骇鍥炬爣
- // 鎬у埆: 1-濂� 2-鐢�
- @Transient
- @Expose
- private Integer sex;
+ public String getPlatform() {
+ return platform;
+ }
- // 寰俊鍙�
- @Transient
- @Expose
- private String weiXin;
-
- // 浜岀淮鐮�
- @Transient
- @Expose
- private String erCode;
+ public void setPlatform(String platform) {
+ this.platform = platform;
+ }
- // 寰俊鎻愮ず璇�
- @Transient
- @Expose
- private String weiXinTip;
+ @Transient
+ @Expose
+ private String rankIcon;// 绛夌骇鍥炬爣
- @Transient
- @Expose
- private String rankNamePicture;// 绛夌骇鍚嶇О鍥剧墖
- @Transient
- private String taoBaoUid;// 娣樺疂鐨勭敤鎴稩D
+ // 鎬у埆: 1-濂� 2-鐢�
+ @Transient
+ @Expose
+ private Integer sex;
- // 鏄惁涓篤IP
- @Transient
- @Expose
- private boolean vip;
+ // 寰俊鍙�
+ @Transient
+ @Expose
+ private String weiXin;
- public boolean isVip() {
- return vip;
- }
+ // 浜岀淮鐮�
+ @Transient
+ @Expose
+ private String erCode;
- public void setVip(boolean vip) {
- this.vip = vip;
- }
+ // 寰俊鎻愮ず璇�
+ @Transient
+ @Expose
+ private String weiXinTip;
- public String getTaoBaoUid() {
- return taoBaoUid;
- }
+ @Transient
+ @Expose
+ private String rankNamePicture;// 绛夌骇鍚嶇О鍥剧墖
+ @Transient
+ private String taoBaoUid;// 娣樺疂鐨勭敤鎴稩D
- public void setTaoBaoUid(String taoBaoUid) {
- this.taoBaoUid = taoBaoUid;
- }
+ // 鏄惁涓篤IP
+ @Transient
+ @Expose
+ private boolean vip;
- public Integer getState() {
- return state;
- }
+ public boolean isVip() {
+ return vip;
+ }
- public void setState(Integer state) {
- this.state = state;
- }
+ public void setVip(boolean vip) {
+ this.vip = vip;
+ }
- public String getStateDesc() {
- return stateDesc;
- }
+ public String getTaoBaoUid() {
+ return taoBaoUid;
+ }
- public void setStateDesc(String stateDesc) {
- this.stateDesc = stateDesc;
- }
+ public void setTaoBaoUid(String taoBaoUid) {
+ this.taoBaoUid = taoBaoUid;
+ }
- public String getRankNamePicture() {
- return rankNamePicture;
- }
+ public Integer getState() {
+ return state;
+ }
- public void setRankNamePicture(String rankNamePicture) {
- this.rankNamePicture = rankNamePicture;
- }
+ public void setState(Integer state) {
+ this.state = state;
+ }
- public String getRankIcon() {
- return rankIcon;
- }
+ public String getStateDesc() {
+ return stateDesc;
+ }
- public void setRankIcon(String rankIcon) {
- this.rankIcon = rankIcon;
- }
+ public void setStateDesc(String stateDesc) {
+ this.stateDesc = stateDesc;
+ }
- // TODO
- public UserInfo() {
- openid = "";
- wxOpenId = "";
- wxUnionId = "";
- tbName = "";
- wxName = "";
- wxPic = "";
- tbPic = "";
- portrait = "";
- myHongBao = BigDecimal.valueOf(0);
- state = 0;
- }
+ public String getRankNamePicture() {
+ return rankNamePicture;
+ }
- public UserInfo(long id) {
- super();
- this.id = id;
- }
+ public void setRankNamePicture(String rankNamePicture) {
+ this.rankNamePicture = rankNamePicture;
+ }
- public String getTbPic() {
- return tbPic;
- }
+ public String getRankIcon() {
+ return rankIcon;
+ }
- public void setTbPic(String tbPic) {
- this.tbPic = tbPic;
- }
+ public void setRankIcon(String rankIcon) {
+ this.rankIcon = rankIcon;
+ }
- public String getWxPic() {
- return wxPic;
- }
+ // TODO
+ public UserInfo() {
+ openid = "";
+ wxOpenId = "";
+ wxUnionId = "";
+ tbName = "";
+ wxName = "";
+ wxPic = "";
+ tbPic = "";
+ portrait = "";
+ myHongBao = BigDecimal.valueOf(0);
+ state = 0;
+ }
+
+ public UserInfo(long id) {
+ super();
+ this.id = id;
+ }
+
+ public String getTbPic() {
+ return tbPic;
+ }
+
+ public void setTbPic(String tbPic) {
+ this.tbPic = tbPic;
+ }
+
+ public String getWxPic() {
+ return wxPic;
+ }
- public void setWxPic(String wxPic) {
- this.wxPic = wxPic;
- }
+ public void setWxPic(String wxPic) {
+ this.wxPic = wxPic;
+ }
- public String getTbName() {
- return tbName;
- }
+ public String getTbName() {
+ return tbName;
+ }
- public void setTbName(String tbName) {
- this.tbName = tbName;
- }
+ public void setTbName(String tbName) {
+ this.tbName = tbName;
+ }
- public String getWxName() {
- return wxName;
- }
+ public String getWxName() {
+ return wxName;
+ }
- public void setWxName(String wxName) {
- this.wxName = wxName;
- }
+ public void setWxName(String wxName) {
+ this.wxName = wxName;
+ }
- public String getWxOpenId() {
- return wxOpenId;
- }
+ public String getWxOpenId() {
+ return wxOpenId;
+ }
- public void setWxOpenId(String wxOpenId) {
- this.wxOpenId = wxOpenId;
- }
+ public void setWxOpenId(String wxOpenId) {
+ this.wxOpenId = wxOpenId;
+ }
- public String getPhone() {
- return phone;
- }
+ public String getPhone() {
+ return phone;
+ }
- public void setPhone(String phone) {
- this.phone = phone;
- }
+ public void setPhone(String phone) {
+ this.phone = phone;
+ }
- public String getWxUnionId() {
- return wxUnionId;
- }
+ public String getWxUnionId() {
+ return wxUnionId;
+ }
- public void setWxUnionId(String wxUnionId) {
- this.wxUnionId = wxUnionId;
- }
+ public void setWxUnionId(String wxUnionId) {
+ this.wxUnionId = wxUnionId;
+ }
- public Integer getRank() {
- return rank;
- }
+ public Integer getRank() {
+ return rank;
+ }
- public void setRank(Integer rank) {
- this.rank = rank;
- }
+ public void setRank(Integer rank) {
+ this.rank = rank;
+ }
- public String getAppId() {
- return appId;
- }
+ public String getAppId() {
+ return appId;
+ }
- public void setAppId(String appId) {
- this.appId = appId;
- }
+ public void setAppId(String appId) {
+ this.appId = appId;
+ }
- public Long getId() {
- return id;
- }
+ public Long getId() {
+ return id;
+ }
- public void setId(Long id) {
- this.id = id;
- }
+ public void setId(Long id) {
+ this.id = id;
+ }
- public String getOpenid() {
- return openid;
- }
+ public String getOpenid() {
+ return openid;
+ }
- public void setOpenid(String openid) {
- this.openid = openid;
- }
+ public void setOpenid(String openid) {
+ this.openid = openid;
+ }
- public Integer getLoginType() {
- return loginType;
- }
+ public Integer getLoginType() {
+ return loginType;
+ }
- public void setLoginType(Integer loginType) {
- this.loginType = loginType;
- }
+ public void setLoginType(Integer loginType) {
+ this.loginType = loginType;
+ }
- public String getNickName() {
- return nickName;
- }
+ public String getNickName() {
+ return nickName;
+ }
- public void setNickName(String nickName) {
- this.nickName = nickName;
- }
+ public void setNickName(String nickName) {
+ this.nickName = nickName;
+ }
- public String getPortrait() {
- return portrait;
- }
+ public String getPortrait() {
+ return portrait;
+ }
- public void setPortrait(String portrait) {
- this.portrait = portrait;
- }
+ public void setPortrait(String portrait) {
+ this.portrait = portrait;
+ }
- public Long getCreatetime() {
- return createtime;
- }
+ public Long getCreatetime() {
+ return createtime;
+ }
- public void setCreatetime(Long createtime) {
- this.createtime = createtime;
- }
+ public void setCreatetime(Long createtime) {
+ this.createtime = createtime;
+ }
- public Long getLastLoginTime() {
- return lastLoginTime;
- }
+ public Long getLastLoginTime() {
+ return lastLoginTime;
+ }
- public void setLastLoginTime(Long lastLoginTime) {
- this.lastLoginTime = lastLoginTime;
- }
+ public void setLastLoginTime(Long lastLoginTime) {
+ this.lastLoginTime = lastLoginTime;
+ }
- public String getLastLoginIp() {
- return lastLoginIp;
- }
+ public String getLastLoginIp() {
+ return lastLoginIp;
+ }
- public void setLastLoginIp(String lastLoginIp) {
- this.lastLoginIp = lastLoginIp;
- }
+ public void setLastLoginIp(String lastLoginIp) {
+ this.lastLoginIp = lastLoginIp;
+ }
- public BusinessSystem getSystem() {
- return system;
- }
+ public SystemEnum getSystem() {
+ return system;
+ }
- public void setSystem(BusinessSystem system) {
- this.system = system;
- }
+ public void setSystem(SystemEnum system) {
+ this.system = system;
+ }
- public BigDecimal getMyHongBao() {
- return myHongBao;
- }
+ public BigDecimal getMyHongBao() {
+ return myHongBao;
+ }
- public void setMyHongBao(BigDecimal myHongBao) {
- this.myHongBao = myHongBao;
- }
+ public void setMyHongBao(BigDecimal myHongBao) {
+ this.myHongBao = myHongBao;
+ }
- public BigDecimal getTotalHongBao() {
- return totalHongBao;
- }
+ public BigDecimal getTotalHongBao() {
+ return totalHongBao;
+ }
- public void setTotalHongBao(BigDecimal totalHongBao) {
- this.totalHongBao = totalHongBao;
- }
+ public void setTotalHongBao(BigDecimal totalHongBao) {
+ this.totalHongBao = totalHongBao;
+ }
- public BigDecimal getNoOpenHongBao() {
- return noOpenHongBao;
- }
+ public BigDecimal getNoOpenHongBao() {
+ return noOpenHongBao;
+ }
- public void setNoOpenHongBao(BigDecimal noOpenHongBao) {
- this.noOpenHongBao = noOpenHongBao;
- }
+ public void setNoOpenHongBao(BigDecimal noOpenHongBao) {
+ this.noOpenHongBao = noOpenHongBao;
+ }
- public BigDecimal getCanOpenHongBao() {
- return canOpenHongBao;
- }
+ public BigDecimal getCanOpenHongBao() {
+ return canOpenHongBao;
+ }
- public void setCanOpenHongBao(BigDecimal canOpenHongBao) {
- this.canOpenHongBao = canOpenHongBao;
- }
+ public void setCanOpenHongBao(BigDecimal canOpenHongBao) {
+ this.canOpenHongBao = canOpenHongBao;
+ }
- public String getPayPassword() {
- return payPassword;
- }
+ public String getPayPassword() {
+ return payPassword;
+ }
- public void setPayPassword(String payPassword) {
- this.payPassword = payPassword;
- }
+ public void setPayPassword(String payPassword) {
+ this.payPassword = payPassword;
+ }
- public Integer getSex() {
- return sex;
- }
+ public Integer getSex() {
+ return sex;
+ }
- public void setSex(Integer sex) {
- this.sex = sex;
- }
+ public void setSex(Integer sex) {
+ this.sex = sex;
+ }
- public String getWeiXin() {
- return weiXin;
- }
+ public String getWeiXin() {
+ return weiXin;
+ }
- public void setWeiXin(String weiXin) {
- this.weiXin = weiXin;
- }
+ public void setWeiXin(String weiXin) {
+ this.weiXin = weiXin;
+ }
- public String getWeiXinTip() {
- return weiXinTip;
- }
+ public String getWeiXinTip() {
+ return weiXinTip;
+ }
- public void setWeiXinTip(String weiXinTip) {
- this.weiXinTip = weiXinTip;
- }
+ public void setWeiXinTip(String weiXinTip) {
+ this.weiXinTip = weiXinTip;
+ }
- public Integer getType() {
- return type;
- }
+ public Integer getType() {
+ return type;
+ }
- public void setType(Integer type) {
- this.type = type;
- }
+ public void setType(Integer type) {
+ this.type = type;
+ }
- public String getErCode() {
- return erCode;
- }
+ public String getErCode() {
+ return erCode;
+ }
- public void setErCode(String erCode) {
- this.erCode = erCode;
- }
+ public void setErCode(String erCode) {
+ this.erCode = erCode;
+ }
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + (int) (id ^ (id >>> 32));
- return result;
- }
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + (int) (id ^ (id >>> 32));
+ return result;
+ }
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- UserInfo other = (UserInfo) obj;
- if (id != other.id)
- return false;
- return true;
- }
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ UserInfo other = (UserInfo) obj;
+ if (id != other.id)
+ return false;
+ return true;
+ }
}
--
Gitblit v1.8.0