From 79ceb6d830499561abc1e86d976ca10ccd1fd7ed Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 14 一月 2019 18:18:54 +0800
Subject: [PATCH] Merge branch 'div1'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java | 140 ----------------------------------------------
1 files changed, 2 insertions(+), 138 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java
index cbfd979..85396a7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java
@@ -287,23 +287,7 @@
@Override
public List<Map<String, Object>> countLostNum( Integer dateType, Integer resultCode,
String year, String startTime, String endTime) throws Exception {
-
- List<Map<String, Object>> list = lostOrderMapper.countLostNum(dateType, resultCode, year, startTime, endTime);
-
- if (list == null || list.size() == 0) {
- return null;
- }
-
- switch (dateType){
- case 1: // 鎸夊ぉ澶勭悊
- return dayFactory(startTime, endTime, list);
- case 2: // 鎸夋湀澶勭悊
- return monthFactory(list);
- case 3:
- return yearFactory(list);
- default:
- return null;
- }
+ return lostOrderMapper.countLostNum(dateType, resultCode, year, startTime, endTime);
}
@@ -311,127 +295,7 @@
public List<Map<String, Object>> countAppealMoney( Integer dateType, String year, String startTime,
String endTime) throws Exception {
- List<Map<String, Object>> list = lostOrderMapper.countAppealMoney(dateType, year, startTime, endTime);
-
- if (list == null || list.size() == 0) {
- return null;
- }
-
- switch (dateType){
- case 1: // 鎸夊ぉ澶勭悊
- return dayFactory(startTime, endTime, list);
- case 2: // 鎸夋湀澶勭悊
- return monthFactory(list);
- case 3:
- return yearFactory(list);
- default:
- return null;
- }
+ return lostOrderMapper.countAppealMoney(dateType, year, startTime, endTime);
}
- public List<Map<String, Object>> dayFactory(String startTime, String endTime, List<Map<String, Object>> list) throws Exception {
-
- List<Map<String, Object>> listObject = new ArrayList<Map<String, Object>>();
-
- if (startTime.equals(endTime)) {
-
- Map<String, Object> map = list.get(0);
- Object total = map.get("showValue");
- if (total == null) {
- map.put("showValue", 0);
- }
- listObject.add(map);
- return listObject;
- }
-
- String plusDay = "";
- for (int i = 0; i < 1000; i++) {
- if (i == 0) {
- plusDay = startTime;
- } else {
- plusDay = DateUtil.plusDay(i, startTime);
- }
-
- Map<String, Object> mapObject = new HashMap<String, Object>();
- Object total = null;
-
- for (int j = 0; j < list.size(); j++) {
- Map<String, Object> map = list.get(j);
- Object createDate = map.get("showDate");
- String month = createDate.toString();
- if (plusDay.equalsIgnoreCase(month)) {
- total = map.get("showValue");
- break;
- }
- }
-
- if (total == null) {
- total = 0;
- }
- mapObject.put("showValue", total);
-
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy/MM/dd");
- Date parseDate = sdf.parse(plusDay.toString());
-
- mapObject.put("showDate", sdf2.format(parseDate));
-
- listObject.add(mapObject);
-
- if (plusDay.equals(endTime)) {
- break; // 鏃堕棿缁撴潫
- }
- }
-
- return listObject;
- }
-
- public List<Map<String, Object>> monthFactory(List<Map<String, Object>> list) {
-
- List<Map<String, Object>> listObject = new ArrayList<Map<String, Object>>();
- // 12 涓湀澶勭悊
- for (int i = 1; i <= 12; i++) {
- Map<String, Object> mapObject = new HashMap<String, Object>();
- Object total = null;
-
- for (int j = 0; j < list.size(); j++) {
- Map<String, Object> map = list.get(j);
- Object createDate = map.get("showDate");
- String month = createDate.toString();
- if ((i + "").equalsIgnoreCase(month) || i == Integer.parseInt(month)) {
- total = map.get("total");
- break;
- }
- }
-
- if (total == null) {
- total = 0;
- }
- mapObject.put("total", total);
-
- mapObject.put("showDate", i + "鏈�");
-
- listObject.add(mapObject);
- }
- return listObject;
- }
-
- public List<Map<String, Object>> yearFactory(List<Map<String, Object>> list) {
-
- List<Map<String, Object>> listObject = new ArrayList<Map<String, Object>>();
-
- for (int i = 0; i < list.size(); i++) {
- Map<String, Object> map = list.get(i);
- Object total = map.get("total");
-
- if (total == null) {
- total = 0;
- }
- map.put("total", total);
-
- listObject.add(map);
- }
-
- return listObject;
- }
}
--
Gitblit v1.8.0