update

@@ -184,7 +184,7 @@ public class GDT2ServiceImpl extends UnionServiceImpl implements IUnionService {
         String convType = "MOBILEAPP_ACTIVITE";
 
         url = sb.append(DynamicPropertyFactory.getInstance().getStringProperty("guangdiantong.url", "").get()).append(requestBO.getAppid()).append("/conv?v=").append(retRep).append("&conv_type=").append(convType).append("&app_type=").append(clientTypeConver(requestBO.getClient_type())).append("&advertiser_id=").append(uid).toString();
-        log.info("guangdiantong url is {}", url);
+        log.info("guangdiantong url is {}，request is {}", url,requestBO);
         return url;
     }
 

@@ -349,6 +349,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天之内有过激活日志，则不允许重复激活
+				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());
+			}
+
 			String unionTypekey = "yh:union:uniontype:"+click.getUnion_type();
 			MktMarketingUrl mktMarketingUrl = redisValueCache.get(unionTypekey,MktMarketingUrl.class);
 			if(mktMarketingUrl==null){
@@ -359,11 +365,6 @@ 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);
-				return new UnionResponse(200, "have activite in 90 days",result);
-			}
 //			UnionTypeModel u = UnionConstant.unionTypeMap.get(Integer.parseInt(click.getUnion_type()));
 
 			UnionTypeModel u = new UnionTypeModel();