获取森林状态条件变更

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserForestStatusServiceImpl.java

@@ -89,7 +89,7 @@ public class UserForestStatusServiceImpl implements UserForestStatusService {
         }else if(userLevel == 1){
             //用户等级为幼苗
             //到达青铜树升级条件
-            int recommendSeedling = 5;
+            int recommendSeedling = 3;
             //获取当前用户直接推荐表中幼苗数量
             Integer recommendseedlingNum = recommendUserMapperByUserId.getSeedlingNum();
             //距离升级还差  recommendDifferenceSeedling
@@ -107,7 +107,7 @@ public class UserForestStatusServiceImpl implements UserForestStatusService {
         else if (userLevel == 2){
             //用户等级为青铜树
             //到达白银树升级条件
-            int recommendSeedling = 20;
+            int recommendSeedling = 15;
             //获取当前用户直接推荐表中幼苗数量
             Integer recommendseedlingNum = recommendUserMapperByUserId.getSeedlingNum();
             //距离升级还差  recommendDifferenceSeedling
@@ -125,13 +125,15 @@ public class UserForestStatusServiceImpl implements UserForestStatusService {
             //用户等级为白银树
 
             //黄金升级条件
-            int recommendSeedling = 50;
-            int recommendSilver = 4;
+            int recommendSeedling = 20;
+            int recommendSilver = 2;
+            int teamSeedling = 30;
             int teamBronze = 20;
 
             //当前用户直推表
             int seedlingNum = recommendUserMapperByUserId.getSeedlingNum();
             Integer silverTreeNum = recommendUserMapperByUserId.getSilverTreeNum();
+            Integer teamSeedlingNum = teamUserInfobyUserId.getSeedlingNum();
             Integer teamBronzeTreeNum = teamUserInfobyUserId.getBronzeTreeNum();
             //直推幼苗差
             //直推白银差
@@ -144,6 +146,10 @@ public class UserForestStatusServiceImpl implements UserForestStatusService {
             if (recommendDifferenceSilver < 0){
                 recommendDifferenceSilver = 0;
             }
+            int teamDifferenceSeedling = teamSeedling - teamSeedlingNum;
+            if (teamDifferenceSeedling < 0){
+                teamDifferenceSeedling = 0;
+            }
             int teamDifferenceBronze = teamBronze - teamBronzeTreeNum;
             if (teamDifferenceBronze < 0 ){
                 teamDifferenceBronze = 0;
@@ -155,6 +161,7 @@ public class UserForestStatusServiceImpl implements UserForestStatusService {
             userForestStatusMap.put("perenct",perenct);
             difference.put("recommendDifferenceSeedling",recommendDifferenceSeedling);
             difference.put("recommendDifferenceSilver",recommendDifferenceSilver);
+            difference.put("teamDifferenceSeedling",teamDifferenceSeedling);
             difference.put("teamDifferenceBronze",teamDifferenceBronze);
             userForestStatusMap.put("differenceMap",difference);
 
@@ -162,12 +169,14 @@ public class UserForestStatusServiceImpl implements UserForestStatusService {
             //用户等级为黄金树
 
             //农场主升级条件
-            int recommendSeedling = 70;
-            int recommendGold = 3;
+            int recommendSeedling = 30;
+            int recommendGold = 2;
+            int teamSeedling = 70;
             int teamSilver = 40;
 
             int recommendSeedlingNum = recommendUserMapperByUserId.getSeedlingNum();
             int recommendGoldTreeNum = recommendUserMapperByUserId.getGoldTreeNum();
+            Integer teamSeedlingNum = teamUserInfobyUserId.getSeedlingNum();
             int teamSilverTreeNum = teamUserInfobyUserId.getSilverTreeNum();
 
             //直推幼苗差
@@ -181,6 +190,10 @@ public class UserForestStatusServiceImpl implements UserForestStatusService {
             if (recommendDifferenceGold < 0){
                 recommendDifferenceGold = 0;
             }
+            int teamDifferenceSeedling = teamSeedling - teamSeedlingNum;
+            if (teamDifferenceSeedling < 0 ){
+                teamDifferenceSeedling = 0;
+            }
             int teamDifferenceSilver = teamSilver - teamSilverTreeNum;
             if (teamDifferenceSilver < 0 ){
                 teamDifferenceSilver = 0;
@@ -192,6 +205,7 @@ public class UserForestStatusServiceImpl implements UserForestStatusService {
             userForestStatusMap.put("perenct",perenct);
             difference.put("recommendDifferenceSeedling",recommendDifferenceSeedling);
             difference.put("recommendDifferenceGold",recommendDifferenceGold);
+            difference.put("teamDifferenceSeedling",teamDifferenceSeedling);
             difference.put("teamDifferenceSilver",teamDifferenceSilver);
             userForestStatusMap.put("differenceMap",difference);
 
@@ -199,14 +213,16 @@ public class UserForestStatusServiceImpl implements UserForestStatusService {
             //用户等级为农场主
 
             //升级森林之星条件
-            int recommendSeedling = 80;
-            int recommenFarmer = 5;
+            int recommendSeedling = 40;
+            int recommenFarmer = 2;
+            int teamSeedling = 80;
             int teamSilver = 70;
             int teamGold = 30;
 
             //当前用户条件
             Integer recommendSeedlingNum = recommendUserMapperByUserId.getSeedlingNum();
             Integer recommendFarmerNum = recommendUserMapperByUserId.getFarmerNum();
+            Integer teamSeedlingNum = teamUserInfobyUserId.getSeedlingNum();
             Integer teamSilverTreeNum = teamUserInfobyUserId.getSilverTreeNum();
             Integer teamGoldTreeNum = teamUserInfobyUserId.getGoldTreeNum();
 
@@ -222,6 +238,10 @@ public class UserForestStatusServiceImpl implements UserForestStatusService {
             if (recommendDifferenceFarmer < 0){
                 recommendDifferenceFarmer = 0;
             }
+            int teamDifferenceSeedling = teamSeedling - teamSeedlingNum;
+            if (teamDifferenceSeedling < 0 ){
+                teamDifferenceSeedling = 0;
+            }
             int teamDifferenceSilver = teamSilver - teamSilverTreeNum;
             if (teamDifferenceSilver < 0 ){
                 teamDifferenceSilver = 0;
@@ -237,6 +257,7 @@ public class UserForestStatusServiceImpl implements UserForestStatusService {
             userForestStatusMap.put("perenct",perenct);
             difference.put("recommendDifferenceSeedling",recommendDifferenceSeedling);
             difference.put("recommendDifferenceFarmer",recommendDifferenceFarmer);
+            difference.put("teamDifferenceSeedling",teamDifferenceSeedling);
             difference.put("teamDifferenceSilver",teamDifferenceSilver);
             difference.put("teamDifferenceGold",teamDifferenceGold);
             userForestStatusMap.put("differenceMap",difference);
@@ -245,15 +266,17 @@ public class UserForestStatusServiceImpl implements UserForestStatusService {
             //用户等级为森林之星
 
             //升级西田森合伙人条件
-            int recommendSeedling = 100;
-            int recommendForestStart = 1;
+            int recommendSeedling = 50;
+            int recommendForestStart = 2;
+            int teamSeedling = 100;
             int teamSilver = 90;
             int teamGold = 50;
-            int teamFarmer = 50;
+            int teamFarmer = 30;
 
             //当前用户条件
             Integer recommendSeedlingNum = recommendUserMapperByUserId.getSeedlingNum();
             Integer recommendForestStartNum = recommendUserMapperByUserId.getForestStartNum();
+            Integer teamSeedlingNum = teamUserInfobyUserId.getSeedlingNum();
             Integer teamSilverTreeNum = teamUserInfobyUserId.getSilverTreeNum();
             Integer teamGoldTreeNum = teamUserInfobyUserId.getGoldTreeNum();
             Integer teamFarmerNum = teamUserInfobyUserId.getFarmerNum();
@@ -266,6 +289,10 @@ public class UserForestStatusServiceImpl implements UserForestStatusService {
             if (recommendDifferenceForestStart < 0){
                 recommendDifferenceForestStart = 0;
             }
+            int teamDifferenceSeedling = teamSeedling - teamSeedlingNum;
+            if (teamDifferenceSeedling < 0 ){
+                teamDifferenceSeedling = 0;
+            }
             int teamDifferenceSilver = teamSilver - teamSilverTreeNum;
             if (teamDifferenceSilver < 0 ){
                 teamDifferenceSilver = 0;
@@ -285,6 +312,7 @@ public class UserForestStatusServiceImpl implements UserForestStatusService {
             userForestStatusMap.put("perenct",perenct);
             difference.put("recommendDifferenceSeedling",recommendDifferenceSeedling);
             difference.put("recommendDifferenceForestStart",recommendDifferenceForestStart);
+            difference.put("teamDifferenceSeedling",teamDifferenceSeedling);
             difference.put("teamDifferenceSilver",teamDifferenceSilver);
             difference.put("teamDifferenceGold",teamDifferenceGold);
             difference.put("teamDifferenceFarmer",teamDifferenceFarmer);

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserLevelTaskServiceImpl.java

@@ -137,7 +137,7 @@ public class UserLevelTaskServiceImpl implements UserLevelTaskService {
          */
         lastMonthUserInfoService.userInfoMirrorImageBack();
 
-        log.info("-------------------------月定时任务：每月执行一次 ====用户升级结束--------------------------------------");
+        log.info("-------------------------月定时任务：每月执行一次 ====用户升级结束----------------------------------");
     }
 
     private void lastmonthUserSetBeinviteCode(String userId, String inviteUserId) {
@@ -145,10 +145,7 @@ public class UserLevelTaskServiceImpl implements UserLevelTaskService {
         lastmonthRecommendInfoDataPreserve(userId,inviteUserId);
         //4、用户团队数据维护
         lastmonthTeamDataPreserve(userId,inviteUserId);
-        //记录用户设置邀请码的行为数据
-//        userDataInfoManager.addUserSetBeInvitedCodeDoc(userId, inviteUserId);
-        //5、查看当前用户是否要进行升级
-//        userLevelService.userLevelUpgrade(inviteUserId);
+        //5、月度升级
         monthUserLevelService.monthUserLevelUpgrade(inviteUserId);
     }