Merge branch 'div' into div-1

yujian

2020-03-24 88c7df1d5089d8e39f356a68eaccc18f308e190c

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java

@@ -40,8 +40,6 @@
   @Resource

   private MsgAccountDetailService msgAccountDetailService;

   

	


   @Override

   public void addUserVIPPreInfo(UserVIPPreInfo info) throws UserVIPPreInfoException {

      if (info == null || info.getUid() == null || info.getProcess() == null)

@@ -73,6 +71,27 @@
      return infoList.get(0);

   }



   @Override

   public UserVIPPreInfo getProcessInfo(Long uid, Date time) {

      List<UserVIPPreInfo> infoList = userVIPPreInfoMapper.listByUid(uid);

      if (infoList == null || infoList.size() == 0)

         return null;

      Comparator<UserVIPPreInfo> cm = new Comparator<UserVIPPreInfo>() {



         @Override

         public int compare(UserVIPPreInfo o1, UserVIPPreInfo o2) {

            return o2.getProcess() - o1.getProcess();

         }

      };

      Collections.sort(infoList, cm);



      for (UserVIPPreInfo info : infoList) {

         if (time.getTime() >= info.getCreateTime().getTime())

            return info;

      }

      return null;

   }



   @RequestSerializableByKeyService(key = "#uid")

   @Transactional(rollbackFor = Exception.class)

   @Override