lyhzzz пре 3 година
родитељ
комит
5ba85ae347

+ 1 - 1
src/main/java/com/cdf/controller/api/PageDataApiController.java

@@ -60,7 +60,7 @@ public class PageDataApiController {
                 break;
             case 1:
                 if(pageData.getInPageTime() == null){
-                    pageData.setInPageTime(DateUtil.getDay(new Date()));
+                    pageData.setInPageTime(DateUtil.getFirstDay(new Date()));
                 }
                 pageData.setOutPageTime(DateUtil.getDateTime(new Date()));
                 long time = DateUtil.getDateTime(pageData.getInPageTime());

+ 1 - 1
src/main/java/com/cdf/schedule/ScheduleTask.java

@@ -55,7 +55,7 @@ public class ScheduleTask {
                 clickShopCount = clickShopCount.add(new BigDecimal(1));
             }
             if(pageData.getStopTime() == 0){
-                String inPageTime = pageData.getInPageTime();
+                String inPageTime = pageData.getInPageTime() == null ?  day +" 00:00:00" :pageData.getInPageTime();
                 String outPageTime = pageData.getOutPageTime() == null ? day+ " 23:59:59" :pageData.getOutPageTime();
                 long time = DateUtil.getDateTime(outPageTime) - DateUtil.getDateTime(inPageTime);
                 pageData.setStopTime(time);