From 1ceabefb451912daa5dda7768b7ef0b89a56c08a Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Fri, 25 Mar 2022 12:28:00 +0800 Subject: [PATCH] 1 --- 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 714b2bf..be5703e 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; @@ -167,7 +173,7 @@ } public BigDecimal getConsumePay() { - return consumePay; + return consumePay.setScale(2, BigDecimal.ROUND_HALF_UP); } public void setConsumePay(BigDecimal consumePay) { @@ -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