活动结束时间30天后删除活动code对应的所有key；

活动全量pvuv统计bug修复

@@ -67,8 +67,8 @@ public class PvUvCalculateTask {
                         log.info("活动结束时间-->>{}",endTime);
                         // 活动结束删除所有的对应的key
                         if (endTime.compareTo(LocalDateTime.now()) <= 0) {
-                            log.info("活动结束，活动结束时间两天后删除活动code对应的所有key");
-                            if (endTime.plusDays(2).compareTo(LocalDateTime.now()) <= 0) {
+                            log.info("活动结束，活动结束时间30天后删除活动code对应的所有key");
+                            if (endTime.plusDays(30).compareTo(LocalDateTime.now()) <= 0) {
 
                                 Set<Object> keys = this.redisUtils.keys("*|"+code+"*");
                                 if (CollectionUtils.isNotEmpty(keys)) {
@@ -102,9 +102,11 @@ public class PvUvCalculateTask {
                         pvUvHour.setHour(LocalDateTime.now().getHour());
                         pvUvHour.setPv(hourPv);
                         pvUvHour.setUv(hourUv);
+                        log.info("PvUvHour不存在，创建PvUvHour: {}", pvUvHour);
                         this.pvUvHourService.create(pvUvHour);
 
-                    } else {
+                    }
+                    else {
 
                         Integer hourPv = this.getHourPV(code);
                         Integer hourUv = this.getHourUV(code);
@@ -128,8 +130,8 @@ public class PvUvCalculateTask {
 
                     // day pv、uv值
                     PvUvDay pvUvDay1 = this.pvUvDayService.findByMarketingActivityIdAndDay(Long.parseLong(id), LocalDate.now().toString());
-                    if(Objects.isNull(pvUvDay1.getId())){
 
+                    if(Objects.isNull(pvUvDay1.getId())){
                         PvUvDay pvUvDay = new PvUvDay();
                         pvUvDay.setMarketingActivityId(Long.parseLong(id));
                         pvUvDay.setMarketingActivityCode(code);
@@ -141,9 +143,10 @@ public class PvUvCalculateTask {
                         log.info("dayUv ==>> {}", dayUv);
                         pvUvDay.setPv(dayPv);
                         pvUvDay.setUv(dayUv);
+                        log.info("PvUvDay不存在，创建PvUvDay: {}", pvUvDay);
                         this.pvUvDayService.create(pvUvDay);
-
-                    } else {
+                    }
+                    else {
 
                         Integer dayPv = this.getDayPV(code);
                         Integer dayUv = this.getDayUV(code);
@@ -177,10 +180,11 @@ public class PvUvCalculateTask {
                         log.info("allUv ==>> {}", allUv);
                         pvUv.setPv(allPV);
                         pvUv.setUv(allUv);
-
+                        log.info("PvUv不存在，创建PvUvALL: {}", pvUv);
                         this.pvUvService.create(pvUv);
 
-                    } else {
+                    }
+                    else {
 
                         Integer allPV = this.getAllPV(code);
                         Integer allUv = this.getAllUV(code);
@@ -188,11 +192,11 @@ public class PvUvCalculateTask {
                         log.info("allUv ==>> {}", allUv);
 
                         if (pvUv1.getPv() >= allPV) {
-                            allPV = pvUvDay1.getPv();
+                            allPV = pvUv1.getPv();
                         }
 
                         if (pvUv1.getUv() >= allUv) {
-                            allUv = pvUvDay1.getUv();
+                            allUv = pvUv1.getUv();
                         }
 
                         pvUv1.setPv(allPV);