Merge remote-tracking branch 'origin/master'

admin

2019-01-28 f7ed4e6bbe9be95d268481e66d70d90e70e07e12

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

@@ -1,6 +1,8 @@
package com.yeshi.fanli.service.impl.user;



import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Date;

import java.util.HashMap;

import java.util.List;

@@ -139,8 +141,11 @@
      if (userInfoExtra != null && userInfoExtra.getId() != null) {

         // 判断当月是否已更新

         Date rankUpdateTime = userInfoExtra.getRankUpdateTime();

         if (rankUpdateTime != null && DateUtil.isSameMonth(rankUpdateTime, new Date())) {

            isupdateRank = false;

         if (rankUpdateTime != null) {

            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");

            if (sdf.format(rankUpdateTime).equals(sdf.format(new Date()))) {

               isupdateRank = false;

            }

         } 

      } else {

         userInfoExtra = new UserInfoExtra();

@@ -232,8 +237,12 @@
            break;

         }

      }

      // 等级更新时间

      userInfoExtra.setRankUpdateTime(new Date());

		
      // 等级更新时间 当月1号

      Calendar calendar1=Calendar.getInstance();

        calendar1.set(Calendar.DAY_OF_MONTH, 1);

      userInfoExtra.setRankUpdateTime(calendar1.getTime());

		
      // 保存信息并返回

      saveUserInfoExtra(userInfoExtra);