From 2967cb41a0a2ee19e82fc96e54e6863615008409 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 22 Feb 2022 16:48:42 +0800
Subject: [PATCH] fix

---
 zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java |   83 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 82 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 bbe4758..6fb3473 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
@@ -5,6 +5,7 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -14,16 +15,25 @@
 @ApiModel(value = "ServiceProjVo", description = "用户项目返回参数类")
 public class ServiceProjVo {
 
+    @ApiModelProperty(value = "id")
+    private Long id;
+
     @ApiModelProperty(value = "订单ID")
     private Long projId;
 
     @ApiModelProperty(value = "商品名称")
     private String name;
 
+    @ApiModelProperty(value = "套餐来源，转让，购买")
+    private String source;
+
+    @ApiModelProperty(value = "划扣金额")
+    private BigDecimal price;
+
     @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;
 
@@ -32,6 +42,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;
@@ -80,4 +117,48 @@
     public void setImg(String img) {
         this.img = img;
     }
+
+    public Long getId() {
+        return id;
+    }
+
+    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;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
 }

--
Gitblit v1.9.1