Merge branch 'master' into hotfix_0307

@@ -23,9 +23,9 @@ public class AppActivateIdfaList extends BaseBO {
 		this.idfa = idfa;
 		this.idfa = idfa;
 	}
 	}
 
 
-	public AppActivateIdfaList(Long dateId, String idfa, String appKey) {
+	public AppActivateIdfaList(Long dateId, String udid, String appKey) {
 		this.dateId = dateId;
 		this.dateId = dateId;
-		this.idfa = idfa;
+		this.udid = udid;
 		this.appKey = appKey;
 		this.appKey = appKey;
 	}
 	}
 
 

@@ -418,30 +418,6 @@ public class UnionServiceImpl implements IUnionService,ApplicationEventPublisher
 				//判断90天内是否在大数据有记录
 				//判断90天内是否在大数据有记录
 				if (CollectionUtils.isNotEmpty(_90DayIdfaList)) {
 				if (CollectionUtils.isNotEmpty(_90DayIdfaList)) {
 					log.warn("ios activateUnion error because 90 days has activate in bigdata database info with param is {}", request);
 					log.warn("ios activateUnion error because 90 days has activate in bigdata database info with param is {}", request);
-					
-//					//判断15天内是否在大数据有记录
-//					if (CollectionUtils.isNotEmpty(_15DayIdfaList)) {
-//						//15天内有记录，退出
-//						log.warn("activateUnion error because 15 days has activate in bigdata database info with param is {}", request);
-//					} else {
-//						//根据mkt_markering
-//						//15天内没有记录，则记录大数据日志，退出
-//						JSONObject j = new JSONObject();
-//						j.put("apptype", request.getClient_type());
-//						j.put("appid", click.getAppid());
-//						j.put("idfa", request.getIdfa());
-//						j.put("imei", request.getImei());
-//						j.put("udid", request.getUdid());
-//						j.put("dateid", DateUtil.getcurrentDateTime());
-//						j.put("source", u == null ? "" : u.getName());
-//						j.put("source_id",click.getUnion_type());
-//						j.put("ip", request.getClientIp());
-//						j.put("collect_ip", "");
-//						j.put("app_key", request.getAppkey());
-//						j.put("active_type", "15");
-//						j.put("tdid", request.getTdid());
-//						activeDingdang.info(j.toString());
-//					}
 					return new UnionResponse(200, "have activite in 90 days",result);
 					return new UnionResponse(200, "have activite in 90 days",result);
 				}
 				}
 			}
 			}
@@ -516,10 +492,6 @@ public class UnionServiceImpl implements IUnionService,ApplicationEventPublisher
 			//打印90天的大数据日志
 			//打印90天的大数据日志
 			activeDingdang.info(j.toString());
 			activeDingdang.info(j.toString());
 			
 			
-			j.put("active_type", "15");
-			//打印15天的大数据日志
-			activeDingdang.info(j.toString());
-
 			String source = u == null ? "" : u.getName();
 			String source = u == null ? "" : u.getName();
 			String source_id = click.getUnion_type();
 			String source_id = click.getUnion_type();
 			String muid = "" ;
 			String muid = "" ;