From db0722ccb5dda632e8c0153b5b01df569926d727 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sun, 11 Jul 2021 09:12:27 +0800
Subject: [PATCH] 总部新增取消按钮
---
zq-erp/src/main/java/com/matrix/system/app/vo/BusinessesDataShowVo.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/BusinessesDataShowVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/BusinessesDataShowVo.java
index ab14537..5fae6d9 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/BusinessesDataShowVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/BusinessesDataShowVo.java
@@ -40,6 +40,12 @@
@ApiModelProperty(value = "卡项业绩")
private BigDecimal cardAchieve;
+ @ApiModelProperty(value = "储值卡本金扣款")
+ private BigDecimal cardAmount;
+
+ @ApiModelProperty(value = "储值卡增金扣款")
+ private BigDecimal cardFreeAmount;
+
@ApiModelProperty(value = "退款")
private BigDecimal refund;
@@ -275,7 +281,7 @@
}
public BigDecimal getPeopleCnt() {
- return peopleCnt;
+ return peopleCnt == null ? BigDecimal.ZERO : peopleCnt.setScale(2, BigDecimal.ROUND_DOWN);
}
public void setPeopleCnt(BigDecimal peopleCnt) {
@@ -297,4 +303,20 @@
public void setTimeLength(BigDecimal timeLength) {
this.timeLength = timeLength;
}
+
+ public BigDecimal getCardAmount() {
+ return cardAmount;
+ }
+
+ public void setCardAmount(BigDecimal cardAmount) {
+ this.cardAmount = cardAmount;
+ }
+
+ public BigDecimal getCardFreeAmount() {
+ return cardFreeAmount;
+ }
+
+ public void setCardFreeAmount(BigDecimal cardFreeAmount) {
+ this.cardFreeAmount = cardFreeAmount;
+ }
}
--
Gitblit v1.9.1