From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/StatisticsTimeUtil.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/StatisticsTimeUtil.java b/zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/StatisticsTimeUtil.java
index ce53cac..fa51f5d 100644
--- a/zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/StatisticsTimeUtil.java
+++ b/zq-erp/src/main/java/com/matrix/system/hiveErp/analysUtil/StatisticsTimeUtil.java
@@ -22,17 +22,18 @@
* @param yAxisMap
* @return
*/
- public static Integer[] getSeries(Map<String, Integer> yAxisMap) {
+ public static String[] getSeries(Map<String, Integer> yAxisMap) {
if (MapUtils.isNotEmpty(yAxisMap)) {
- Integer[] seroes = new Integer[yAxisMap.size()-1];
+ String[] seroes = new String[yAxisMap.size()-1];
for (int index=0; index<yAxisMap.size()-1 ; index++) {
if(index<seroes.length){
- seroes[index]=Integer.parseInt(yAxisMap.get("t"+index)+"");
+ System.out.println(yAxisMap.get("t"+index)+"");
+ seroes[index]=yAxisMap.get("t"+index)+"";
}
}
return seroes;
} else {
- return new Integer[0];
+ return new String[0];
}
}
@@ -128,6 +129,9 @@
begin=DateUtil.getDateAfterYear(begin,1);
tims.add(begin);
}
+
+ begin=DateUtil.getDateAfterYear(begin,1);
+ tims.add(begin);
return tims;
}
@@ -142,6 +146,8 @@
begin=DateUtil.getDateAfterMonth(begin,1);
tims.add(begin);
}
+ begin=DateUtil.getDateAfterMonth(begin,1);
+ tims.add(begin);
return tims;
}
@@ -155,6 +161,8 @@
begin=DateUtil.getDateAfter(begin,1);
tims.add(begin);
}
+ begin=DateUtil.getDateAfter(begin,1);
+ tims.add(begin);
return tims;
}
@@ -170,6 +178,8 @@
begin=DateUtil.getDateAfterHours(begin,1);
tims.add(begin);
}
+ begin=DateUtil.getDateAfterHours(begin,1);
+ tims.add(begin);
return tims;
}
--
Gitblit v1.9.1