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/user/UserActiveLogServiceImpl.java | 125 ++++++++++++++++++-----------------------
1 files changed, 54 insertions(+), 71 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserActiveLogServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserActiveLogServiceImpl.java
index dad8a40..76c1b5a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserActiveLogServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserActiveLogServiceImpl.java
@@ -1,7 +1,6 @@
package com.yeshi.fanli.service.impl.user;
import java.math.BigDecimal;
-import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -42,31 +41,14 @@
@Override
public UserActiveLog getUserLatestActiveInfo(Long uid) {
-
return userActiveLogMapper.selectLatestByUid(uid);
}
@Override
- public List<Object> countSameDayByChannel(String channel, Integer type, String years,
+ public List<Map<String, Object>> countSameDayByChannel(String channel, Integer type, String years,
String startTime, String endTime) throws Exception{
- List<Map<String, Object>> list = userActiveLogMapper.countSameDayByChannel(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 userActiveLogMapper.countSameDayByChannel(channel, type, years, startTime, endTime);
}
@Override
@@ -157,57 +139,58 @@
@Override
public List<Object> getBuyProportion(String channel, Integer type, String years,
String startTime, String endTime, Integer orderNum) throws Exception{
-
- // 缁熻娓犻亾褰撴棩鏂板鐢ㄦ埛
- List<Object> countList = countSameDayByChannel(channel, type, years, startTime, endTime);
-
- if (countList == null || countList.size() == 0) {
- return null;
- }
-
- // 缁熻娓犻亾褰撴棩鏂板鐢ㄦ埛瀛樺湪涓嬪崟鐨勭敤鎴锋暟閲�
- List<Object> countListBuy= null;
- if (orderNum <= 1){
- countListBuy = countSameDayAndBuyGoodsByChannel(channel, type, years, startTime, endTime);
- }
-
- if (countListBuy == null){
- new ArrayList<Object>();
- }
-
- List<Object> listObject = new ArrayList<Object>();
-
- for (Object object: countList) {
-
- float rate = 0;
-
- Map<String, Object> mapObject = new HashMap<String, Object>();
-
- Map<String, Object> map = (Map<String, Object>) object;
- Object createDate = map.get("showDate");
- Object sameDayNum = map.get("showValue");
-
- long totle = Long.parseLong(sameDayNum.toString());
- if (totle > 0 && countListBuy != null && countListBuy.size() > 0) {
- for (int j = 0; j < countListBuy.size(); j++) {
- Map<String, Object> mapBuy = (Map<String, Object>) countListBuy.get(j);
- Object createDate2 = mapBuy.get("showDate");
- if (createDate.toString().equals(createDate2.toString())) {
- Object buyNum = mapBuy.get("showValue");
- long totleBuy = Long.parseLong(buyNum.toString());
- rate = (float)totleBuy/totle;
- break;
- }
- }
- }
-
- DecimalFormat df = new DecimalFormat("0.00");//鏍煎紡鍖栧皬鏁�
- mapObject.put("showValue", df.format(rate*100));
- mapObject.put("showDate", createDate);
- listObject.add(mapObject);
- }
-
- return listObject;
+//
+// // 缁熻娓犻亾褰撴棩鏂板鐢ㄦ埛
+// List<Object> countList = countSameDayByChannel(channel, type, years, startTime, endTime);
+//
+// if (countList == null || countList.size() == 0) {
+// return null;
+// }
+//
+// // 缁熻娓犻亾褰撴棩鏂板鐢ㄦ埛瀛樺湪涓嬪崟鐨勭敤鎴锋暟閲�
+// List<Object> countListBuy= null;
+// if (orderNum <= 1){
+// countListBuy = countSameDayAndBuyGoodsByChannel(channel, type, years, startTime, endTime);
+// }
+//
+// if (countListBuy == null){
+// new ArrayList<Object>();
+// }
+//
+// List<Object> listObject = new ArrayList<Object>();
+//
+// for (Object object: countList) {
+//
+// float rate = 0;
+//
+// Map<String, Object> mapObject = new HashMap<String, Object>();
+//
+// Map<String, Object> map = (Map<String, Object>) object;
+// Object createDate = map.get("showDate");
+// Object sameDayNum = map.get("showValue");
+//
+// long totle = Long.parseLong(sameDayNum.toString());
+// if (totle > 0 && countListBuy != null && countListBuy.size() > 0) {
+// for (int j = 0; j < countListBuy.size(); j++) {
+// Map<String, Object> mapBuy = (Map<String, Object>) countListBuy.get(j);
+// Object createDate2 = mapBuy.get("showDate");
+// if (createDate.toString().equals(createDate2.toString())) {
+// Object buyNum = mapBuy.get("showValue");
+// long totleBuy = Long.parseLong(buyNum.toString());
+// rate = (float)totleBuy/totle;
+// break;
+// }
+// }
+// }
+//
+// DecimalFormat df = new DecimalFormat("0.00");//鏍煎紡鍖栧皬鏁�
+// mapObject.put("showValue", df.format(rate*100));
+// mapObject.put("showDate", createDate);
+// listObject.add(mapObject);
+// }
+//
+// return listObject;
+ return null;
}
--
Gitblit v1.8.0