演出预告列表修改

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/NoticeGoblinGoodsSkuInfoVo.java

@@ -2,6 +2,7 @@ package com.liquidnet.service.goblin.dto.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.goblin.dto.manage.vo.GoblinGoodsAnticipateValueVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -75,6 +76,13 @@ public class NoticeGoblinGoodsSkuInfoVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "停售时间")
     private LocalDateTime saleStopTime;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @ApiModelProperty(value = "预约开始时间")
+    private LocalDateTime aboutStartTime;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @ApiModelProperty(value = "预约停止时间")
+    private LocalDateTime aboutStopTime;
+
     private static final NoticeGoblinGoodsSkuInfoVo obj = new NoticeGoblinGoodsSkuInfoVo();
 
     public static NoticeGoblinGoodsSkuInfoVo getNew() {
@@ -118,4 +126,10 @@ public class NoticeGoblinGoodsSkuInfoVo implements Serializable, Cloneable {
     }
 
 
+    public NoticeGoblinGoodsSkuInfoVo valueCopy(GoblinGoodsAnticipateValueVo valueVo) {
+        if (null == valueVo) return getNew();
+        this.aboutStartTime = valueVo.getAboutStartDate();
+        this.aboutStopTime = valueVo.getAboutEndDate();
+        return this;
+    }
 }

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

@@ -8,8 +8,6 @@ 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.NoticeGoblinGoodsSkuInfoVo;
-import com.liquidnet.service.goblin.dto.vo.NoticeGoblinMixDetailsVo;
 import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
 import com.liquidnet.service.kylin.constant.KylinPerformanceStatusEnum;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
@@ -155,14 +153,14 @@ 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");
+        List<GoblinGoodsSkuInfoVo> toDaysNftList = (List<GoblinGoodsSkuInfoVo>) performancesListNotice.get("toDaysNftList");
+        List<GoblinGoodsSkuInfoVo> threeDayNftList = (List<GoblinGoodsSkuInfoVo>) performancesListNotice.get("threeDayNftList");
         List<GoblinGoodsSkuInfoVo> toDayCombinationList = (List<GoblinGoodsSkuInfoVo>) performancesListNotice.get("toDayCombinationList");
-        List<GoblinGoodsSkuInfoVo> threeDayCombinationList = (List<GoblinGoodsSkuInfoVo>) performancesListNotice.get("threeDayCombinationList");*/
-        List<NoticeGoblinGoodsSkuInfoVo> toDaysNftList = (List<NoticeGoblinGoodsSkuInfoVo>) performancesListNotice.get("toDaysNftList");
+        List<GoblinGoodsSkuInfoVo> threeDayCombinationList = (List<GoblinGoodsSkuInfoVo>) performancesListNotice.get("threeDayCombinationList");
+        /*List<NoticeGoblinGoodsSkuInfoVo> toDaysNftList = (List<NoticeGoblinGoodsSkuInfoVo>) performancesListNotice.get("toDaysNftList");
         List<NoticeGoblinGoodsSkuInfoVo> threeNftList = (List<NoticeGoblinGoodsSkuInfoVo>) performancesListNotice.get("threeNftList");
         List<NoticeGoblinMixDetailsVo> toDayCombinationList = (List<NoticeGoblinMixDetailsVo>) performancesListNotice.get("toDayCombinationList");
-        List<NoticeGoblinMixDetailsVo> threeDayCombinationList = (List<NoticeGoblinMixDetailsVo>) performancesListNotice.get("threeDayCombinationList");
+        List<NoticeGoblinMixDetailsVo> threeDayCombinationList = (List<NoticeGoblinMixDetailsVo>) performancesListNotice.get("threeDayCombinationList");*/
 
         toDayList = checkAppStatus(toDayList);
         threeDaysList = checkAppStatus(threeDaysList);
@@ -175,7 +173,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         newList.put("toDayList", toDayList);
         newList.put("threeDaysList", threeDaysList);
         newList.put("toDaysNftList",toDaysNftList);
-        newList.put("threeNftList",threeNftList);
+        newList.put("threeDayNftList",threeDayNftList);
         newList.put("toDayCombinationList",toDayCombinationList);
         newList.put("threeDayCombinationList",threeDayCombinationList);
         return newList;

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

@@ -384,16 +384,13 @@ public class DataUtils {
             //数字藏品
             //当天
             List<GoblinGoodsSkuInfoVo> toDaysNftList = getGoblinGoodsSkuInfoVos(toDayNftIds);
-            List<NoticeGoblinGoodsSkuInfoVo> toDayNftVoList = toDaysNftList.stream().map(goblinGoodsSkuInfoVo -> {
-                return NoticeGoblinGoodsSkuInfoVo.getNew().copy(goblinGoodsSkuInfoVo);
-            }).collect(Collectors.toList());
+            String anticipateKey = GoblinRedisConst.ANTICIPATE_VALUE_SKUID;
+            List<NoticeGoblinGoodsSkuInfoVo> toDayNftVoList = aboutDayNftVoList(toDaysNftList, anticipateKey);
 
 
             //三天的
             List<GoblinGoodsSkuInfoVo> threeNftList = getGoblinGoodsSkuInfoVos(threeNftIds);
-            List<NoticeGoblinGoodsSkuInfoVo> threeNftVoList = threeNftList.stream().map(goblinGoodsSkuInfoVo -> {
-                return NoticeGoblinGoodsSkuInfoVo.getNew().copy(goblinGoodsSkuInfoVo);
-            }).collect(Collectors.toList());
+            List<NoticeGoblinGoodsSkuInfoVo> threeDayNftVoList = aboutDayNftVoList(threeNftList, anticipateKey);
 
             //组合购
             //当天
@@ -413,7 +410,7 @@ public class DataUtils {
             info.put("threeDaysList", threeDaysList);
             //过滤数据
             info.put("toDaysNftList", toDayNftVoList);
-            info.put("threeNftList", threeNftVoList);
+            info.put("threeDayNftList", threeDayNftVoList);
             info.put("toDayCombinationList", toDayCombinationVoList);
             info.put("threeDayCombinationList", threeDayCombinationVoList);
 
@@ -427,6 +424,19 @@ public class DataUtils {
         return (HashMap<String, Object>) obj;
     }
 
+    private List<NoticeGoblinGoodsSkuInfoVo> aboutDayNftVoList(List<GoblinGoodsSkuInfoVo> toDaysNftList, String anticipateKey) {
+        List<NoticeGoblinGoodsSkuInfoVo> toDayNftVoList = toDaysNftList.stream().map(goblinGoodsSkuInfoVo -> {
+            NoticeGoblinGoodsSkuInfoVo noticeGoblinGoodsSkuInfoVo = NoticeGoblinGoodsSkuInfoVo.getNew().copy(goblinGoodsSkuInfoVo);
+            //获取预约开始结束时间
+            Object valueVo = redisUtil.get(anticipateKey.concat(goblinGoodsSkuInfoVo.getSkuId()));
+            if (valueVo!=null){
+                noticeGoblinGoodsSkuInfoVo = noticeGoblinGoodsSkuInfoVo.valueCopy((GoblinGoodsAnticipateValueVo)valueVo);
+            }
+            return noticeGoblinGoodsSkuInfoVo;
+        }).collect(Collectors.toList());
+        return toDayNftVoList;
+    }
+
     private List<GoblinMixDetailsVo> getGoblinMixDetailsVos(List<String> toDayCombinationIds) {
         List<GoblinMixDetailsVo> toDayCombinationList = new ArrayList<>();
         //redis key