From 143c2c814ec2073e127f1a1fcbf6322725ccf545 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 14 Jan 2021 11:14:56 +0800
Subject: [PATCH] modify

---
 zq-erp/src/main/java/com/matrix/system/app/vo/BusinessesDataShowVo.java |   53 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 45 insertions(+), 8 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 f47b02e..8e93c0e 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
@@ -16,20 +16,14 @@
     @ApiModelProperty(value = "营业收入")
     private String totalPay;
 
-    @ApiModelProperty(value = "现金收入")
+    @ApiModelProperty(value = "现金收款")
     private String cashPay;
 
-    @ApiModelProperty(value = "余额划扣")
+    @ApiModelProperty(value = "储值卡收款")
     private String cardPay;
 
     @ApiModelProperty(value = "欠款")
     private String arrearsPay;
-
-    @ApiModelProperty(value = "赠送消耗")
-    private String freeConsumePay;
-
-    @ApiModelProperty(value = "本金消耗")
-    private String consumePay;
 
     @ApiModelProperty(value = "现金退款")
     private String refundCashPay;
@@ -37,6 +31,49 @@
     @ApiModelProperty(value = "卡项退款")
     private String refundCardPay;
 
+    @ApiModelProperty(value = "产品业绩")
+    private String productAchieve;
+
+    @ApiModelProperty(value = "卡项业绩")
+    private String cardAchieve;
+
+    @ApiModelProperty(value = "退款")
+    private String refund;
+
+    @ApiModelProperty(value = "客单数")
+    private String perCustomCnt;
+
+    @ApiModelProperty(value = "客品数")
+    private String customGoodsCnt;
+
+    @ApiModelProperty(value = "客单价")
+    private String perCustomPrice;
+
+    @ApiModelProperty(value = "成本")
+    private String cost;
+
+    @ApiModelProperty(value = "毛利")
+    private String grossProfit;
+
+    @ApiModelProperty(value = "毛利率")
+    private String grossProfitRate;
+
+    @ApiModelProperty(value = "本金消耗")
+    private String consumePay;
+
+    @ApiModelProperty(value = "赠送消耗")
+    private String freeConsumePay;
+
+    @ApiModelProperty(value = "人头数")
+    private String peopleCnt;
+
+    @ApiModelProperty(value = "项目消耗数")
+    private String projConsumeCnt;
+
+    @ApiModelProperty(value = "服务时长")
+    private String timeLength;
+
+
     public String getDataTime() {
         return dataTime;
     }

--
Gitblit v1.9.1