fanli-server.git

			@@ -60,13 +60,19 @@
			if (notify == null)
			return;
			// 查询低等级的是否已读,如若未读则设为已读
			if (notify.getToLevel() == UserLevelEnum.highVIP \|\| notify.getToLevel() == UserLevelEnum.superVIP) {
			if (notify.getToLevel() == UserLevelEnum.superVIP \|\| notify.getToLevel() == UserLevelEnum.tearcher) {
			List<UserLevelEnum> levels = new ArrayList<>();
			if (notify.getToLevel() == UserLevelEnum.superVIP) {
			if (notify.getToLevel() == UserLevelEnum.tearcher) {
			levels.add(UserLevelEnum.highVIP);
			levels.add(UserLevelEnum.superVIP);
			} else if (notify.getToLevel() == UserLevelEnum.superVIP) {
			levels.add(UserLevelEnum.highVIP);
			}

			List<UserLevelUpgradedNotify> list = userLevelUpgradedNotifyDao.listToLevelsByUid(notify.getUid(), levels);
			if (levels.size() > 0) {

			List<UserLevelUpgradedNotify> list = userLevelUpgradedNotifyDao.listToLevelsByUid(notify.getUid(),
			levels);
			if (list != null)
			for (UserLevelUpgradedNotify item : list) {
			item.setValid(false);
			@@ -74,6 +80,7 @@
			userLevelUpgradedNotifyDao.save(item);
			}
			}
			}
			notify.setUpdateTime(new Date());
			notify.setNotified(true);
			notify.setReadTime(new Date());

			@@ -185,7 +185,6 @@
			vipTeamVerify(uid);
			}


			@Override
			@RequestSerializableByKeyService(key = "#tid")
			@Transactional(rollbackFor = Exception.class)
			@@ -196,8 +195,6 @@
			}
			vipTeamVerify(boss.getId());
			}



			/**
			* 验证用户是否满足升级队员条件
			@@ -220,11 +217,17 @@

			long limitFirst7 = 0;
			String first7 = userVipConfigService.getValueByKey("vip_pre_7_first_level_team_count");
			if (Constant.IS_TEST)
			first7 = "30";

			if (!StringUtil.isNullOrEmpty(first7)) {
			limitFirst7 = Long.parseLong(first7);
			}

			long limitSecond7 = 0;
			String second7 = userVipConfigService.getValueByKey("vip_pre_7_second_level_team_count");
			if (Constant.IS_TEST)
			second7 = "30";
			if (!StringUtil.isNullOrEmpty(second7)) {
			limitSecond7 = Long.parseLong(second7);
			}
			@@ -238,8 +241,6 @@
			}
			}
			}



			/**
			* 二阶段

	fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserLevelUpgradedNotifyServiceImpl.java	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史