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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/job/UserRankingsJob.java

@@ -14,9 +14,11 @@
import org.springframework.stereotype.Component;



import com.yeshi.fanli.entity.bus.user.UserRankings;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserRankingsService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

@@ -39,6 +41,9 @@


   @Resource

   private TaoBaoOrderService taoBaoOrderService;

	
   @Resource

   private UserInfoExtraService userInfoExtraService;

   



   // 1加,2减

@@ -94,7 +99,7 @@
         

         // 上下 浮动金额范围

         double rangeAmount = 100;

         String range = configService.get("reward_rank_range");

         String range = configService.get(ConfigKeyEnum.rewardRankRange.getKey());

         if (!StringUtil.isNullOrEmpty(range)) {

            rangeAmount = Double.parseDouble(range);

         }

@@ -127,7 +132,6 @@
      } catch (Exception e) {

         e.printStackTrace();

      }



   }

   

}