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/app/vo/VipCardListVo.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/VipCardListVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/VipCardListVo.java
index 58007a1..1098de9 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/VipCardListVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/VipCardListVo.java
@@ -1,6 +1,10 @@
package com.matrix.system.app.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.matrix.core.tools.DateUtil;
+import com.matrix.system.constance.Dictionary;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
import java.util.Date;
@@ -12,16 +16,20 @@
@ApiModel(value = "VipCardListVo", description = "会员卡项列表")
public class VipCardListVo {
+ @ApiModelProperty(value = "卡项名称")
private String cardName;
- private String vipNo;
-
+ @ApiModelProperty(value = "现有金额")
private BigDecimal realMoney;
+ @ApiModelProperty(value = "赠送金额")
private BigDecimal giftMoney;
+ @ApiModelProperty(value = "状态 1-有效 2-无效")
private String status;
+ @JsonFormat(pattern = DateUtil.DATE_FORMAT_DD, timezone = "GMT+8")
+ @ApiModelProperty(value = "有效时间")
private Date failTime;
public String getCardName() {
@@ -30,14 +38,6 @@
public void setCardName(String cardName) {
this.cardName = cardName;
- }
-
- public String getVipNo() {
- return vipNo;
- }
-
- public void setVipNo(String vipNo) {
- this.vipNo = vipNo;
}
public BigDecimal getRealMoney() {
@@ -61,7 +61,11 @@
}
public void setStatus(String status) {
- this.status = status;
+ if (Dictionary.MONEYCARD_STATUS_YX.equals(status)) {
+ this.status = "1";
+ } else {
+ this.status = "2";
+ }
}
public Date getFailTime() {
--
Gitblit v1.9.1