Authored by zhengwen.ge

增加自然量统计

@@ -24,10 +24,12 @@ @@ -24,10 +24,12 @@
24 24
25 <select id="selectNatialIdfaCount" resultType="java.lang.String"> 25 <select id="selectNatialIdfaCount" resultType="java.lang.String">
26 select sum(APP_ACTIVE) from APP_CHANNEL_ACTIVE where DATE_ID BETWEEN #{beginTime} and #{endTime} and app_key = "yohobuy_ios" 26 select sum(APP_ACTIVE) from APP_CHANNEL_ACTIVE where DATE_ID BETWEEN #{beginTime} and #{endTime} and app_key = "yohobuy_ios"
  27 + and UNION_TYPE in('-999','2931','2937','2943','2945','2947','2953','3031','3095','3115','3117','3119','3121','3381','3383','7849','7857','td','7853','7859','2919','3109','7863','7851','7855','7865','0','7867','7835','3191','7861','3491','3129')
27 </select> 28 </select>
28 29
29 <select id="selectNatialImeiCount" resultType="java.lang.String"> 30 <select id="selectNatialImeiCount" resultType="java.lang.String">
30 select sum(APP_ACTIVE) from APP_CHANNEL_ACTIVE where DATE_ID BETWEEN #{beginTime} and #{endTime} and app_key = "yohobuy_android" 31 select sum(APP_ACTIVE) from APP_CHANNEL_ACTIVE where DATE_ID BETWEEN #{beginTime} and #{endTime} and app_key = "yohobuy_android"
  32 + and UNION_TYPE in('-999','2931','2937','2943','2945','2947','2953','3031','3095','3115','3117','3119','3121','3381','3383','7849','7857','td','7853','7859','2919','3109','7863','7851','7855','7865','0','7867','7835','3191','7861','3491','3129')
31 </select> 33 </select>
32 34
33 </mapper> 35 </mapper>
@@ -661,12 +661,12 @@ public class UnionServiceImpl implements IUnionService,ApplicationEventPublisher @@ -661,12 +661,12 @@ public class UnionServiceImpl implements IUnionService,ApplicationEventPublisher
661 int natialIdfaCount =0; 661 int natialIdfaCount =0;
662 int natialImeiCount = 0; 662 int natialImeiCount = 0;
663 String natialIdfaCountstr = appChannelActiveMapper.selectNatialIdfaCount(Integer.valueOf(beginDate),Integer.valueOf(endDate)); 663 String natialIdfaCountstr = appChannelActiveMapper.selectNatialIdfaCount(Integer.valueOf(beginDate),Integer.valueOf(endDate));
664 - if(StringUtils.isEmpty(natialIdfaCountstr)){  
665 - natialIdfaCount = 0; 664 + if(StringUtils.isNotEmpty(natialIdfaCountstr)){
  665 + natialIdfaCount = Integer.valueOf(natialIdfaCountstr);
666 } 666 }
667 String natialImeiCountstr= appChannelActiveMapper.selectNatialImeiCount(Integer.valueOf(beginDate), Integer.valueOf(endDate)); 667 String natialImeiCountstr= appChannelActiveMapper.selectNatialImeiCount(Integer.valueOf(beginDate), Integer.valueOf(endDate));
668 - if(StringUtils.isEmpty(natialImeiCountstr)){  
669 - natialImeiCount = 0; 668 + if(StringUtils.isNotEmpty(natialImeiCountstr)){
  669 + natialImeiCount =Integer.valueOf(natialImeiCountstr);
670 } 670 }
671 int natailCount = natialIdfaCount+natialImeiCount; 671 int natailCount = natialIdfaCount+natialImeiCount;
672 // if(null != activateDeviceIdRspList && activateDeviceIdRspList.size() > 0){ 672 // if(null != activateDeviceIdRspList && activateDeviceIdRspList.size() > 0){