From 1eedb8a57c2eb5c9953dcf058184ebdc6987fbf5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 24 May 2022 15:14:21 +0800
Subject: [PATCH] Merge branch 'feature/订单服务单代码改造' into alpha
---
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java | 70 +++++++++++++++++++++++++++++++++++
1 files changed, 70 insertions(+), 0 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 a6ae967..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;
/**
@@ -23,6 +24,12 @@
@ApiModelProperty(value = "商品名称")
private String name;
+ @ApiModelProperty(value = "套餐来源，转让，购买")
+ private String source;
+
+ @ApiModelProperty(value = "划扣金额")
+ private BigDecimal price;
+
@ApiModelProperty(value = "时长")
private Integer timeLength;
@@ -35,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;
@@ -91,4 +125,40 @@
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