From a9f950c0d11a687a7a940443b8c765f6d87ae4f1 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:26:22 +0800
Subject: [PATCH] 合并新的修改
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysVipInfo.java | 682 +++++++++-----------------------------------------------
1 files changed, 112 insertions(+), 570 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysVipInfo.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysVipInfo.java
index cb411bf..72f4119 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysVipInfo.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysVipInfo.java
@@ -1,7 +1,11 @@
package com.matrix.system.hive.bean;
-import com.matrix.system.hive.plugin.util.DateUtils;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.gson.annotations.Expose;
+import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.plugin.util.ExcelAnnotation;
+import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -9,17 +13,22 @@
import java.util.List;
-/**
- * @Title: SysVipInfo.java
- * @Package com.zkingsoft.model
- * @description
- * @author jyy
- * @email 18075895212@qq.com
- * @date 2016年7月14日 上午10:59:29
- */
+
+@Data
public class SysVipInfo implements Serializable {
private static final long serialVersionUID = 1L;
+ /**
+ * 是销售员
+ */
+ public static final int IS_SALES = 1;
+ /**
+ * 不是销售员
+ */
+ public static final int NOT_SALES = 2;
+
+
+
/**
* 1、成交客户
* **/
@@ -91,8 +100,11 @@
/**
* 生日
*/
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_DD)
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_DD)
private Date birthday1;
+
+ private String age;
/**
* 地址
@@ -134,11 +146,12 @@
/**
* 入会时间
*/
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_DD)
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_DD)
private Date inDate;
/**
* 注册时间
*/
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
private Date createTime;
/**
* 备注
@@ -185,6 +198,26 @@
private Long companyId;
+ /**
+ * 省
+ */
+ private String province;
+
+ /**
+ * 市
+ */
+ private String city;
+
+ /**
+ * 区
+ */
+ private String area;
+
+ /**
+ * 推荐人
+ */
+ private Long recommendId;
+
//血型
private String blood;
@@ -203,41 +236,65 @@
private Date createDistributionTime;
+ private SysOrder sysOrder;
- public Integer getIsDeal() {
- return isDeal;
- }
+ /**
+ * 可提现金额
+ */
+ private Double withdrawalCash;
+ /**
+ *推广员等级
+ */
+ private Long salesmanGrade;
- public void setIsDeal(Integer isDeal) {
- this.isDeal = isDeal;
- }
-
- public Long getParentId() {
- return parentId;
- }
-
- public void setParentId(Long parentId) {
- this.parentId = parentId;
- }
-
- public Date getCreateDistributionTime() {
- return createDistributionTime;
- }
-
- public void setCreateDistributionTime(Date createDistributionTime) {
- this.createDistributionTime = createDistributionTime;
- }
-
- public Date getHandleTime() {
- return handleTime;
- }
-
- public void setHandleTime(Date handleTime) {
- this.handleTime = handleTime;
- }
+ /**
+ * 用户昵称
+ */
+ private String nickName;
- /** 扩展信息 **/
+ /**
+ * 头像
+ */
+ private String avatarUrl;
+
+ /**
+ * 性别 1、男 2、女 0、未知
+ */
+ private Integer gender;
+
+ /**
+ * 用户所在国家
+ */
+ private String country;
+
+
+
+ /**
+ * 用户是否授权 1、是 2、否
+ */
+ private Integer userIsAuthorize;
+
+
+ /**
+ * 绑定上级用户时间
+ */
+ private Date bindingParentTime;
+
+
+ /**
+ * 是否是销售员（1=是，2=否）
+ */
+ private Integer isSales;
+
+ /**
+ * 用户类型 1、待审核 2、审核通过 0、审核未通过
+ */
+ private Integer fenxiaoState;
+
+ private String sessionKey;
+
+
/**
* 会员等级id
*/
@@ -273,6 +330,8 @@
* 页面上的入会时间
*/
private String inDateVo;
+
+
/**
* 页面上的生日
*/
@@ -284,12 +343,12 @@
/**
* 起始时间
*/
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_DD)
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_DD)
private Date startTime;
/**
* 结束时间
*/
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_DD)
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_DD)
private Date endTime;
/**
* 排名方式（会员消费统计条件）
@@ -341,116 +400,31 @@
/**
* 美疗师集合
*/
+ @Expose(serialize = false)
private List<MyBeatician> beauticains;
/**
* 会员问卷信息-答案,传递数据使用
*/
+ @Expose(serialize = false)
List<VipAnswer> vipAnswers;
- public Long getCompanyId() {
- return companyId;
- }
+ /**
+ * 会员标签
+ */
+ @Expose(serialize = false)
+ List<SysVipLabel> labels;
- public void setCompanyId(Long companyId) {
- this.companyId = companyId;
- }
-
- public String getOpenId() {
- return openId;
- }
-
- public void setOpenId(String openId) {
- this.openId = openId;
- }
-
- public String getPayTotal() {
- return payTotal;
- }
-
- public void setPayTotal(String payTotal) {
- this.payTotal = payTotal;
- }
-
- public Integer getCostTotal() {
- return costTotal;
- }
-
- public void setCostTotal(Integer costTotal) {
- this.costTotal = costTotal;
- }
-
- public String getCostNum() {
- return costNum;
- }
-
- public void setCostNum(String costNum) {
- this.costNum = costNum;
- }
-
- public String getTimeStart() {
- return timeStart;
- }
-
- public void setTimeStart(String timeStart) {
- this.timeStart = timeStart;
- }
-
- public String getTimeEnd() {
- return timeEnd;
- }
-
- public void setTimeEnd(String timeEnd) {
- this.timeEnd = timeEnd;
- }
-
- public Integer getVipNum() {
- return vipNum;
- }
-
- public void setVipNum(Integer vipNum) {
- this.vipNum = vipNum;
- }
-
-
- public String getPhoto() {
- return photo;
- }
-
- public void setPhoto(String photo) {
- this.photo = photo;
- }
-
- public String getYear() {
- return year;
- }
-
- public void setYear(String year) {
- this.year = year;
- }
-
- public boolean isQdSign() {
- return qdSign;
- }
/**
* 会员所有的充值卡
*/
+ @Expose(serialize = false,deserialize = false)
private List<MoneyCardUse> cards;
-
-
-
- public List<MoneyCardUse> getCards() {
- return cards;
- }
-
- public void setCards(List<MoneyCardUse> cards) {
- this.cards = cards;
- }
@@ -460,440 +434,8 @@
* 没签到false
*/
private boolean qdSign;
+
private String name;
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public boolean getQdSign() {
- return qdSign;
- }
-
- public void setQdSign(boolean qdSign) {
- this.qdSign = qdSign;
- }
-
- public String getUuid() {
- return uuid;
- }
-
- public void setUuid(String uuid) {
- this.uuid = uuid;
- }
-
- public String getDisease() {
- return disease;
- }
-
- public void setDisease(String disease) {
- this.disease = disease;
- }
-
- public Date getStartTime() {
- return startTime;
- }
-
- public Integer getRankType() {
- return rankType;
- }
-
- public void setRankType(Integer rankType) {
- this.rankType = rankType;
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
-
- public Date getEndTime() {
- return endTime;
- }
-
-
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-
- public Integer getRanking() {
- return ranking;
- }
-
- public void setRanking(Integer ranking) {
- this.ranking = ranking;
- }
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-
- public String getShopName() {
- return shopName;
- }
-
- public String getInDateVo() {
- return inDateVo;
- }
-
- public void setInDateVo(String inDateVo) {
- this.inDateVo = inDateVo;
- }
-
- public String getBirthday1Vo() {
- return birthday1Vo;
- }
-
- public void setBirthday1Vo(String birthday1Vo) {
- this.birthday1Vo = birthday1Vo;
- }
-
- public void setShopName(String shopName) {
- this.shopName = shopName;
- }
-
- public Long getShopId() {
- return shopId;
- }
-
- public void setShopId(Long shopId) {
- this.shopId = shopId;
- }
- public Long getStaffId() {
- return staffId;
- }
-
- public void setStaffId(Long staffId) {
- this.staffId = staffId;
- }
-
-
-
-
-
- public String getStaffName() {
- return staffName;
- }
-
- public void setStaffName(String staffName) {
- this.staffName = staffName;
- }
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getVipNo() {
- return vipNo;
- }
-
- public void setVipNo(String vipNo) {
- this.vipNo = vipNo;
- }
-
- public String getVipName() {
- return vipName;
- }
-
- public void setVipName(String vipName) {
- this.vipName = vipName;
- }
-
-
- public String getZjm() {
- return zjm;
- }
-
- public void setZjm(String zjm) {
- this.zjm = zjm;
- }
-
- public String getPhone() {
- return phone;
- }
-
- public void setPhone(String phone) {
- this.phone = phone;
- }
-
-
- public String getSex() {
- return sex;
- }
-
- public void setSex(String sex) {
- this.sex = sex;
- }
-
- public Date getBirthday1() {
- return birthday1;
- }
-
- public void setBirthday1(Date birthday1) {
- this.birthday1 = birthday1;
- }
-
- public String getAddr() {
- return addr;
- }
-
- public void setAddr(String addr) {
- this.addr = addr;
- }
-
- public String getConstell() {
- return constell;
- }
-
- public void setConstell(String constell) {
- this.constell = constell;
- }
-
- public String getAnimalSign() {
- return animalSign;
- }
-
- public void setAnimalSign(String animalSign) {
- this.animalSign = animalSign;
- }
-
- public String getArrivalWay() {
- return arrivalWay;
- }
-
- public void setArrivalWay(String arrivalWay) {
- this.arrivalWay = arrivalWay;
- }
-
- public String getVipType() {
- return vipType;
- }
-
- public void setVipType(String vipType) {
- this.vipType = vipType;
- }
-
- public String getVipState() {
- return vipState;
- }
-
- public void setVipState(String vipState) {
- this.vipState = vipState;
- }
-
- public String getIsDelete() {
- return isDelete;
- }
-
- public void setIsDelete(String isDelete) {
- this.isDelete = isDelete;
- }
-
- public Integer getPointAll() {
- return pointAll;
- }
-
- public void setPointAll(Integer pointAll) {
- this.pointAll = pointAll;
- }
-
- public Double getCommissionAll() {
- return commissionAll;
- }
-
- public void setCommissionAll(Double commissionAll) {
- this.commissionAll = commissionAll;
- }
-
- public Date getInDate() {
- return inDate;
- }
-
- public void setInDate(Date inDate) {
- this.inDate = inDate;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public String getPassWord() {
- return passWord;
- }
-
- public void setPassWord(String passWord) {
- this.passWord = passWord;
- }
-
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public Long getLevelId() {
- return levelId;
- }
-
- public void setLevelId(Long levelId) {
- this.levelId = levelId;
- }
-
- public SysVipLevel getVipLevel() {
- return vipLevel;
- }
-
- public void setVipLevel(SysVipLevel vipLevel) {
- this.vipLevel = vipLevel;
- }
-
-
-
-
- public String getStatu() {
- return statu;
- }
-
- public void setStatu(String statu) {
- this.statu = statu;
- }
-
- public Double getBalance() {
- return balance;
- }
-
- public void setBalance(Double balance) {
- this.balance = balance;
- }
-
-
-
- public MoneyCardUse getLevelCard() {
- return levelCard;
- }
-
- public void setLevelCard(MoneyCardUse levelCard) {
- this.levelCard = levelCard;
- }
-
- public String getBeatuyId() {
- return beatuyId;
- }
-
- public void setBeatuyId(String beatuyId) {
- this.beatuyId = beatuyId;
- }
-
- public List<MyBeatician> getBeauticains() {
- return beauticains;
- }
-
- public void setBeauticains(List<MyBeatician> beauticains) {
- this.beauticains = beauticains;
- }
-
- public String getBlood() {
- return blood;
- }
-
- public void setBlood(String blood) {
- this.blood = blood;
- }
-
- public String getSfCard() {
- return sfCard;
- }
-
- public void setSfCard(String sfCard) {
- this.sfCard = sfCard;
- }
-
- public String getLink() {
- return link;
- }
-
- public void setLink(String link) {
- this.link = link;
- }
-
- public String getMarry() {
- return marry;
- }
-
- public void setMarry(String marry) {
- this.marry = marry;
- }
-
- public String getVocation() {
- return vocation;
- }
-
- public void setVocation(String vocation) {
- this.vocation = vocation;
- }
-
- public List<VipAnswer> getVipAnswers() {
- return vipAnswers;
- }
-
- public void setVipAnswers(List<VipAnswer> vipAnswers) {
- this.vipAnswers = vipAnswers;
- }
-
-
- public Integer getBirthdayType() {
- return birthdayType;
- }
-
- public void setBirthdayType(Integer birthdayType) {
- this.birthdayType = birthdayType;
- }
-
- @Override
- public String toString() {
- return "SysVipInfo [id=" + id + ", vipNo=" + vipNo + ", vipName="
- + vipName + ", phone=" + phone + ", vipType=" + vipType
- + ", shopName=" + shopName + ", vipState=" + vipState
- + ", passWord=" + passWord + ", beatuyId=" + beatuyId
- + ", sex=" + sex + ", birthday1=" + birthday1 + ", addr="
- + addr + ", constell=" + constell + ", animalSign="
- + animalSign + ", arrivalWay=" + arrivalWay + ", photo="
- + photo + ", pointAll=" + pointAll + ", commissionAll="
- + commissionAll + ", inDate=" + inDate + ", createTime="
- + createTime + ", remark=" + remark + ", staffId=" + staffId
- + ", shopId=" + shopId + ", isDelete=" + isDelete + ", email="
- + email + ", blood=" + blood + ", sfCard=" + sfCard + ", link="
- + link + ", marry=" + marry + ", vocation=" + vocation
- + ", levelId=" + levelId + ", uuid=" + uuid + ", balance="
- + balance + ", levelCard=" + levelCard + ", vipLevel="
- + vipLevel + ", staffName=" + staffName + ", inDateVo="
- + inDateVo + ", birthday1Vo=" + birthday1Vo + ", ranking="
- + ranking + ", startTime=" + startTime + ", endTime=" + endTime
- + ", rankType=" + rankType + ", year=" + year + ", vipNum="
- + vipNum + ", timeStart=" + timeStart + ", timeEnd=" + timeEnd
- + ", payTotal=" + payTotal + ", costTotal=" + costTotal
- + ", costNum=" + costNum + ", openId=" + openId + ", statu="
- + statu + ", beauticains=" + beauticains + ", vipAnswers="
- + vipAnswers + ", cards=" + cards + ", qdSign=" + qdSign + "]";
- }
--
Gitblit v1.9.1