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/BusinessesDataShowVo.java | 180 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 107 insertions(+), 73 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 7806b4f..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
@@ -17,64 +17,70 @@
private String dataTime;
@ApiModelProperty(value = "营业收入")
- private String totalPay;
+ private BigDecimal totalPay;
@ApiModelProperty(value = "现金收款")
- private String cashPay;
+ private BigDecimal cashPay;
@ApiModelProperty(value = "储值卡收款")
- private String cardPay;
+ private BigDecimal cardPay;
@ApiModelProperty(value = "欠款")
- private String arrearsPay;
+ private BigDecimal arrearsPay;
@ApiModelProperty(value = "现金退款")
- private String refundCashPay;
+ private BigDecimal refundCashPay;
@ApiModelProperty(value = "卡项退款")
- private String refundCardPay;
+ private BigDecimal refundCardPay;
@ApiModelProperty(value = "产品业绩")
- private String productAchieve;
+ private BigDecimal productAchieve;
@ApiModelProperty(value = "卡项业绩")
- private String cardAchieve;
+ private BigDecimal cardAchieve;
+
+ @ApiModelProperty(value = "储值卡本金扣款")
+ private BigDecimal cardAmount;
+
+ @ApiModelProperty(value = "储值卡增金扣款")
+ private BigDecimal cardFreeAmount;
@ApiModelProperty(value = "退款")
- private String refund;
+ private BigDecimal refund;
@ApiModelProperty(value = "客单数")
- private String perCustomCnt;
+ private BigDecimal perCustomCnt;
@ApiModelProperty(value = "客品数")
- private String customGoodsCnt;
+ private BigDecimal customGoodsCnt;
@ApiModelProperty(value = "客单价")
- private String perCustomPrice;
+ private BigDecimal perCustomPrice;
@ApiModelProperty(value = "成本")
- private String cost;
+ private BigDecimal cost;
@ApiModelProperty(value = "毛利")
- private String grossProfit;
+ private BigDecimal grossProfit;
@ApiModelProperty(value = "毛利率")
- private String grossProfitRate;
+ private BigDecimal grossProfitRate;
@ApiModelProperty(value = "本金消耗")
- private String consumePay;
+ private BigDecimal consumePay;
@ApiModelProperty(value = "赠送消耗")
- private String freeConsumePay;
+ private BigDecimal freeConsumePay;
@ApiModelProperty(value = "人头数")
- private String peopleCnt;
+ private BigDecimal peopleCnt;
@ApiModelProperty(value = "项目消耗数")
- private String projConsumeCnt;
+ private BigDecimal projConsumeCnt;
@ApiModelProperty(value = "服务时长")
- private String timeLength;
+ private BigDecimal timeLength;
/**
* 当天销售总数量
@@ -86,13 +92,13 @@
* 家居产品成本
*/
@ApiModelProperty(hidden = true)
- private String goodsCost;
+ private BigDecimal goodsCost;
/**
* 除家具产品以外成本
*/
@ApiModelProperty(hidden = true)
- private String otherCost;
+ private BigDecimal otherCost;
public Integer getTotalSaleCnt() {
return totalSaleCnt;
@@ -102,19 +108,19 @@
this.totalSaleCnt = totalSaleCnt;
}
- public String getGoodsCost() {
+ public BigDecimal getGoodsCost() {
return goodsCost;
}
- public void setGoodsCost(String goodsCost) {
+ public void setGoodsCost(BigDecimal goodsCost) {
this.goodsCost = goodsCost;
}
- public String getOtherCost() {
+ public BigDecimal getOtherCost() {
return otherCost;
}
- public void setOtherCost(String otherCost) {
+ public void setOtherCost(BigDecimal otherCost) {
this.otherCost = otherCost;
}
@@ -126,163 +132,191 @@
this.dataTime = dataTime;
}
- public String getTotalPay() {
+ public BigDecimal getTotalPay() {
return totalPay;
}
- public void setTotalPay(String totalPay) {
+ public void setTotalPay(BigDecimal totalPay) {
this.totalPay = totalPay;
}
- public String getCashPay() {
+ public BigDecimal getCashPay() {
return cashPay;
}
- public void setCashPay(String cashPay) {
+ public void setCashPay(BigDecimal cashPay) {
this.cashPay = cashPay;
}
- public String getCardPay() {
+ public BigDecimal getCardPay() {
return cardPay;
}
- public void setCardPay(String cardPay) {
+ public void setCardPay(BigDecimal cardPay) {
this.cardPay = cardPay;
}
- public String getArrearsPay() {
+ public BigDecimal getArrearsPay() {
return arrearsPay;
}
- public void setArrearsPay(String arrearsPay) {
+ public void setArrearsPay(BigDecimal arrearsPay) {
this.arrearsPay = arrearsPay;
}
- public String getFreeConsumePay() {
+ public BigDecimal getFreeConsumePay() {
return freeConsumePay;
}
- public void setFreeConsumePay(String freeConsumePay) {
+ public void setFreeConsumePay(BigDecimal freeConsumePay) {
this.freeConsumePay = freeConsumePay;
}
- public String getConsumePay() {
- return consumePay;
+ public BigDecimal getConsumePay() {
+ return consumePay.setScale(2, BigDecimal.ROUND_HALF_UP);
}
- public void setConsumePay(String consumePay) {
+ public void setConsumePay(BigDecimal consumePay) {
this.consumePay = consumePay;
}
- public String getRefundCashPay() {
+ public BigDecimal getRefundCashPay() {
return refundCashPay;
}
- public void setRefundCashPay(String refundCashPay) {
+ public void setRefundCashPay(BigDecimal refundCashPay) {
this.refundCashPay = refundCashPay;
}
- public String getRefundCardPay() {
+ public BigDecimal getRefundCardPay() {
return refundCardPay;
}
- public void setRefundCardPay(String refundCardPay) {
+ public void setRefundCardPay(BigDecimal refundCardPay) {
this.refundCardPay = refundCardPay;
}
- public String getProductAchieve() {
+ public BigDecimal getProductAchieve() {
return productAchieve;
}
- public void setProductAchieve(String productAchieve) {
+ public void setProductAchieve(BigDecimal productAchieve) {
this.productAchieve = productAchieve;
}
- public String getCardAchieve() {
+ public BigDecimal getCardAchieve() {
return cardAchieve;
}
- public void setCardAchieve(String cardAchieve) {
+ public void setCardAchieve(BigDecimal cardAchieve) {
this.cardAchieve = cardAchieve;
}
- public String getRefund() {
+ public BigDecimal getRefund() {
return refund;
}
- public void setRefund(String refund) {
+ public void setRefund(BigDecimal refund) {
this.refund = refund;
}
- public String getPerCustomCnt() {
+ public BigDecimal getPerCustomCnt() {
return perCustomCnt;
}
- public void setPerCustomCnt(String perCustomCnt) {
+ public void setPerCustomCnt(BigDecimal perCustomCnt) {
this.perCustomCnt = perCustomCnt;
}
- public String getCustomGoodsCnt() {
- return new BigDecimal(totalSaleCnt).divide(new BigDecimal(perCustomCnt), 2, BigDecimal.ROUND_DOWN).toPlainString();
+ public BigDecimal getCustomGoodsCnt() {
+ if (BigDecimal.ZERO.compareTo(perCustomCnt) != 0) {
+ return new BigDecimal(totalSaleCnt).divide(perCustomCnt, 2, BigDecimal.ROUND_DOWN);
+ } else {
+ return BigDecimal.ZERO;
+ }
}
- public void setCustomGoodsCnt(String customGoodsCnt) {
+ public void setCustomGoodsCnt(BigDecimal customGoodsCnt) {
this.customGoodsCnt = customGoodsCnt;
}
- public String getPerCustomPrice() {
- return new BigDecimal(totalPay).divide(new BigDecimal(perCustomCnt), 2, BigDecimal.ROUND_DOWN).toPlainString();
+ public BigDecimal getPerCustomPrice() {
+ if (perCustomCnt.compareTo(BigDecimal.ZERO) != 0) {
+ return totalPay.divide(perCustomCnt, 2, BigDecimal.ROUND_DOWN);
+ } else {
+ return BigDecimal.ZERO;
+ }
}
- public void setPerCustomPrice(String perCustomPrice) {
+ public void setPerCustomPrice(BigDecimal perCustomPrice) {
this.perCustomPrice = perCustomPrice;
}
- public String getCost() {
- return new BigDecimal(goodsCost).add(new BigDecimal(otherCost)).toPlainString();
+ public BigDecimal getCost() {
+ return goodsCost.add(otherCost);
}
- public void setCost(String cost) {
+ public void setCost(BigDecimal cost) {
this.cost = cost;
}
- public String getGrossProfit() {
- return new BigDecimal(totalPay).subtract(new BigDecimal(getCost())).toPlainString();
+ public BigDecimal getGrossProfit() {
+ return totalPay.subtract(getCost());
}
- public void setGrossProfit(String grossProfit) {
+ public void setGrossProfit(BigDecimal grossProfit) {
this.grossProfit = grossProfit;
}
- public String getGrossProfitRate() {
- return new BigDecimal(getGrossProfit()).divide(new BigDecimal(totalPay), 2, BigDecimal.ROUND_DOWN).toPlainString();
+ public BigDecimal getGrossProfitRate() {
+ if (totalPay.compareTo(BigDecimal.ZERO) != 0) {
+ return getGrossProfit().divide(totalPay, 2, BigDecimal.ROUND_DOWN);
+ } else {
+ return BigDecimal.ZERO;
+ }
}
- public void setGrossProfitRate(String grossProfitRate) {
+ public void setGrossProfitRate(BigDecimal grossProfitRate) {
this.grossProfitRate = grossProfitRate;
}
- public String getPeopleCnt() {
- return peopleCnt;
+ public BigDecimal getPeopleCnt() {
+ return peopleCnt == null ? BigDecimal.ZERO : peopleCnt.setScale(2, BigDecimal.ROUND_DOWN);
}
- public void setPeopleCnt(String peopleCnt) {
+ public void setPeopleCnt(BigDecimal peopleCnt) {
this.peopleCnt = peopleCnt;
}
- public String getProjConsumeCnt() {
+ public BigDecimal getProjConsumeCnt() {
return projConsumeCnt;
}
- public void setProjConsumeCnt(String projConsumeCnt) {
+ public void setProjConsumeCnt(BigDecimal projConsumeCnt) {
this.projConsumeCnt = projConsumeCnt;
}
- public String getTimeLength() {
+ public BigDecimal getTimeLength() {
return timeLength;
}
- public void setTimeLength(String timeLength) {
+ 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