Authored by mingdan.ge

Merge branch 'master' of http://git.yoho.cn/yoho30/yohobuy-union

... ... @@ -530,13 +530,13 @@ public class UnionServiceImpl implements IUnionService, IBusinessExportService,
//判断90天内是否在大数据有记录
if (baseUserActiveDay!=null) {
log.warn("ios activateUnion error because 90 days has activate in bigdata database info with param is {}", request);
log.info("ios activateUnion error because 90 days has activate in bigdata database info with param is {}", request);
String time = DateUtil.getcurrentTime();
udidPool.info("Has action in 90 days at bigdata. udid is {},idfa is {},current time is {}", request.getUdid(), request.getIdfa(),time);
//判断15天内是否在大数据有记录
if (CollectionUtils.isNotEmpty(_15DayIdfaList)) {
//15天内有记录,退出
log.warn("activateUnion error because 15 days has activate in bigdata database info with param is {}", request);
log.info("activateUnion error because 15 days has activate in bigdata database info with param is {}", request);
} else {
//根据mkt_markering
//15天内没有记录,则记录大数据日志,退出
... ... @@ -570,7 +570,7 @@ public class UnionServiceImpl implements IUnionService, IBusinessExportService,
activeUnion.info("check android active info in 90 days. udid is {} and app_key is {},result is {}", request.getUdid(), appKey, baseUserActiveDay);
if (baseUserActiveDay!=null){
log.warn("android activateUnion error because 90 days has activate in bigdata database info with param is {}", request);
log.info("android activateUnion error because 90 days has activate in bigdata database info with param is {}", request);
// 无效激活
saveUnionInvalidLogs(Long.valueOf(click.getUnion_type()),mktMarketingUrl.getName(),request.getClient_type(), request);
return new UnionResponse(200, "have activite in 90 days",result);
... ...