From f76c9c5beb39916771402de95f05be18f39a9db6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 17 Dec 2020 14:34:33 +0800
Subject: [PATCH] finish vip_detail vipInfo fn
---
zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java
index 0b49d2f..6b46164 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.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 org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -36,6 +37,7 @@
/**
* 收款
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GTM-8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
private Date payTime;
@@ -149,12 +151,24 @@
/**
* 表单搜索条件（开始时间结束时间）
*/
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
private Date beginTimeVo;
- @DateTimeFormat(pattern = DateUtils.DATE_FORMAT_MM)
+ @DateTimeFormat(pattern = DateUtil.DATE_FORMAT_MM)
private Date endTimeVo;
+ /**
+ * 消费次数
+ */
+ private Integer times;
+
+ public Integer getTimes() {
+ return times;
+ }
+
+ public void setTimes(Integer times) {
+ this.times = times;
+ }
public String getBeatuyId() {
return beatuyId;
--
Gitblit v1.9.1