From bd8213ddfe04f41b7ad0f4c6377afbe39a44b4af Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 18 一月 2019 15:54:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserInfoCountServiceImpl.java |  224 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 217 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserInfoCountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserInfoCountServiceImpl.java
index 542a69b..e07e639 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserInfoCountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/UserInfoCountServiceImpl.java
@@ -2,16 +2,14 @@
 
 
 import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
+import java.text.DecimalFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import javax.annotation.Resource;
 
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 import org.yeshi.utils.DateUtil;
 
@@ -59,21 +57,233 @@
 	}
 
 	@Override
-	public List<Map<String, Object>> getTodayBuyRate(String channel,Integer type,String years, String startTime, 
+	public List<Map<String, Object>> getTodayBuyRate(String channel, Integer dateType,String years, String startTime, 
 			String endTime) throws Exception {
 		
-		List<Map<String, Object>> todayNum = 
-				userInfoMapper.getTodayHasOrder(channel, type, years, startTime, endTime);
+		List<Map<String, Object>> result_list = null;
 		
+		List<Map<String, Object>> listToday = 
+				userInfoMapper.getTodayHasOrder(channel, dateType, years, startTime, endTime);
 		
+		if (listToday == null || listToday.size() == 0) {
+			return result_list;
+		} 
 		
-		return todayNum;
+		List<Map<String, Object>> listTotal = 
+				userInfoMapper.countNewUserByDate(channel, dateType, years, startTime, endTime);
 		
+		if (listTotal == null || listTotal.size() == 0) {
+			return result_list;
+		}
 		
+		switch (dateType){
+			case 1: // 鎸夊ぉ澶勭悊
+				result_list = dayFactory(startTime, endTime, listTotal);
+				break;
+			case 2: // 鎸夋湀澶勭悊
+				result_list = monthFactory(listTotal);
+				break;
+			case 3: 
+				result_list =  yearFactory(listTotal);
+				break;
+			default: 
+				break;
+		}
 		
+		DecimalFormat df = new DecimalFormat("#.00");
 		
+		for (int i = 0; i < result_list.size(); i++) {
+			
+			double proportion = 0;
+			Map<String, Object> resultMap = result_list.get(i);
+			Object showDate = resultMap.get("showDate");
+			
+			for (int j = 0; j < listToday.size(); j++) {
+				
+				Map<String, Object> innerMap = listToday.get(j);
+				Object innerDate = innerMap.get("showDate");
+				
+				if (innerDate != null && innerDate.toString().equals(showDate.toString())) {
+					Object innerValue = innerMap.get("showValue");
+					long innerData = Long.parseLong(innerValue.toString());
+					
+					Object showValue = resultMap.get("showValue");
+					long showData = Long.parseLong(showValue.toString());
+					
+					if (showData > 0) {
+						proportion =  innerData/(double)showData;
+					}
+					
+					break; // 缁撴潫鍐呴儴寰幆
+				}
+			}
+			
+			resultMap.put("showValue", Double.parseDouble(df.format(proportion *100)));
+		}
+		
+		return result_list;
 	}
 	
 	
+	@Override
+	public List<Object> getWeekBuyRate(String channel, String startTime, String endTime,
+			Integer orderNum, List<String> dateList)
+			throws Exception {
+
+		List<Object> resultList = new ArrayList<Object>();
+
+		if (dateList == null || dateList.size() == 0) {
+			return resultList;
+		}
+
+		List<Map<String, Object>> totalList = userInfoMapper.countNewUserByDate(channel, 1, null, startTime, endTime);
+		if (totalList == null || totalList.size() == 0) {
+			return resultList;
+		}
+
+		DecimalFormat df = new DecimalFormat("#.00");
+		for (int i = 0; i < dateList.size(); i++) {
+			double proportion = 0;
+
+			String showDate = dateList.get(i);
+			String plusDay = DateUtil.plusDay(7, showDate);
+			Map<String, Object> map = userInfoMapper.getWeekHasOrder(channel, showDate, plusDay, orderNum);
+
+			Object showValue = null;
+			if (map != null) {
+				showValue = map.get("showValue");
+
+				if (showValue != null) {
+					for (int j = 0; j < totalList.size(); j++) {
+						Map<String, Object> mapTotal = totalList.get(j);
+						String reslutTime = mapTotal.get("showDate").toString();
+						if (showDate.equalsIgnoreCase(reslutTime)) {
+							Object totalObject = mapTotal.get("showValue");
+
+							long hasCount = Long.parseLong(showValue.toString());
+							long total = Long.parseLong(totalObject.toString());
+
+							if (total > 0) {
+								proportion = hasCount / (double) total;
+							}
+
+							break;
+						}
+					}
+				}
+			}
+			resultList.add(Double.parseDouble(df.format(proportion * 100)));
+		}
+
+		return resultList;
+	}
+	
+	
+	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);
+
+			mapObject.put("showDate", plusDay);
+
+			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("showValue");
+					break;
+				}
+			}
+
+			if (total == null) {
+				total = 0;
+			}
+			mapObject.put("showValue", total);
+			
+			if (i <10) {
+				mapObject.put("showDate", "0"+ i);
+			} else {
+				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("showValue");
+
+			if (total == null) {
+				total = 0;
+			}
+			map.put("showValue", total);
+
+			listObject.add(map);
+		}
+
+		return listObject;
+	}
+
 
 }

--
Gitblit v1.8.0