From d388e2788b7ef088d7cd40f901b0acdcec460bc3 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 01 Apr 2021 00:19:23 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysVipInfo.java | 97 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 92 insertions(+), 5 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..308720b 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,6 +1,7 @@
package com.matrix.system.hive.bean;
-import com.matrix.system.hive.plugin.util.DateUtils;
+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 @@
/**
* 生日
*/
- @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 +138,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 +190,26 @@
private Long companyId;
+ /**
+ * 省
+ */
+ private String province;
+
+ /**
+ * 市
+ */
+ private String city;
+
+ /**
+ * 区
+ */
+ private String area;
+
+ /**
+ * 推荐人
+ */
+ private Long recommendId;
+
//血型
private String blood;
@@ -203,6 +228,47 @@
private Date createDistributionTime;
+ private SysOrder sysOrder;
+
+ 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;
@@ -284,12 +350,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;
/**
* 排名方式（会员消费统计条件）
@@ -349,6 +415,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;
}
--
Gitblit v1.9.1