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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -94,6 +94,7 @@
   @Resource

   private TeamUserLevelStatisticService teamUserLevelStatisticService;



   @Transactional

   @Override

   public void addUserVIPPreInfo(UserVIPPreInfo info) throws UserVIPPreInfoException {

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

@@ -108,9 +109,31 @@
         throw new UserVIPPreInfoException(2, "进度已存在");

      if (info.getCreateTime() == null)

         info.setCreateTime(new Date());



      UserVIPPreInfo old = getLatestProcessInfo(info.getUid());



      userVIPPreInfoMapper.insertSelective(info);

      // 设置统计数据

      teamUserLevelStatisticService.setUserLevel(info.getUid(), UserLevelUtil.getByLevel(info.getProcess()));



      // 发送等级变化消息

      if (!Constant.IS_TEST) {

         UserLevelEnum oldLevel = null;

         if (old == null)

            oldLevel = UserLevelEnum.daRen;

         else {

            oldLevel = UserLevelUtil.getByLevel(old.getProcess());

         }



         if (oldLevel == UserLevelEnum.normalVIP)

            oldLevel = UserLevelEnum.daRen;



         UserLevelChangedMQMsg msg = new UserLevelChangedMQMsg(info.getUid(), oldLevel,

               UserLevelUtil.getByLevel(info.getProcess()), new Date());

         Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.userLevelChanged, msg);

         producer.send(message);

      }



   }



   @Override

@@ -315,12 +338,6 @@
         LogHelper.error(e);

      }



      if (!Constant.IS_TEST) {

         UserLevelChangedMQMsg msg = new UserLevelChangedMQMsg(uid, UserLevelEnum.daRen, UserLevelEnum.highVIP,

               new Date());

         Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.userLevelChanged, msg);

         producer.send(message);

      }

   }



   @Override