yumeng 9 月之前
父節點
當前提交
b9afba6f40

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

@@ -468,7 +468,10 @@ public class KuaishouItemCollectSamplesServiceImpl implements IKuaishouItemColle
         Map<String, String> map = DateUtils.getStartEndTime(startDate, endDate);
         String daysBetween = map.get("daysBetween");
         Map<String, Object> parMap = new HashMap<>();
-        if (!"0".equals(daysBetween)) {
+        Long nowDate = Long.valueOf(DateUtils.getNowDate("yyyyMMdd"));
+        if(startDate.equals(nowDate)  && endDate.equals(nowDate) ){
+            hour2 = DateUtils.getNowHour() - 1;
+        }else {
             hour2 = 23;
         }
         //下个周期的开始时间
@@ -605,17 +608,23 @@ 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 = DateUtils.getNowHour() - 1;
+            Integer hour2 = null;
             //根据本阶段日期 获取上阶段 开始 和 截至 日期
             Map<String, String> map = DateUtils.getStartEndTime(startDate, endDate);
             String daysBetween = map.get("daysBetween");
             Map<String, Object> parMap = new HashMap<>();
-            if (!"0".equals(daysBetween)) {
+
+            if(startDate.equals(nowDate)  && endDate.equals(nowDate) ){
+                hour2 = DateUtils.getNowHour() - 1;
+            }else {
                 hour2 = 23;
             }
+
             //下个周期的开始时间
             String lastTimeStart = map.get("lastTimeStart");
             //下个周期的结束时间