From d49c4335300c06504760c1bf02f3320da98964ae Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 01 Apr 2021 10:00:07 +0800
Subject: [PATCH] 积分
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysVipInfo.java | 149 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 118 insertions(+), 31 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 92105d9..63c91e7 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,5 +1,6 @@
package com.matrix.system.hive.bean;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.plugin.util.ExcelAnnotation;
import org.springframework.format.annotation.DateTimeFormat;
@@ -91,8 +92,11 @@
/**
* 生日
*/
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
@DateTimeFormat(pattern = DateUtil.DATE_FORMAT_DD)
private Date birthday1;
+
+ private String age;
/**
* 地址
@@ -139,6 +143,7 @@
/**
* 注册时间
*/
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_MM, timezone = "GMT+8")
private Date createTime;
/**
* 备注
@@ -185,6 +190,26 @@
private Long companyId;
+ /**
+ * 省
+ */
+ private String province;
+
+ /**
+ * 市
+ */
+ private String city;
+
+ /**
+ * 区
+ */
+ private String area;
+
+ /**
+ * 推荐人
+ */
+ private Long recommendId;
+
//血型
private String blood;
@@ -203,38 +228,8 @@
private Date createDistributionTime;
+ private SysOrder sysOrder;
- public Integer getIsDeal() {
- return isDeal;
- }
-
- 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;
- }
/** 扩展信息 **/
@@ -349,6 +344,27 @@
*/
List<VipAnswer> vipAnswers;
+ /**
+ * 会员标签
+ */
+ List<SysVipLabel> labels;
+
+ public List<SysVipLabel> getLabels() {
+ return labels;
+ }
+
+ public void setLabels(List<SysVipLabel> labels) {
+ this.labels = labels;
+ }
+
+ public String getAge() {
+ return age;
+ }
+
+ public void setAge(String age) {
+ this.age = age;
+ }
+
public Long getCompanyId() {
return companyId;
}
@@ -365,6 +381,77 @@
this.openId = openId;
}
+ public String getProvince() {
+ return province;
+ }
+
+ public void setProvince(String province) {
+ this.province = province;
+ }
+
+ public String getCity() {
+ return city;
+ }
+
+ public void setCity(String city) {
+ this.city = city;
+ }
+
+ public String getArea() {
+ return area;
+ }
+
+ public void setArea(String area) {
+ this.area = area;
+ }
+
+ public Long getRecommendId() {
+ return recommendId;
+ }
+
+ public void setRecommendId(Long recommendId) {
+ this.recommendId = recommendId;
+ }
+
+ public SysOrder getSysOrder() {
+ return sysOrder;
+ }
+
+ public void setSysOrder(SysOrder sysOrder) {
+ this.sysOrder = sysOrder;
+ }
+
+ public Integer getIsDeal() {
+ return isDeal;
+ }
+
+ 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;
+ }
public String getPayTotal() {
return payTotal;
}
--
Gitblit v1.9.1