Merge branch 'dev_notice_0708' into dev_bd_rm_consumer_od

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java

@@ -35,6 +35,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -547,6 +548,7 @@ public class DataUtils {
                     GoblinGoodsSkuInfoVo skuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(item.getSkuId());
                     item.setSkuName(skuInfoVo.getName());
                 }
+                toDayCombinationList.add(mixDetails);
             });
 
             /*Query queryToDayCombination = new Query();
@@ -646,12 +648,13 @@ public class DataUtils {
         List<String> threeDayIds = threeDaysList.stream().map(KylinPerformanceVo::getPerformancesId).collect(Collectors.toList());
         //数字藏品
 
-        LocalDateTime nowTimeTime = null;
         List<String> toDayNftIds = null;
         List<String> threeNftIds = null;
         try {
-            nowTimeTime = DateUtil.asLocalDateTime((Date) toDayTime.get("start"));
-            LocalDateTime toDayEndTime = DateUtil.asLocalDateTime((Date) toDayTime.get("end"));
+            DateTimeFormatter df = DateTimeFormatter.ofPattern(DateUtil.DATE_FULL_STR);
+            LocalDateTime nowTime = LocalDateTime.parse(nowTimeTStr, df);
+            LocalDateTime endTime = LocalDateTime.parse(toDayEndTimeStr,df);
+
             LocalDateTime threeEndTime = DateUtil.asLocalDateTime(beforeDayEnd);
             //查询预约(当天)
 //        List<GoblinGoodsSkuInfoVo> toDayAboutNft = getAboutNftByStartAndEndTime(nowTimeTime, toDayEndTime,0);
@@ -672,7 +675,7 @@ public class DataUtils {
             queryToDayNft.addCriteria(Criteria.where("delFlg").is("0"));
             queryToDayNft.addCriteria(Criteria.where("soldoutStatus").is("0"));
             queryToDayNft.addCriteria(Criteria.where("skuAppear").is("0"));
-            queryToDayNft.addCriteria(Criteria.where("saleStartTime").gte(nowTimeTime).lt(toDayEndTime));
+            queryToDayNft.addCriteria(Criteria.where("saleStartTime").gte(nowTime).lt(endTime));
 //        queryToDayNft.addCriteria(Criteria.where("skuId").nin(toDayAboutNftSkuIds));
             /* queryToDayNft.addCriteria(Criteria.where("skuId").nin(allListSkuIds));*/
             queryToDayNft.addCriteria(Criteria.where("shelvesHandle").ne("3"));
@@ -689,7 +692,7 @@ public class DataUtils {
             queryThreeNft.addCriteria(Criteria.where("delFlg").is("0"));
             queryThreeNft.addCriteria(Criteria.where("soldoutStatus").is("0"));
             queryThreeNft.addCriteria(Criteria.where("skuAppear").is("0"));
-            queryThreeNft.addCriteria(Criteria.where("saleStartTime").gte(toDayEndTime).lt(threeEndTime));
+            queryThreeNft.addCriteria(Criteria.where("saleStartTime").gte(endTime).lt(threeEndTime));
             /*queryThreeNft.addCriteria(Criteria.where("skuId").nin(allListSkuIds));*/
             queryThreeNft.addCriteria(Criteria.where("shelvesHandle").ne("3"));
             Sort sortThreeNft = Sort.by(Sort.Direction.ASC, "saleStartTime");
@@ -735,7 +738,6 @@ public class DataUtils {
         idsList.put("threeNftIds", threeNftIds);
         idsList.put("toDayCombinationIds", toDayCombinationIds);
         idsList.put("threeDayCombinationIds", threeDayCombinationIds);
-        idsList.put("now", nowTimeTime);
         setRedisNoticeIsd(idsList);
         return idsList;
     }