修改：演出预告列表（待完）

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/pom.xml

@@ -38,6 +38,12 @@
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-goblin-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -7,6 +7,7 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.UserPathDto;
 import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
 import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
 import com.liquidnet.service.kylin.constant.KylinPerformanceStatusEnum;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
@@ -152,6 +153,8 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         HashMap<String, Object> performancesListNotice = dataUtils.getPerformancesListNotice();
         List<KylinPerformanceVo> toDayList = (List<KylinPerformanceVo>) performancesListNotice.get("toDayList");
         List<KylinPerformanceVo> threeDaysList = (List<KylinPerformanceVo>) performancesListNotice.get("threeDaysList");
+        List<GoblinGoodsSkuInfoVo> toDaysNftList = (List<GoblinGoodsSkuInfoVo>) performancesListNotice.get("toDaysNftList");
+        List<GoblinGoodsSkuInfoVo> threeNftList = (List<GoblinGoodsSkuInfoVo>) performancesListNotice.get("threeNftList");
 
         toDayList = checkAppStatus(toDayList);
         threeDaysList = checkAppStatus(threeDaysList);
@@ -163,6 +166,8 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         HashMap<String, Object> newList = CollectionUtil.mapStringObject();
         newList.put("toDayList", toDayList);
         newList.put("threeDaysList", threeDaysList);
+        newList.put("toDaysNftList",toDaysNftList);
+        newList.put("threeNftList",threeNftList);
         return newList;
     }
 

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.utils;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dto.vo.KylinApiCameraDevicesVo;
@@ -27,9 +28,11 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.unit.DataUnit;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -355,7 +358,8 @@ public class DataUtils {
     public HashMap<String, Object> getPerformancesListNotice() {
         String redisKey = KylinRedisConst.PERFORMANCES_LIST_NOTICE;
         Object obj = redisUtil.get(redisKey);
-        if (obj == null) {
+//        if (obj == null) {
+        if (true) {
             // 固定条件
             Query query = getCommonWhere();
             // 排序
@@ -394,10 +398,34 @@ public class DataUtils {
             queryT.addCriteria(Criteria.where("roadShowId").nin(roadShowId));
             List<KylinPerformanceVo> threeDaysList = mongoTemplate.find(queryT, KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
 
+            //数字藏品
+            //当天
+            Query queryToDayNft = new Query();
+            LocalDateTime nowTimeT =  DateUtil.asLocalDateTime((Date) toDayTime.get("start"));
+            LocalDateTime toDayEndTime = DateUtil.asLocalDateTime((Date) toDayTime.get("end"));
+            queryToDayNft.addCriteria(Criteria.where("skuType").is(1));
+            queryToDayNft.addCriteria(Criteria.where("saleStartTime").gte(nowTimeT).lt(toDayEndTime));
+            Sort sortNameToDayNft = Sort.by(Sort.Direction.ASC, "saleStartTime");
+            queryToDayNft.with(sortNameToDayNft);
+            List<GoblinGoodsSkuInfoVo> toDaysNftList = mongoTemplate.find(queryToDayNft,GoblinGoodsSkuInfoVo.class,GoblinGoodsSkuInfoVo.class.getSimpleName());
+
+            //三天的
+            Query queryThreeNft = new Query();
+            queryThreeNft.addCriteria(Criteria.where("skuType").is(1));
+            LocalDateTime threeEndTime = DateUtil.asLocalDateTime(beforeDayEnd);
+            queryThreeNft.addCriteria(Criteria.where("saleStartTime").gte(toDayEndTime).lt(threeEndTime));
+            Sort sortThreeNft = Sort.by(Sort.Direction.ASC, "saleStartTime");
+            queryThreeNft.with(sortThreeNft);
+            List<GoblinGoodsSkuInfoVo> threeNftList = mongoTemplate.find(queryThreeNft,GoblinGoodsSkuInfoVo.class,GoblinGoodsSkuInfoVo.class.getSimpleName());
+
+            //组合购
+
             HashMap<String, Object> info = CollectionUtil.mapStringObject();
             info.put("toDayList", toDayList);
             info.put("threeDaysList", threeDaysList);
-            redisUtil.set(redisKey, info);
+            info.put("toDaysNftList", toDaysNftList);
+            info.put("threeNftList", threeNftList);
+//            redisUtil.set(redisKey, info);
             return info;
         }
         return (HashMap<String, Object>) obj;