From 63bf3eac0b63606348e40d994a54de1cd4b6d3b9 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 28 三月 2020 16:44:50 +0800
Subject: [PATCH] 数据统计 + 会员
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/CountChartsAdminController.java | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/CountChartsAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/CountChartsAdminController.java
index e2f2fd1..64335e7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/CountChartsAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/CountChartsAdminController.java
@@ -849,6 +849,9 @@
BigDecimal result = new BigDecimal(0);
if (listData != null) {
+ BigDecimal totalDay = new BigDecimal(0);
+ BigDecimal totalValid = new BigDecimal(0);
+
for (DailyCountUser history: listData) {
if (dateType == 1) {
String gernalTime = TimeUtil.getGernalTime(history.getDay().getTime());
@@ -862,14 +865,30 @@
gernalTime = gernalTime.substring(1, 2);
}
if (gernalTime.equalsIgnoreCase(date)) {
- result = MoneyBigDecimalUtil.add(result, history.getTotal());
+ if (!history.isRate()) {
+ result = MoneyBigDecimalUtil.add(result, history.getTotal());
+ } else {
+ totalDay = MoneyBigDecimalUtil.add(totalDay, history.getTotalDay());
+ totalValid = MoneyBigDecimalUtil.add(totalValid, history.getTotalValid());
+ }
}
} else if (dateType == 3) {
String gernalTime = TimeUtil.getYearOnlyYYYY(history.getDay());
if (gernalTime.equalsIgnoreCase(date)) {
- result = MoneyBigDecimalUtil.add(result, history.getTotal());
+ if (!history.isRate()) {
+ result = MoneyBigDecimalUtil.add(result, history.getTotal());
+ } else {
+ totalDay = MoneyBigDecimalUtil.add(totalDay, history.getTotalDay());
+ totalValid = MoneyBigDecimalUtil.add(totalValid, history.getTotalValid());
+ }
}
}
+ }
+
+ // 鍒ゆ柇鏄惁璁＄畻姣斾緥
+ if ((dateType == 2 || dateType == 3) && totalDay.compareTo(BigDecimal.valueOf(0)) > 0){
+ result = MoneyBigDecimalUtil.div(totalValid, totalDay);
+ result = MoneyBigDecimalUtil.mul(result, BigDecimal.valueOf(100));
}
}
list.add(result);
@@ -962,6 +981,9 @@
BigDecimal result = new BigDecimal(0);
if (listData != null) {
+ BigDecimal totalDay = new BigDecimal(0);
+ BigDecimal totalValid = new BigDecimal(0);
+
for (DailyCountOrder history: listData) {
if (dateType == 1) {
String gernalTime = TimeUtil.getGernalTime(history.getDay().getTime());
@@ -975,15 +997,31 @@
gernalTime = gernalTime.substring(1, 2);
}
if (gernalTime.equalsIgnoreCase(date)) {
- result = MoneyBigDecimalUtil.add(result, history.getTotal());
+ if (!history.isRate()) {
+ result = MoneyBigDecimalUtil.add(result, history.getTotal());
+ } else {
+ totalDay = MoneyBigDecimalUtil.add(totalDay, history.getTotalDay());
+ totalValid = MoneyBigDecimalUtil.add(totalValid, history.getTotalValid());
+ }
}
} else if (dateType == 3) {
String gernalTime = TimeUtil.getYearOnlyYYYY(history.getDay());
if (gernalTime.equalsIgnoreCase(date)) {
- result = MoneyBigDecimalUtil.add(result, history.getTotal());
+ if (!history.isRate()) {
+ result = MoneyBigDecimalUtil.add(result, history.getTotal());
+ } else {
+ totalDay = MoneyBigDecimalUtil.add(totalDay, history.getTotalDay());
+ totalValid = MoneyBigDecimalUtil.add(totalValid, history.getTotalValid());
+ }
}
}
}
+
+ // 鍒ゆ柇鏄惁璁＄畻姣斾緥
+ if ((dateType == 2 || dateType == 3) && totalDay.compareTo(BigDecimal.valueOf(0)) > 0){
+ result = MoneyBigDecimalUtil.div(totalValid, totalDay);
+ result = MoneyBigDecimalUtil.mul(result, BigDecimal.valueOf(100));
+ }
}
list.add(result);
}
--
Gitblit v1.8.0