From 9c791d431038fe79a111805762ee2f42c96b51c5 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 08 Nov 2021 17:03:15 +0800 Subject: [PATCH] fix --- zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 59 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java index 89504e2..c9b6e8b 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java +++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java @@ -23,10 +23,13 @@ @ApiModelProperty(value = "商品名称") private String name; + @ApiModelProperty(value = "套餐来源,转让,购买") + private String source; + @ApiModelProperty(value = "时长") private Integer timeLength; - @JsonFormat(pattern = DateUtil.DATE_FORMAT_DD) + @JsonFormat(pattern = DateUtil.DATE_FORMAT_DD, timezone = "GMT+8") @ApiModelProperty(value = "有效期") private Date invalidTime; @@ -35,6 +38,33 @@ @ApiModelProperty(value = "图片") private String img; + + @ApiModelProperty(value = "快过期 1-是 2-否") + private String isInvalid; + + @ApiModelProperty(value = " 使用情况余额") + private Double balance; + + @ApiModelProperty(value = "项目状态 有效/无效") + private String status; + + public String getIsInvalid() { + Date date = DateUtil.getDateAfterMonth(new Date(), 1); + if (invalidTime != null) { + if (new Date().after(invalidTime)) { + return "3"; + } + + if (date.after(invalidTime)) { + return "1"; + } + } + return "2"; + } + + public void setIsInvalid(String isInvalid) { + this.isInvalid = isInvalid; + } public String getName() { return name; @@ -91,4 +121,32 @@ public void setId(Long id) { this.id = id; } + + public String getStatus() { + if ("有效".equals(status)) { + return "1"; + } else { + return "2"; + } + } + + public void setStatus(String status) { + this.status = status; + } + + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + + public Double getBalance() { + return balance; + } + + public void setBalance(Double balance) { + this.balance = balance; + } } -- Gitblit v1.9.1