更新代码

yujian

2019-01-26 eaf1a618e98afe51bd053a7f0a3d629f170a8460

更新代码

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java

@@ -64,7 +64,7 @@
            throw new UserInfoExtraException(1, "用户附加信息不存在");

        }



        // 等级对照表

        // 等级对照表 
        String contrast = configService.get("user_rank_contrast");

        extraVO.setRankContrast(contrast);

        // 特别提醒

@@ -72,7 +72,11 @@
        extraVO.setRankTip(rankTip);



        Integer rankOrderNum = extraVO.getRankOrderNum();

        if (rankOrderNum != null && rankOrderNum > 0) {

		
        UserRank userRank = extraVO.getUserRank();

        // 青铜等级不返回恭喜语句 注：青铜等级id 必须为1

        if (userRank != null && userRank.getId() != null && userRank.getId() > 1) {

			
            String rankMsg = null;

            Integer rankSource = extraVO.getRankSource();

            switch (rankSource) {

@@ -223,7 +227,7 @@
                rank = userRank;

                // 默认最低等级:青铜

                userInfoExtra.setUserRank(rank);

                userInfoExtra.setRankOrderNum(0);

                userInfoExtra.setRankOrderNum(selfOrderNum);

                userInfoExtra.setRankSource(Constant.TYPE_REBATE);

                break;

            }


 fanli/src/main/java/com/yeshi/fanli/util/account/UserUtil.java

@@ -87,7 +87,7 @@
    }



    private static String convert10To36(Long num) {

        String numbers = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";

        String numbers = "YE9VFA3N6KG7JZH4LD5IO2RBS0QTMPU1WC8X";

        BigDecimal numBig = new BigDecimal(num);



        int ge = numBig.divideAndRemainder(new BigDecimal(36))[1].intValue();