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

admin

2019-12-13 fb1d948a7b64cd02083b7b6f7ae18d16ad638609

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

@@ -86,7 +86,7 @@




   @Override

   @Transactional

   @Transactional(rollbackFor = Exception.class)

   public void addUserVIPInfo(UserVIPInfo info) throws UserVIPInfoException {

      if (info.getId() == null) {

         throw new UserVIPInfoException(1, "信息不完整");

@@ -207,7 +207,7 @@
      userOtherMsgNotificationService.teamVIPCallBoss(bossId, "如有疑问请联系我的-人工客服", msgboss);

   }

   

   @Transactional

   @Transactional(rollbackFor = Exception.class)

   @Override

   public void rejectVIPApply(Long uid, String reason) throws UserVIPInfoException {

      UserVIPInfo userInfo = userVIPInfoMapper.selectByPrimaryKeyForUpdate(uid);

@@ -231,7 +231,7 @@
      userOtherMsgNotificationService.rejectVIPApply(uid, "如有疑问请联系我的-人工客服", msgOther);

   }



   @Transactional

   @Transactional(rollbackFor = Exception.class)

   @Override

   public void applyVIP(Long uid) throws UserVIPInfoException {

      UserVIPInfo userInfo = userVIPInfoMapper.selectByPrimaryKeyForUpdate(uid);

@@ -358,6 +358,7 @@
   

   

   @Override

   @Transactional(rollbackFor = Exception.class)

   public void inviteSeparate(Long workerId, Long bossId) {

      if (workerId == null || bossId == null)

         return;