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

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

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

@@ -37,13 +37,16 @@
      int state = ThreeSale.STATE_SUCCESS;

      long count = threeSaleSerivce.countFirstTeam(uid, state);

      List<ThreeSale> list = threeSaleSerivce.listFirstTeam(0L, (int) count, uid, state);

      int daRenFirstCount = 0;

      int normalFirstCount = 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) {

         if (level == UserLevelEnum.daRen) {

            daRenFirstCount++;

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

            normalFirstCount++;

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

            highFirstCount++;

@@ -54,6 +57,7 @@
         }

      }



      int daRenSecondCount = 0;

      int normalSecondCount = 0;

      int highSecondCount = 0;

      int superSecondCount = 0;

@@ -67,7 +71,9 @@
         if (list != null)

            for (ThreeSale ts : list) {

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

               if (level == UserLevelEnum.normalVIP) {

               if (level == UserLevelEnum.daRen) {

                  daRenSecondCount++;

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

                  normalSecondCount++;

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

                  highSecondCount++;

@@ -81,6 +87,8 @@


      UserLevelEnum level = userLevelManager.getUserLevel(uid);

      TeamUserLevelStatistic statistic = new TeamUserLevelStatistic();

      statistic.setDaRenFirstCount(daRenFirstCount);

      statistic.setDaRenSecondCount(daRenSecondCount);

      statistic.setNormalFirstCount(normalFirstCount);

      statistic.setNormalSecondCount(normalSecondCount);

      statistic.setHighFirstCount(highFirstCount);