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

admin

2020-05-12 1faf3ab0ba6c17eee48e68e8d0077ea61f45d75d

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

@@ -78,7 +78,7 @@


         for (UserInviteValidRecord ts : list) {

            UserLevelEnum level = userLevelManager.getUserLevel(ts.getWorkerId());

            if (level == UserLevelEnum.daRen) {

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

               daRenFirstCount++;

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

               highFirstCount++;

@@ -103,7 +103,7 @@


         for (UserInviteValidRecord ts : list) {

            UserLevelEnum level = userLevelManager.getUserLevel(ts.getWorkerId());

            if (level == UserLevelEnum.daRen) {

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

               daRenSecondCount++;

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

               highSecondCount++;