From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0
---
zq-erp/src/main/java/com/matrix/system/app/vo/BusinessesDataShowVo.java | 248 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 211 insertions(+), 37 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 8e93c0e..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
@@ -1,7 +1,10 @@
package com.matrix.system.app.vo;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
/**
* @author wzy
@@ -14,65 +17,112 @@
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;
+ /**
+ * 当天销售总数量
+ */
+ @ApiModelProperty(hidden = true)
+ private Integer totalSaleCnt;
+
+ /**
+ * 家居产品成本
+ */
+ @ApiModelProperty(hidden = true)
+ private BigDecimal goodsCost;
+
+ /**
+ * 除家具产品以外成本
+ */
+ @ApiModelProperty(hidden = true)
+ private BigDecimal otherCost;
+
+ public Integer getTotalSaleCnt() {
+ return totalSaleCnt;
+ }
+
+ public void setTotalSaleCnt(Integer totalSaleCnt) {
+ this.totalSaleCnt = totalSaleCnt;
+ }
+
+ public BigDecimal getGoodsCost() {
+ return goodsCost;
+ }
+
+ public void setGoodsCost(BigDecimal goodsCost) {
+ this.goodsCost = goodsCost;
+ }
+
+ public BigDecimal getOtherCost() {
+ return otherCost;
+ }
+
+ public void setOtherCost(BigDecimal otherCost) {
+ this.otherCost = otherCost;
+ }
public String getDataTime() {
return dataTime;
@@ -82,67 +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 BigDecimal getProductAchieve() {
+ return productAchieve;
+ }
+
+ public void setProductAchieve(BigDecimal productAchieve) {
+ this.productAchieve = productAchieve;
+ }
+
+ public BigDecimal getCardAchieve() {
+ return cardAchieve;
+ }
+
+ public void setCardAchieve(BigDecimal cardAchieve) {
+ this.cardAchieve = cardAchieve;
+ }
+
+ public BigDecimal getRefund() {
+ return refund;
+ }
+
+ public void setRefund(BigDecimal refund) {
+ this.refund = refund;
+ }
+
+ public BigDecimal getPerCustomCnt() {
+ return perCustomCnt;
+ }
+
+ public void setPerCustomCnt(BigDecimal perCustomCnt) {
+ this.perCustomCnt = perCustomCnt;
+ }
+
+ 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(BigDecimal customGoodsCnt) {
+ this.customGoodsCnt = customGoodsCnt;
+ }
+
+ public BigDecimal getPerCustomPrice() {
+ if (perCustomCnt.compareTo(BigDecimal.ZERO) != 0) {
+ return totalPay.divide(perCustomCnt, 2, BigDecimal.ROUND_DOWN);
+ } else {
+ return BigDecimal.ZERO;
+ }
+ }
+
+ public void setPerCustomPrice(BigDecimal perCustomPrice) {
+ this.perCustomPrice = perCustomPrice;
+ }
+
+ public BigDecimal getCost() {
+ return goodsCost.add(otherCost);
+ }
+
+ public void setCost(BigDecimal cost) {
+ this.cost = cost;
+ }
+
+ public BigDecimal getGrossProfit() {
+ return totalPay.subtract(getCost());
+ }
+
+ public void setGrossProfit(BigDecimal grossProfit) {
+ this.grossProfit = grossProfit;
+ }
+
+ public BigDecimal getGrossProfitRate() {
+ if (totalPay.compareTo(BigDecimal.ZERO) != 0) {
+ return getGrossProfit().divide(totalPay, 2, BigDecimal.ROUND_DOWN);
+ } else {
+ return BigDecimal.ZERO;
+ }
+ }
+
+ public void setGrossProfitRate(BigDecimal grossProfitRate) {
+ this.grossProfitRate = grossProfitRate;
+ }
+
+ public BigDecimal getPeopleCnt() {
+ return peopleCnt == null ? BigDecimal.ZERO : peopleCnt.setScale(2, BigDecimal.ROUND_DOWN);
+ }
+
+ public void setPeopleCnt(BigDecimal peopleCnt) {
+ this.peopleCnt = peopleCnt;
+ }
+
+ public BigDecimal getProjConsumeCnt() {
+ return projConsumeCnt;
+ }
+
+ public void setProjConsumeCnt(BigDecimal projConsumeCnt) {
+ this.projConsumeCnt = projConsumeCnt;
+ }
+
+ public BigDecimal getTimeLength() {
+ return 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