Merge remote-tracking branch 'origin/master'

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

@@ -45,7 +45,6 @@ public class UserForestStatusServiceImpl implements UserForestStatusService {
      * @return
      */
 
-    //todo：团队当月新增业绩
     @Override
     public Map getUserForestStatus(String userId) {
 
@@ -83,7 +82,11 @@ public class UserForestStatusServiceImpl implements UserForestStatusService {
             //距离升级还差多少额度
             BigDecimal differenceAmount = levelTerm.subtract(performanceByUserid);
             difference.put("differenceAmount",differenceAmount);
-            int perpenct = 1 - (performanceByUserid.intValue() / 3980);
+
+            performanceByUserid = performanceByUserid.add(new BigDecimal(1000));
+
+            float perpenctFloat = (float)performanceByUserid.intValue() / 3980;
+            float perpenct = (float) Math.round(perpenctFloat*100)/100;
             userForestStatusMap.put("perenct",perpenct);
             userForestStatusMap.put("differenceMap",difference);
         }else if(userLevel == 1){