From d22d18f40d088277195e5c3ab587d07450f1a94d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 22 四月 2020 18:22:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/TeamUserLevelStatisticServiceImpl.java | 91 +++++++++++++++++++++++++--------------------
1 files changed, 50 insertions(+), 41 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/TeamUserLevelStatisticServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/TeamUserLevelStatisticServiceImpl.java
index 62a721d..1012708 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/TeamUserLevelStatisticServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/TeamUserLevelStatisticServiceImpl.java
@@ -8,10 +8,10 @@
import org.springframework.stereotype.Service;
import com.yeshi.fanli.dao.mybatis.user.vip.TeamUserLevelStatisticMapper;
-import com.yeshi.fanli.entity.bus.user.ThreeSale;
+import com.yeshi.fanli.entity.bus.user.UserInviteValidRecord;
import com.yeshi.fanli.entity.bus.user.vip.TeamUserLevelStatistic;
import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
-import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.user.invite.UserInviteValidRecordService;
import com.yeshi.fanli.service.inter.user.vip.TeamUserLevelStatisticService;
import com.yeshi.fanli.service.manger.user.UserLevelManager;
@@ -19,13 +19,14 @@
public class TeamUserLevelStatisticServiceImpl implements TeamUserLevelStatisticService {
@Resource
- private ThreeSaleSerivce threeSaleSerivce;
-
- @Resource
private UserLevelManager userLevelManager;
@Resource
private TeamUserLevelStatisticMapper teamUserLevelStatisticMapper;
+
+ @Resource
+ private UserInviteValidRecordService userInviteValidRecordService;
+
@Override
public TeamUserLevelStatistic selectByUid(Long uid) {
@@ -34,55 +35,63 @@
@Override
public void initData(Long uid) {
- int state = ThreeSale.STATE_SUCCESS;
- long count = threeSaleSerivce.countFirstTeam(uid, state);
- List<ThreeSale> list = threeSaleSerivce.listFirstTeam(0L, (int) count, uid, state);
- int normalFirstCount = 0;
+ int pageSize = 1000;
+
+ // 鐩存帴绮変笣缁熻
+ int daRenFirstCount = 0;
int highFirstCount = 0;
int superFirstCount = 0;
int tearcherFirstCount = 0;
- for (ThreeSale ts : list) {
- UserLevelEnum level = userLevelManager.getUserLevel(ts.getWorker().getId());
- if (level == UserLevelEnum.normalVIP) {
- normalFirstCount++;
- } else if (level == UserLevelEnum.highVIP) {
- highFirstCount++;
- } else if (level == UserLevelEnum.superVIP) {
- superFirstCount++;
- } else if (level == UserLevelEnum.tearcher) {
- tearcherFirstCount++;
+ for (int i = 0; i < 100; i ++) {
+ List<UserInviteValidRecord> list = userInviteValidRecordService.listFirstTeam(i * pageSize, pageSize, uid);
+ if (list == null || list.size() == 0) {
+ break;
+ }
+
+ for (UserInviteValidRecord ts : list) {
+ UserLevelEnum level = userLevelManager.getUserLevel(ts.getWorkerId());
+ if (level == UserLevelEnum.daRen) {
+ daRenFirstCount++;
+ } else if (level == UserLevelEnum.highVIP) {
+ highFirstCount++;
+ } else if (level == UserLevelEnum.superVIP) {
+ superFirstCount++;
+ } else if (level == UserLevelEnum.tearcher) {
+ tearcherFirstCount++;
+ }
}
}
-
- int normalSecondCount = 0;
+
+
+ // 闂存帴绮変笣缁熻
+ int daRenSecondCount = 0;
int highSecondCount = 0;
int superSecondCount = 0;
int tearcherSecondCount = 0;
-
- long secondCount = threeSaleSerivce.countSecondTeam(uid, state);
- int pageSize = 1000;
- int toalPage = (int) (secondCount % pageSize == 0 ? secondCount / pageSize : secondCount / pageSize + 1);
- for (int i = 0; i < toalPage; i++) {
- list = threeSaleSerivce.listSecondTeam(i * pageSize, pageSize, uid, state);
- if (list != null)
- for (ThreeSale ts : list) {
- UserLevelEnum level = userLevelManager.getUserLevel(ts.getWorker().getId());
- if (level == UserLevelEnum.normalVIP) {
- normalSecondCount++;
- } else if (level == UserLevelEnum.highVIP) {
- highSecondCount++;
- } else if (level == UserLevelEnum.superVIP) {
- superSecondCount++;
- } else if (level == UserLevelEnum.tearcher) {
- tearcherSecondCount++;
- }
+ for (int i = 0; i < 100; i ++) {
+ List<UserInviteValidRecord> list = userInviteValidRecordService.listSecondTeam(i * pageSize, pageSize, uid);
+ if (list == null || list.size() == 0) {
+ break;
+ }
+
+ for (UserInviteValidRecord ts : list) {
+ UserLevelEnum level = userLevelManager.getUserLevel(ts.getWorkerId());
+ if (level == UserLevelEnum.daRen) {
+ daRenSecondCount++;
+ } else if (level == UserLevelEnum.highVIP) {
+ highSecondCount++;
+ } else if (level == UserLevelEnum.superVIP) {
+ superSecondCount++;
+ } else if (level == UserLevelEnum.tearcher) {
+ tearcherSecondCount++;
}
+ }
}
UserLevelEnum level = userLevelManager.getUserLevel(uid);
TeamUserLevelStatistic statistic = new TeamUserLevelStatistic();
- statistic.setNormalFirstCount(normalFirstCount);
- statistic.setNormalSecondCount(normalSecondCount);
+ statistic.setDaRenFirstCount(daRenFirstCount);
+ statistic.setDaRenSecondCount(daRenSecondCount);
statistic.setHighFirstCount(highFirstCount);
statistic.setHighSecondCount(highSecondCount);
statistic.setSuperFirstCount(superFirstCount);
--
Gitblit v1.8.0