update

@@ -24,7 +24,7 @@ public interface IUnionLogsDAO {
     UnionLogs selectAndroid(@Param("appId")String appId,@Param("imei") String imei,@Param("clientType")String clientType, @Param("unionType") byte unionType);
     UnionLogs selectAndroid(@Param("appId")String appId,@Param("imei") String imei,@Param("clientType")String clientType, @Param("unionType") byte unionType);
     
     
     UnionLogs selectUnionList(UnionLogs logs);
     UnionLogs selectUnionList(UnionLogs logs);
-    UnionLogs selectByClientType(@Param("clientType")String clientType, @Param("idfa")String idfa, @Param("imei")String imei);
+    UnionLogs selectByClientType(@Param("clientType")String clientType, @Param("idfa")String idfa, @Param("imei")String imei, @Param("unionType")byte unionType);
     int updateUnionLogs(UnionLogs logs);
     int updateUnionLogs(UnionLogs logs);
     
     
     
     

@@ -71,6 +71,7 @@
 		<if test="clientType=='android'">
 		<if test="clientType=='android'">
 			and imei=#{imei}
 			and imei=#{imei}
 		</if>
 		</if>
+		and union_type=#{unionType}
 		limit 1
 		limit 1
 	</select>
 	</select>
 	<select id="selectUnionList" resultMap="BaseResultMap">
 	<select id="selectUnionList" resultMap="BaseResultMap">

@@ -165,9 +165,10 @@ public class UnionServiceImpl implements IUnionService {
 			return new UnionResponse(204, "user not click");
 			return new UnionResponse(204, "user not click");
 		}
 		}
 		
 		
-		
+		//把存储的字符串变为对象
+		ClickUnionRequestBO click = JSON.parseObject(value, ClickUnionRequestBO.class);
 		//查询该td在90天内是否已经激活过
 		//查询该td在90天内是否已经激活过
-		UnionLogs union = unionLogsDAO.selectByClientType(request.getClient_type(), request.getIdfa(), request.getImei());
+		UnionLogs union = unionLogsDAO.selectByClientType(request.getClient_type(), request.getIdfa(), request.getImei(), Byte.valueOf(click.getUnion_type()));
 		log.info("activateUnion in selectByClientType result is {}", union);
 		log.info("activateUnion in selectByClientType result is {}", union);
 		//没有点击记录，则退出
 		//没有点击记录，则退出
 //		if (union == null) {
 //		if (union == null) {
@@ -181,8 +182,7 @@ public class UnionServiceImpl implements IUnionService {
 			return new UnionResponse(203, "have activite in 90 days");
 			return new UnionResponse(203, "have activite in 90 days");
 		}
 		}
 		
 		
-		//把存储的字符串变为对象
-		ClickUnionRequestBO click = JSON.parseObject(value, ClickUnionRequestBO.class);
+		
 		//UnionTypeModel type = UnionConstant.unionTypeMap.get(Integer.parseInt(click.getUnion_type()));
 		//UnionTypeModel type = UnionConstant.unionTypeMap.get(Integer.parseInt(click.getUnion_type()));
 		
 		
 		String url = click.getCallbackurl();
 		String url = click.getCallbackurl();