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

@@ -24,9 +24,9 @@ public class PinYouActServiceImpl extends UnionServiceImpl implements IUnionServ
 
 
         //直接调用原有的广点通获取URL的方法
         //直接调用原有的广点通获取URL的方法
         ActivateUnionRequestBO requestBO = new ActivateUnionRequestBO();
         ActivateUnionRequestBO requestBO = new ActivateUnionRequestBO();
-        requestBO.setClient_type(clickBO.getClient_type());
-        requestBO.setIdfa(clickBO.getIdfa());
-        requestBO.setImei(clickBO.getImei());
+        requestBO.setClient_type(activateUnionRequestBO.getClient_type());
+        requestBO.setIdfa(activateUnionRequestBO.getIdfa());
+        requestBO.setImei(activateUnionRequestBO.getImei());
         requestBO.setClientIp(activateUnionRequestBO.getClientIp());
         requestBO.setClientIp(activateUnionRequestBO.getClientIp());
         //对url进行拼装
         //对url进行拼装
         log.info("getCallbackUrl request is {}",requestBO);
         log.info("getCallbackUrl request is {}",requestBO);
@@ -47,7 +47,7 @@ public class PinYouActServiceImpl extends UnionServiceImpl implements IUnionServ
     private String urlEode(ActivateUnionRequestBO requestBO) {
     private String urlEode(ActivateUnionRequestBO requestBO) {
         String client_type = requestBO.getClient_type();
         String client_type = requestBO.getClient_type();
         Integer currentTime = DateUtil.getCurrentTimeSecond();
         Integer currentTime = DateUtil.getCurrentTimeSecond();
-        String pinYouUrl = "http://stats.ipinyou.com/mcdv?";
+        String pinYouUrl = "http://stats.ipinyou.com/mcvt?";
         //广告主信息
         //广告主信息
         String advertiser = "MC.LF";
         String advertiser = "MC.LF";
         String ip = requestBO.getClientIp();
         String ip = requestBO.getClientIp();