From a358495d588a844d9fb2e3e4a9b6c043274aac68 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 29 四月 2020 17:55:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountUserServiceImpl.java | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountUserServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountUserServiceImpl.java
index 8f7f5e0..6e6eaf8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountUserServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/DailyCountUserServiceImpl.java
@@ -216,15 +216,16 @@
for (UserInfoRegister register: listRegister) {
String channel = register.getChannel();
if (channelName.equalsIgnoreCase(channel)) {
+ // 褰撴棩娓犻亾鐢ㄦ埛
totalDay ++ ;
- }
-
- Long id = register.getId();
- // 鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁浠婃棩涓嬪崟
- for (Long uid: listOrder) {
- if (uid.longValue() == id.longValue()) {
- totalValid ++;
- break;
+
+ Long id = register.getId();
+ // 鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁浠婃棩涓嬪崟
+ for (Long uid: listOrder) {
+ if (uid.longValue() == id.longValue()) {
+ totalValid ++;
+ break;
+ }
}
}
}
@@ -276,7 +277,6 @@
if (list != null && list.size() > 0) {
- System.out.println("***********************" +list.size());
totalUser = list.size();
for (UserInfoRegister user : list) {
listUid.add(user.getId());
@@ -286,7 +286,6 @@
if (listUid.size() > 0) {
List<Long> listUidDown = commonOrderCountService.getDownOrderUserByListUidAndDate(limitDay, listUid);
if (listUidDown != null && listUidDown.size() > 0) {
- System.out.println("***********************" +listUidDown.size());
for (Long uid: listUid) {
int total = 0;
for (Long id: listUidDown) {
@@ -296,17 +295,11 @@
}
if (total > 0) {
- System.out.println("-----------------------------------------------------");
totalWeek ++;
- System.out.println(totalWeek);
- System.out.println("-----------------------------------------------------");
}
if (total >= 3) {
- System.out.println("-----------------------------------------------------");
totalWeek3 ++;
- System.out.println(totalWeek3);
- System.out.println("-----------------------------------------------------");
}
}
}
--
Gitblit v1.8.0