From eab8cea0dbf3104da6cbb117a604853e5d9f14a0 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 14 Jan 2021 23:20:18 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/app/vo/BusinessesDataShowVo.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 46 insertions(+), 4 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 218f8d1..7806b4f 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,5 +1,6 @@
package com.matrix.system.app.vo;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -75,6 +76,47 @@
@ApiModelProperty(value = "服务时长")
private String timeLength;
+ /**
+ * 当天销售总数量
+ */
+ @ApiModelProperty(hidden = true)
+ private Integer totalSaleCnt;
+
+ /**
+ * 家居产品成本
+ */
+ @ApiModelProperty(hidden = true)
+ private String goodsCost;
+
+ /**
+ * 除家具产品以外成本
+ */
+ @ApiModelProperty(hidden = true)
+ private String otherCost;
+
+ public Integer getTotalSaleCnt() {
+ return totalSaleCnt;
+ }
+
+ public void setTotalSaleCnt(Integer totalSaleCnt) {
+ this.totalSaleCnt = totalSaleCnt;
+ }
+
+ public String getGoodsCost() {
+ return goodsCost;
+ }
+
+ public void setGoodsCost(String goodsCost) {
+ this.goodsCost = goodsCost;
+ }
+
+ public String getOtherCost() {
+ return otherCost;
+ }
+
+ public void setOtherCost(String otherCost) {
+ this.otherCost = otherCost;
+ }
public String getDataTime() {
return dataTime;
@@ -181,7 +223,7 @@
}
public String getCustomGoodsCnt() {
- return customGoodsCnt;
+ return new BigDecimal(totalSaleCnt).divide(new BigDecimal(perCustomCnt), 2, BigDecimal.ROUND_DOWN).toPlainString();
}
public void setCustomGoodsCnt(String customGoodsCnt) {
@@ -197,7 +239,7 @@
}
public String getCost() {
- return cost;
+ return new BigDecimal(goodsCost).add(new BigDecimal(otherCost)).toPlainString();
}
public void setCost(String cost) {
@@ -205,7 +247,7 @@
}
public String getGrossProfit() {
- return grossProfit;
+ return new BigDecimal(totalPay).subtract(new BigDecimal(getCost())).toPlainString();
}
public void setGrossProfit(String grossProfit) {
@@ -213,7 +255,7 @@
}
public String getGrossProfitRate() {
- return grossProfitRate;
+ return new BigDecimal(getGrossProfit()).divide(new BigDecimal(totalPay), 2, BigDecimal.ROUND_DOWN).toPlainString();
}
public void setGrossProfitRate(String grossProfitRate) {
--
Gitblit v1.9.1