日志优化

@@ -361,8 +361,8 @@ public class UnionServiceImpl implements IUnionService,ApplicationEventPublisher
 			// 把存储的字符串变为对象
 			ClickUnionRequestBO click = JSON.parseObject(value, ClickUnionRequestBO.class);
 //			// 查询该td在90天内是否已经激活过
-//			UnionLogs union = unionLogsDAO.selectByClientType(request.getClient_type(), request.getIdfa(), request.getImei(), request.getAppkey());
-//			log.info("activateUnion in selectByClientType result is {}", union);
+			UnionLogs union = unionLogsDAO.selectByClientType(request.getClient_type(), request.getIdfa(), request.getImei(), request.getAppkey());
+			log.info("activateUnion in selectByClientType result is {}", union);
 
 			//删除redis中的点击记录
 			yHRedisTemplate.delete(key);
@@ -370,11 +370,12 @@ public class UnionServiceImpl implements IUnionService,ApplicationEventPublisher
 			//强制删除带ip的key
 			yHRedisTemplate.delete(UNION_KEY + "_" + request.getClientIp() + "_" + request.getAppkey());
 //
-//			if (union != null && union.getIsActivate() != null && union.getIsActivate().byteValue() == 1) {
-//				// 如果90天之内有过激活日志，则不允许重复激活
+			if (union != null && union.getIsActivate() != null && union.getIsActivate().byteValue() == 1) {
+				udidPool.info("activateUnion error because 90 days has activate info with udid is {},idfa is {},imei is {}",request.getUdid(),request.getIdfa(),request.getImei());
+				// 如果90天之内有过激活日志，则不允许重复激活
 //				log.warn("activateUnion error because 90 days has activate info with param is {}", request);
-//				return new UnionResponse(200, "have activite in 90 days",new JSONObject());
-//			}
+				return new UnionResponse(200, "have activite in 90 days",new JSONObject());
+			}
 
 			String unionTypekey = "yh:union:uniontype:"+click.getUnion_type();
 			MktMarketingUrl mktMarketingUrl = redisValueCache.get(unionTypekey,MktMarketingUrl.class);