From 407157c46e82f44b592ad18dd4367bc19209f909 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 05 一月 2019 15:08:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserActiveLogServiceImpl.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 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 c411a14..9e8fc4a 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
@@ -89,18 +89,51 @@
}
}
+ @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);
+
+ 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;
+ }
+ }
+
@Override
public List<Object> getBuyProportion(String channel, Integer type, String years,
- String startTime, String endTime) throws Exception{
+ 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= countSameDayAndBuyGoodsByChannel(channel, type, years, startTime, endTime);
+ // 缁熻娓犻亾褰撴棩鏂板鐢ㄦ埛瀛樺湪涓嬪崟鐨勭敤鎴锋暟閲�
+ 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>();
+ }
List<Object> listObject = new ArrayList<Object>();
--
Gitblit v1.8.0