付费渠道

@@ -35,11 +35,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-<<<<<<< HEAD
 import org.springframework.beans.factory.annotation.Value;
-=======
 import org.springframework.beans.BeanUtils;
->>>>>>> master
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.stereotype.Service;
@@ -118,10 +115,9 @@ public class UnionServiceImpl implements IUnionService,ApplicationEventPublisher
 	@Resource(name="unionServiceImpl")
 	IUnionService unionService;
 
-<<<<<<< HEAD
 	// 记录付费渠道的redis
 	private static final String UNION_PAY_CHANNEL_KEY_PRE = "union:pay_channel:";
-=======
+
 	public final static List<String> IOS_INTERFACE_LIST = new ArrayList<String>(){{
 		add("addUnion_ios");add("addUnion4Jump_ios");add("addMonitor_ios");
 	}};
@@ -130,7 +126,6 @@ public class UnionServiceImpl implements IUnionService,ApplicationEventPublisher
 		add("addUnion_android");add("addUnion4Jump_android");add("addMonitor_android");
 	}};
 
->>>>>>> master
 
 	/**
 	 * 默认10个线程，
@@ -393,7 +388,7 @@ public class UnionServiceImpl implements IUnionService,ApplicationEventPublisher
 
 			JSONObject result = new JSONObject();
 			result.put("landing_page_url",StringUtils.isEmpty(mktMarketingUrl.getLandingPageUrl()) ? "" : mktMarketingUrl.getLandingPageUrl());
-			
+
 			if (union != null && union.getIsActivate() != null && union.getIsActivate().byteValue() == 1) {
 				// 如果90天之内有过激活日志，则不允许重复激活
 				log.warn("activateUnion error because 90 days has activate info with param is {}", request);
@@ -475,11 +470,8 @@ public class UnionServiceImpl implements IUnionService,ApplicationEventPublisher
 				}
 			}
 
-			// 调用成功，更新数据库
-<<<<<<< HEAD
-			saveUnionLogs(request,click,value);
 			log.info("activateUnion add db success with request is {}", request);
-=======
+
 			UnionLogs logs = new UnionLogs();
 			logs.setAppId(request.getAppid());
 			logs.setUdid(request.getUdid());
@@ -503,7 +495,6 @@ public class UnionServiceImpl implements IUnionService,ApplicationEventPublisher
 				log.error("activity save unionlog error is {}",e.getMessage());
 			}
 
->>>>>>> master
 
 			// 记录日志
 			JSONObject j = new JSONObject();