Merge remote-tracking branch 'origin/master'

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

@@ -72,7 +72,7 @@ public class UserForestStatusServiceImpl implements UserForestStatusService {
         TeamUserInfo teamUserInfobyUserId = teamUserInfoMapper.getByUserId(userId);
 
         //6.距离下级升级条件
-        if(userLevel < 2){
+        if(userLevel == 0){
             //用户等级 < 幼苗 显示业绩缺少额度
             //获取当前用户的业绩
             BigDecimal performanceByUserid = orderMapper.getPerformanceByUserid(userId);
@@ -83,7 +83,25 @@ public class UserForestStatusServiceImpl implements UserForestStatusService {
             BigDecimal differenceAmount = levelTerm.subtract(performanceByUserid);
             difference.put("differenceAmount",differenceAmount);
             userForestStatusMap.put("differenceMap",difference);
-        }else if (userLevel == 2){
+        }else if(userLevel == 1){
+            //用户等级为幼苗
+            //到达青铜树升级条件
+            int recommendSeedling = 5;
+            //获取当前用户直接推荐表中幼苗数量
+            Integer recommendseedlingNum = recommendUserMapperByUserId.getSeedlingNum();
+            //距离升级还差  recommendDifferenceSeedling
+            int recommendDifferenceSeedling =  recommendSeedling - recommendseedlingNum;
+            if (recommendDifferenceSeedling < 0){
+                recommendDifferenceSeedling = 0;
+            }
+            difference.put("recommendDifferenceSeedling",recommendDifferenceSeedling);
+            //距离升级所差百分比
+            float perenctFloat = ((float)recommendseedlingNum / recommendSeedling);
+            float perpenct = (float) Math.round(perenctFloat*100)/100;
+            userForestStatusMap.put("perenct",perpenct);
+            userForestStatusMap.put("differenceMap",difference);
+        }
+        else if (userLevel == 2){
             //用户等级为青铜树
             //到达白银树升级条件
             int recommendSeedling = 20;