Merge remote-tracking branch 'origin/div' into div

admin

2020-05-14 235921d820f29b04b1e82f6a6f0d4a1957a900ef

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/TeamUserLevelStatisticServiceImpl.java

@@ -11,10 +11,11 @@
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.UserInviteValidRecordService;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.vip.TeamUserLevelStatisticService;

import com.yeshi.fanli.service.manger.user.UserLevelManager;



@@ -28,7 +29,7 @@
   private TeamUserLevelStatisticMapper teamUserLevelStatisticMapper;



   @Resource

   private UserInviteValidRecordService userInviteValidRecordService;

   private ThreeSaleSerivce threeSaleSerivce;



   @Override

   public TeamUserLevelStatistic selectByUid(Long uid) {

@@ -58,7 +59,7 @@
         }

      }



      return null;

      return resultList;

   }



   @Override

@@ -71,14 +72,14 @@
      int superFirstCount = 0;

      int tearcherFirstCount = 0;

      for (int i = 0; i < 100; i++) {

         List<UserInviteValidRecord> list = userInviteValidRecordService.listFirstTeam(i * pageSize, pageSize, uid);

          List<ThreeSale> list = threeSaleSerivce.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) {

         for (ThreeSale ts : list) {

            UserLevelEnum level = userLevelManager.getUserLevel(ts.getWorker().getId());

            if (level == UserLevelEnum.daRen || level == UserLevelEnum.normalVIP) {

               daRenFirstCount++;

            } else if (level == UserLevelEnum.highVIP) {

               highFirstCount++;

@@ -96,14 +97,14 @@
      int superSecondCount = 0;

      int tearcherSecondCount = 0;

      for (int i = 0; i < 100; i++) {

         List<UserInviteValidRecord> list = userInviteValidRecordService.listSecondTeam(i * pageSize, pageSize, uid);

         List<ThreeSale> list  = threeSaleSerivce.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) {

         for (ThreeSale ts : list) {

            UserLevelEnum level = userLevelManager.getUserLevel(ts.getWorker().getId());

            if (level == UserLevelEnum.daRen || level == UserLevelEnum.normalVIP) {

               daRenSecondCount++;

            } else if (level == UserLevelEnum.highVIP) {

               highSecondCount++;

@@ -131,6 +132,22 @@
   }



   @Override

   public void setUserLevel(Long uid, UserLevelEnum level) {



      TeamUserLevelStatistic old = selectByUid(uid);

      if (old == null) {

         initData(uid);

         old = selectByUid(uid);

      }



      TeamUserLevelStatistic update = new TeamUserLevelStatistic();

      update.setId(old.getId());

      update.setLevel(level);

      update.setUpdateTime(new Date());

      teamUserLevelStatisticMapper.updateByPrimaryKeySelective(update);

   }



   @Override

   public void add(TeamUserLevelStatistic statistic) {

      TeamUserLevelStatistic old = selectByUid(statistic.getId());

      if (old == null) {