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/MoneyCardUse.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUse.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUse.java
index 524a8d2..5c37494 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUse.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUse.java
@@ -1,7 +1,8 @@
package com.matrix.system.hive.bean;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.matrix.core.anotations.Extend;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.plugin.util.MoneyUtil;
import com.matrix.system.hive.pojo.MoneyCardUserVo;
import org.springframework.format.annotation.DateTimeFormat;
@@ -67,7 +68,8 @@
/**
* 失效时间
*/
- @DateTimeFormat(pattern= DateUtils.DATE_FORMAT_DD)
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_DD, timezone = "GMT+8")
+ @DateTimeFormat(pattern= DateUtil.DATE_FORMAT_DD)
private Date failTime;
@@ -75,6 +77,11 @@
* 充值卡的id
*/
private Long goodsId;
+
+ /**
+ * 订单ID
+ */
+ private Long orderId;
private Long vipId;
@@ -86,7 +93,7 @@
private String isOver;
/**
- * 是会籍卡? Y 是，N否
+ * 是默认储值卡? Y 是，N否
*/
private String isVipCar;
/**
@@ -103,6 +110,14 @@
*/
private String cardName;
+ public Long getOrderId() {
+ return orderId;
+ }
+
+ public void setOrderId(Long orderId) {
+ this.orderId = orderId;
+ }
+
public String getCardName() {
return cardName;
}
--
Gitblit v1.9.1