Просмотр исходного кода

睿选首页 小时数约束优化

zhaoxian 9 месяцев назад
Родитель
Сommit
4daf6e6c64

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

@@ -464,14 +464,14 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
 
         //当前小时
         Integer hour2 = DateUtils.getNowHour() - 1;
+        //当天 yyyy-MM-dd
+        String today = DateUtils.getNowDateStr();
+
         //根据本阶段日期 获取上阶段 开始 和 截至 日期
         Map<String, String> map = DateUtils.getStartEndTime(startDate, endDate);
         String daysBetween = map.get("daysBetween");
         Map<String, Object> parMap = new HashMap<>();
-        Long nowDate = Long.valueOf(DateUtils.getNowDate("yyyyMMdd"));
-        if(startDate.equals(nowDate)  && endDate.equals(nowDate) ){
-            hour2 = DateUtils.getNowHour() - 1;
-        }else {
+        if (!(startDate.equals(endDate) && endDate.equals(today))) {
             hour2 = 23;
         }
         //下个周期的开始时间
@@ -509,8 +509,6 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
         Date date = new Date();
         //当前小时
         Integer hour = DateUtils.getNowHour() - 1;
-        //当天
-        String today = DateUtils.getNowDateStr();
         //昨天
         String yesterday = DateUtils.getSubtractTime(date, 1);
         //上周的同一天(上个近七天的结束日期)
@@ -538,7 +536,6 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
 
             //昨日数据
             JSONObject yesData = getOrderRate(yesterday, yesterday, hour, promoterIds, null, mediaId);
-
             //日环比 (今天-昨天)/昨天*100%
             data.put("dateOrderRate", getOrderRateValue(toData, yesData));
             data.put("dateAmountRate", getAmountRateValue(toData, yesData));
@@ -608,20 +605,18 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
         JSONObject data = new JSONObject();
         //查询登录人(创建人)的所有商品
         List<Long> itemIds = kuaishouItemCollectSamplesMapper.getItemIdsByCreateId(userList, mediaId);
-
-        Long nowDate = Long.valueOf(DateUtils.getNowDate("yyyyMMdd"));
         if (Check.isNotNull(itemIds)) {
             JSONObject order = null;
             //当前小时
-            Integer hour2 = null;
+            Integer hour2 = DateUtils.getNowHour() - 1;
+            //当天
+            String today = DateUtils.getNowDateStr();
             //根据本阶段日期 获取上阶段 开始 和 截至 日期
             Map<String, String> map = DateUtils.getStartEndTime(startDate, endDate);
             String daysBetween = map.get("daysBetween");
             Map<String, Object> parMap = new HashMap<>();
 
-            if(startDate.equals(nowDate)  && endDate.equals(nowDate) ){
-                hour2 = DateUtils.getNowHour() - 1;
-            }else {
+            if (!(startDate.equals(endDate) && endDate.equals(today))) {
                 hour2 = 23;
             }
 
@@ -658,8 +653,7 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
             Date date = new Date();
             //当前小时
             Integer hour = DateUtils.getNowHour() - 1;
-            //当天
-            String today = DateUtils.getNowDateStr();
+
             //昨天
             String yesterday = DateUtils.getSubtractTime(date, 1);
             //上周的同一天(上个近七天的结束日期)