From e423d56d730db1baed24f3f7dbbc4141038776b6 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 18 Jun 2021 22:12:03 +0800
Subject: [PATCH] 修复每日业绩bug和优化赠送业绩计算方式
---
zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/StatisticsParamVo.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/StatisticsParamVo.java b/zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/StatisticsParamVo.java
index dba0746..8bd9e7a 100644
--- a/zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/StatisticsParamVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/StatisticsParamVo.java
@@ -1,33 +1,62 @@
package com.matrix.system.hiveErp.analysUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotBlank;
+
/**
* 统计查询条件
* @author jyy
*/
+@ApiModel(value = "StatisticsParamVo", description = "专项统计接收参数类")
public class StatisticsParamVo {
+
+ public static final String COMPANY = "1";
+
+ public static final String SHOP = "2";
/**
* 开始时间
*/
+ @NotBlank(message = "参数错误")
+ @ApiModelProperty(value = "开始时间", example = "2020-12-01")
private String beginTime;
/**
*结束时间
*/
+ @NotBlank(message = "参数错误")
+ @ApiModelProperty(value = "结束时间", example = "2020-12-31")
private String endTime;
/**
*统计单位
*/
+ @NotBlank(message = "参数错误")
+ @ApiModelProperty(value = "统计单位", example = "日")
private String statisticsUnit;
/**
*对比单位
*/
+ @ApiModelProperty(hidden = true)
private String contrastUnit;
/**
* 门店id
*/
- private String shopId;
+ @ApiModelProperty(value = "门店ID, 不传默认统计整个公司")
+ private Long shopId;
+
+ @ApiModelProperty(value = "类型 1-营业收入 2-现金收入 3-余额划扣 4-本金消耗 5-赠送消耗 6-现金退款 7-卡项退款 8-欠款", example = "1")
+ private String type;
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
public String getBeginTime() {
return beginTime;
@@ -61,11 +90,11 @@
this.contrastUnit = contrastUnit;
}
- public String getShopId() {
+ public Long getShopId() {
return shopId;
}
- public void setShopId(String shopId) {
+ public void setShopId(Long shopId) {
this.shopId = shopId;
}
}
--
Gitblit v1.9.1