From a79be5c75d4409bd14a36b648c1a398b409cad65 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 08 一月 2019 16:48:39 +0800
Subject: [PATCH] Merge branch 'div1'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserActiveLogServiceImpl.java | 138 ++++++++++++++++++++++++++++++++-------------
1 files changed, 97 insertions(+), 41 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 9e8fc4a..dad8a40 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,5 +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;
@@ -16,6 +17,7 @@
import com.yeshi.fanli.dao.mybatis.user.UserActiveLogMapper;
import com.yeshi.fanli.entity.bus.user.UserActiveLog;
import com.yeshi.fanli.service.inter.user.UserActiveLogService;
+import com.yeshi.fanli.util.MoneyBigDecimalUtil;
@Service
public class UserActiveLogServiceImpl implements UserActiveLogService {
@@ -90,25 +92,65 @@
}
@Override
- public List<Object> countSameDayAndBuyGoodsByChannelAndBuyNum(String channel, Integer type, String years,
- String startTime, String endTime, Integer orderNum) throws Exception {
- List<Map<String, Object>> list = userActiveLogMapper.countSameDayAndBuyGoodsByChannelAndBuyNum(channel, type, years,
- startTime, endTime, orderNum);
+ public List<Map<String, Object>> countOneWeekUserInfo(String channel, String startTime, String endTime,
+ Integer orderNumber) throws Exception {
- if (list == null || list.size() == 0) {
- return null;
- }
+ // 鏃堕棿鍒楄〃
+ List<String> dateList = new ArrayList<String>();
+ // 缁撴灉鍒楄〃
+ List<Map<String, Object>> resultList = new ArrayList<Map<String,Object>>();
- switch (type){
- case 1: // 鎸夊ぉ澶勭悊
- return dayFactory(startTime, endTime, list);
- case 2: // 鎸夋湀澶勭悊
- return monthFactory(list);
- case 3:
- return yearFactory(list);
- default:
- return null;
+ String middleDay = "";
+ for (int i = 0; i < 100 ; i++) {
+ if (i == 0) {
+ middleDay = startTime;
+ } else {
+ middleDay = DateUtil.plusDay(i, startTime);
+ }
+
+ dateList.add(middleDay);
+
+ if (middleDay.equals(endTime)) {
+ break; // 鏃堕棿缁撴潫
+ }
}
+
+ for (String nowDate: dateList) {
+ // 鍔犲叆7澶�
+ String plusDay = DateUtil.plusDay(7, nowDate);
+
+ // 鎵ц鏌ヨ 骞惰繑鍥炵粨鏋�
+ Map<String, BigDecimal> map= userActiveLogMapper.countOneWeekUserInfo(channel, nowDate, plusDay, orderNumber);
+
+ // 姣斾緥
+ BigDecimal proportion = null;
+
+ if (map != null) {
+ // 鏂板鐢ㄦ埛
+ BigDecimal totalUser = map.get("totalUser");
+ // 瀛樺湪璁㈠崟鐨勬柊澧炵敤鎴�
+ BigDecimal orderUser = map.get("orderUser");
+
+ try {
+ proportion = MoneyBigDecimalUtil.sub(orderUser, totalUser);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ if (proportion == null) {
+ proportion = new BigDecimal(0);
+ }
+
+ Map<String, Object> result = new HashMap<String, Object>();
+ result.put("showValue", MoneyBigDecimalUtil.mul(proportion, new BigDecimal(100)));
+ result.put("showDate", nowDate);
+
+ resultList.add(result);
+ }
+
+ return resultList;
+
}
@@ -127,9 +169,7 @@
List<Object> countListBuy= null;
if (orderNum <= 1){
countListBuy = countSameDayAndBuyGoodsByChannel(channel, type, years, startTime, endTime);
- } else {
- countListBuy = countSameDayAndBuyGoodsByChannelAndBuyNum(channel, type, years, startTime, endTime, orderNum);
- }
+ }
if (countListBuy == null){
new ArrayList<Object>();
@@ -144,16 +184,16 @@
Map<String, Object> mapObject = new HashMap<String, Object>();
Map<String, Object> map = (Map<String, Object>) object;
- Object createDate = map.get("createDate");
- Object sameDayNum = map.get("sameDayNum");
+ 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("createDate");
+ Object createDate2 = mapBuy.get("showDate");
if (createDate.toString().equals(createDate2.toString())) {
- Object buyNum = mapBuy.get("sameDayNum");
+ Object buyNum = mapBuy.get("showValue");
long totleBuy = Long.parseLong(buyNum.toString());
rate = (float)totleBuy/totle;
break;
@@ -162,8 +202,8 @@
}
DecimalFormat df = new DecimalFormat("0.00");//鏍煎紡鍖栧皬鏁�
- mapObject.put("sameDayNum", df.format(rate*100));
- mapObject.put("createDate", createDate);
+ mapObject.put("showValue", df.format(rate*100));
+ mapObject.put("showDate", createDate);
listObject.add(mapObject);
}
@@ -171,7 +211,14 @@
}
-
+ /**
+ * 澶╂暟鏍煎紡
+ * @param startTime
+ * @param endTime
+ * @param list
+ * @return
+ * @throws Exception
+ */
public List<Object> dayFactory(String startTime, String endTime, List<Map<String, Object>> list) throws Exception {
List<Object> listObject = new ArrayList<Object>();
@@ -179,10 +226,10 @@
if (startTime.equals(endTime)) {
Map<String, Object> map = list.get(0);
- Object sameDayNum = map.get("sameDayNum");
+ Object sameDayNum = map.get("showValue");
if (sameDayNum == null) {
- map.put("sameDayNum", 0);
+ map.put("showValue", 0);
}
listObject.add(map);
@@ -203,10 +250,10 @@
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)) {
- sameDayNum = map.get("sameDayNum");
+ sameDayNum = map.get("showValue");
break;
}
}
@@ -214,13 +261,13 @@
if (sameDayNum == null) {
sameDayNum = 0;
}
- mapObject.put("sameDayNum", sameDayNum);
+ mapObject.put("showValue", sameDayNum);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
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);
@@ -232,7 +279,11 @@
return listObject;
}
-
+ /**
+ * 鏈堜唤鏍煎紡
+ * @param list
+ * @return
+ */
public List<Object> monthFactory(List<Map<String, Object>> list) {
List<Object> listObject = new ArrayList<Object>();
@@ -242,10 +293,10 @@
Object sameDayNum = null;
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)) {
- sameDayNum = map.get("sameDayNum");
+ sameDayNum = map.get("showValue");
break;
}
}
@@ -253,29 +304,34 @@
if (sameDayNum == null) {
sameDayNum = 0;
}
- mapObject.put("sameDayNum", sameDayNum);
+ mapObject.put("showValue", sameDayNum);
- mapObject.put("createDate", i + "鏈�");
+ mapObject.put("showDate", i + "鏈�");
listObject.add(mapObject);
}
return listObject;
}
+ /**
+ * 骞翠唤鏍煎紡
+ * @param list
+ * @return
+ */
public List<Object> yearFactory(List<Map<String, Object>> list) {
List<Object> listObject = new ArrayList<Object>();
for (int i = 0; i < list.size(); i++) {
Map<String, Object> map = list.get(i);
- Object sameDayNum = map.get("sameDayNum");
- Object createDate = map.get("createDate");
+ Object sameDayNum = map.get("showValue");
+ Object createDate = map.get("showDate");
if (sameDayNum == null) {
sameDayNum = 0;
}
- map.put("sameDayNum", sameDayNum);
- map.put("createDate", createDate + "骞�");
+ map.put("showValue", sameDayNum);
+ map.put("showDate", createDate + "骞�");
listObject.add(map);
}
--
Gitblit v1.8.0