From 92c681fabac989d1a9f16fa13202d7f5ccac52d9 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 14 一月 2019 10:22:22 +0800
Subject: [PATCH] 订单优化 + 后台提现曲线图
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java | 52 +++++++++-------------------------------------------
1 files changed, 9 insertions(+), 43 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java
index f50b971..5c4daea 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoServiceImpl.java
@@ -1234,50 +1234,17 @@
@Override
- public List<Object> count24HOderByChannel(String channel, Integer type, String years,
+ public List<Map<String, Object>> count24HOderByChannel(String channel, Integer type, String years,
String startTime, String endTime) throws Exception{
- List<Map<String, Object>> list = hongBaoMapper.count24HOderByChannel(channel, type, years,
- startTime, endTime);
-
- if (list == null || list.size() == 0) {
- return null;
- }
-
- switch (type){
- case 1: // 鎸夊ぉ澶勭悊
- return dayFactory(startTime, endTime, list);
- case 2: // 鎸夋湀澶勭悊
- return monthFactory(list);
- case 3:
- return yearFactory(list);
- default:
- return null;
- }
-
+ return hongBaoMapper.count24HOderByChannel(channel, type, years, startTime, endTime);
}
@Override
- public List<Object> countHistoryOderByChannel(String channel, Integer type, String years,
+ public List<Map<String, Object>> countHistoryOderByChannel(String channel, Integer type, String years,
String startTime, String endTime) throws Exception{
- List<Map<String, Object>> list = hongBaoMapper.countHistoryOderByChannel(channel, type, years,
+ return hongBaoMapper.countHistoryOderByChannel(channel, type, years,
startTime, endTime);
-
- if (list == null || list.size() == 0) {
- return null;
- }
-
- switch (type){
- case 1: // 鎸夊ぉ澶勭悊
- return dayFactory(startTime, endTime, list);
- case 2: // 鎸夋湀澶勭悊
- return monthFactory(list);
- case 3:
- return yearFactory(list);
- default:
- return null;
- }
-
}
@@ -1321,7 +1288,7 @@
for (int j = 0; j < list.size(); j++) {
Map<String, Object> map = list.get(j);
- Object createDate = map.get("createDate");
+ Object createDate = map.get("showDate");
String month = createDate.toString();
if (plusDay.equalsIgnoreCase(month)) {
payMoney = map.get("payMoney");
@@ -1350,7 +1317,7 @@
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy/MM/dd");
Date parseDate = sdf.parse(plusDay.toString());
- mapObject.put("createDate", sdf2.format(parseDate));
+ mapObject.put("showDate", sdf2.format(parseDate));
listObject.add(mapObject);
@@ -1375,7 +1342,7 @@
for (int j = 0; j < list.size(); j++) {
Map<String, Object> map = list.get(j);
- Object createDate = map.get("createDate");
+ Object createDate = map.get("showDate");
String month = createDate.toString();
if ((i+"").equalsIgnoreCase(month) || i == Integer.parseInt(month)) {
payMoney = map.get("payMoney");
@@ -1400,7 +1367,7 @@
}
mapObject.put("commision", commision);
- mapObject.put("createDate", i + "鏈�");
+ mapObject.put("showDate", i + "鏈�");
listObject.add(mapObject);
}
@@ -1430,8 +1397,7 @@
if (commision == null) {
commision = 0;
}
- map.put("commision", commision + "骞�");
-
+ map.put("commision", commision);
listObject.add(map);
}
--
Gitblit v1.8.0