Browse Source

首页 同比小时 -1

zhaoxian 8 months ago
parent
commit
b10ba75844

+ 10 - 10
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KuaishouItemCollectSamplesServiceImpl.java

@@ -456,7 +456,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
         JSONObject order = new JSONObject();
         JSONObject order = new JSONObject();
 
 
         //当前小时
         //当前小时
-        Integer hour2 = DateUtils.getNowHour() ;
+        Integer hour2 = DateUtils.getNowHour() - 1;
         //当天 yyyy-MM-dd
         //当天 yyyy-MM-dd
         String today = DateUtils.getNowDateStr();
         String today = DateUtils.getNowDateStr();
 
 
@@ -601,7 +601,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
         if (Check.isNotNull(itemIds)) {
         if (Check.isNotNull(itemIds)) {
             JSONObject order = null;
             JSONObject order = null;
             //当前小时
             //当前小时
-            Integer hour2 = DateUtils.getNowHour();
+            Integer hour2 = DateUtils.getNowHour() - 1;
             //当天
             //当天
             String today = DateUtils.getNowDateStr();
             String today = DateUtils.getNowDateStr();
             //根据本阶段日期 获取上阶段 开始 和 截至 日期
             //根据本阶段日期 获取上阶段 开始 和 截至 日期
@@ -848,9 +848,9 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
             yesterday = supplyChainService.getKsCourtshipGmvHourByDate(userList, DateUtils.getIntegerTime(lastDate));
             yesterday = supplyChainService.getKsCourtshipGmvHourByDate(userList, DateUtils.getIntegerTime(lastDate));
             roi = supplyChainService.getKsCourtshipGmvHourByDateRoi(userList, DateUtils.getIntegerTime(nowDate));
             roi = supplyChainService.getKsCourtshipGmvHourByDateRoi(userList, DateUtils.getIntegerTime(nowDate));
         }
         }
-        completionTime(today, nowDate,"charge");
-        completionTime(yesterday, lastDate,"charge");
-        completionTime(roi, nowDate,"roi");
+        completionTime(today, nowDate, "charge");
+        completionTime(yesterday, lastDate, "charge");
+        completionTime(roi, nowDate, "roi");
         JSONObject result = new JSONObject();
         JSONObject result = new JSONObject();
         result.put("today", today);
         result.put("today", today);
         result.put("yesterday", yesterday);
         result.put("yesterday", yesterday);
@@ -865,7 +865,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
     /**
     /**
      * 补全时辰
      * 补全时辰
      */
      */
-    private void completionTime(List<JSONObject> dataList, String nowDate,String type) {
+    private void completionTime(List<JSONObject> dataList, String nowDate, String type) {
      /*   String today = DateUtils.getNowDate("yyyy-MM-dd");   // 当天
      /*   String today = DateUtils.getNowDate("yyyy-MM-dd");   // 当天
         Integer tohour = DateUtils.getNowHour(); // 当前小时*/
         Integer tohour = DateUtils.getNowHour(); // 当前小时*/
 
 
@@ -879,10 +879,10 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
                 dayList.add(i);
                 dayList.add(i);
             }
             }
         } else {*/
         } else {*/
-            for (int i = 0; i <= 23; i++) {
-                dayList.add(i);
-            }
-       /* }*/
+        for (int i = 0; i <= 23; i++) {
+            dayList.add(i);
+        }
+        /* }*/
         for (Integer hour : dayList) {
         for (Integer hour : dayList) {
             if (!newDayList.contains(hour)) {
             if (!newDayList.contains(hour)) {
                 JSONObject obj = new JSONObject();
                 JSONObject obj = new JSONObject();