演出预告列表修改

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

+package com.liquidnet.service.goblin.dto.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * @author TT
+ */
+
+@ApiModel(value = "NoticeGoblinGoodsSkuInfoVo", description = "票务")
+@Data
+public class NoticeGoblinGoodsSkuInfoVo implements Serializable, Cloneable {
+
+    @ApiModelProperty(value = "商品单品ID")
+    private String skuId;
+    @ApiModelProperty(value = "商品ID[64]")
+    private String spuId;
+    @ApiModelProperty(value = "单品的编号[45]")
+    private String skuNo;
+    @ApiModelProperty(value = "商品类型[0-常规|1-数字藏品]")
+    private int skuType;
+    @ApiModelProperty(value = "单品的名称[100]")
+    private String name;
+    @ApiModelProperty(value = "单品的副标题[128]")
+    private String subtitle;
+    @ApiModelProperty(value = "单品默认图片的URL[256]")
+    private String skuPic;
+    @ApiModelProperty(value = "单品详情展示文件URL[256]")
+    private String skuWatch;
+    @ApiModelProperty(value = "展示文件类型[1-图片|2-视频|3-模型]")
+    private String watchType;
+    @ApiModelProperty(value = "展示预览图片URL[256]")
+    private String skuWatchPic;
+    @ApiModelProperty(value = "素材原始文件类型[1-图片|2-视频|3-模型]")
+    private String materialType;
+    @ApiModelProperty(value = "素材原始文件URL")
+    private String materialUrl;
+    @ApiModelProperty(value = "单品销售价-原价[20,2]")
+    private BigDecimal sellPrice;
+    @ApiModelProperty(value = "单品现价[20,2]")
+    private BigDecimal price;
+    @ApiModelProperty(value = "IOS商品价格[20,2]")
+    private BigDecimal priceV;
+    @ApiModelProperty(value = "IOS商品价格ID")
+    private String productId;
+    @ApiModelProperty(value = "单品会员价格[20,2]")
+    private BigDecimal priceMember;
+    @ApiModelProperty(value = "NFT路由")
+    private String routeType;
+    @ApiModelProperty(value = "NFT上传声明状态[0-待上传|1-已声明|2-声明失败|9-声明中]")
+    private Integer upchain;
+    @ApiModelProperty(value = "NFT预览图访问URL")
+    private String displayUrl;
+    @ApiModelProperty(value = "NFT素材访问URL")
+    private String nftUrl;
+    @ApiModelProperty(value = "NFT系列ID")
+    private String seriesId;
+    @ApiModelProperty(value = "NFT系列HASH")
+    private String seriesHash;
+    @ApiModelProperty(value = "NFT藏品HASH")
+    private String nftHash;
+    @ApiModelProperty(value = "NFT系列声明时间")
+    private String declareAt;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @ApiModelProperty(value = "开售时间")
+    private LocalDateTime saleStartTime;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @ApiModelProperty(value = "停售时间")
+    private LocalDateTime saleStopTime;
+
+    private static final NoticeGoblinGoodsSkuInfoVo obj = new NoticeGoblinGoodsSkuInfoVo();
+
+    public static NoticeGoblinGoodsSkuInfoVo getNew() {
+        try {
+            return (NoticeGoblinGoodsSkuInfoVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new NoticeGoblinGoodsSkuInfoVo();
+        }
+    }
+
+    public NoticeGoblinGoodsSkuInfoVo copy(GoblinGoodsSkuInfoVo goblinGoodsSkuInfoVo) {
+        if (null == goblinGoodsSkuInfoVo) return getNew();
+        this.declareAt = goblinGoodsSkuInfoVo.getDeclareAt();
+        this.displayUrl = goblinGoodsSkuInfoVo.getDisplayUrl();
+        this.price = goblinGoodsSkuInfoVo.getPrice();
+        this.materialType = goblinGoodsSkuInfoVo.getMaterialType();
+        this.materialUrl = goblinGoodsSkuInfoVo.getMaterialUrl();
+        this.name = goblinGoodsSkuInfoVo.getName();
+        this.nftHash = goblinGoodsSkuInfoVo.getNftHash();
+        this.nftUrl = goblinGoodsSkuInfoVo.getNftUrl();
+        this.priceV = goblinGoodsSkuInfoVo.getPriceV();
+        this.priceMember = goblinGoodsSkuInfoVo.getPriceMember();
+        this.productId = goblinGoodsSkuInfoVo.getProductId();
+        this.routeType = goblinGoodsSkuInfoVo.getRouteType();
+        this.saleStartTime = goblinGoodsSkuInfoVo.getSaleStartTime();
+        this.saleStopTime = goblinGoodsSkuInfoVo.getSaleStopTime();
+        this.sellPrice = goblinGoodsSkuInfoVo.getSellPrice();
+        this.seriesHash = goblinGoodsSkuInfoVo.getSeriesHash();
+        this.seriesId = goblinGoodsSkuInfoVo.getSeriesId();
+        this.skuId = goblinGoodsSkuInfoVo.getSkuId();
+        this.skuNo = goblinGoodsSkuInfoVo.getSkuNo();
+        this.skuPic = goblinGoodsSkuInfoVo.getSkuPic();
+        this.skuType = goblinGoodsSkuInfoVo.getSkuType();
+        this.spuId = goblinGoodsSkuInfoVo.getSpuId();
+        this.skuWatch = goblinGoodsSkuInfoVo.getSkuWatch();
+        this.skuWatchPic = goblinGoodsSkuInfoVo.getSkuWatchPic();
+        this.subtitle = goblinGoodsSkuInfoVo.getSubtitle();
+        this.upchain = goblinGoodsSkuInfoVo.getUpchain();
+        this.watchType = goblinGoodsSkuInfoVo.getWatchType();
+        return this;
+    }
+
+
+}

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

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @author TT
+ */
+
+@ApiModel(value = "NoticeGoblinMixDetailsItemVo", description = "票务")
+@Data
+public class NoticeGoblinMixDetailsItemVo implements Serializable, Cloneable {
+    @ApiModelProperty(value = "spuId")
+    private String spuId;
+    @ApiModelProperty(value = "skuId")
+    private String skuId;
+    @ApiModelProperty(value = "skuId")
+    private String skuPic;
+    @ApiModelProperty(value = "sku名称")
+    private String skuName;
+    @ApiModelProperty(value = "spu名称")
+    private String spuName;
+    @ApiModelProperty(value = "商品类型[1-商城|2-数字藏品]")
+    private String position;
+    @ApiModelProperty(value = "sku原价")
+    private BigDecimal skuPrice;
+    @ApiModelProperty(value = "组合价格")
+    private BigDecimal price;
+    @ApiModelProperty(value = "苹果价格")
+    private BigDecimal priceV;
+    @ApiModelProperty(value = "苹果价格id")
+    private String productId;
+    @ApiModelProperty(value = "组合件数[数字藏品不能大于1]")
+    private Integer count;
+
+    private static final NoticeGoblinMixDetailsItemVo obj = new NoticeGoblinMixDetailsItemVo();
+
+    public static NoticeGoblinMixDetailsItemVo getNew() {
+        try {
+            return (NoticeGoblinMixDetailsItemVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new NoticeGoblinMixDetailsItemVo();
+        }
+    }
+
+    public NoticeGoblinMixDetailsItemVo copy(GoblinMixDetailsItemVo goblinMixDetailsItemVo){
+        if (null==goblinMixDetailsItemVo) return getNew();
+        this.count = goblinMixDetailsItemVo.getCount();
+        this.position = goblinMixDetailsItemVo.getPosition();
+        this.priceV = goblinMixDetailsItemVo.getPriceV();
+        this.price = goblinMixDetailsItemVo.getPrice();
+        this.productId = goblinMixDetailsItemVo.getProductId();
+        this.skuId = goblinMixDetailsItemVo.getSkuId();
+        this.skuName = goblinMixDetailsItemVo.getSkuName();
+        this.skuPic = goblinMixDetailsItemVo.getSkuPic();
+        this.skuPrice = goblinMixDetailsItemVo.getSkuPrice();
+        this.spuId = goblinMixDetailsItemVo.getSpuId();
+        this.spuName = goblinMixDetailsItemVo.getSpuName();
+        return this;
+    }
+
+
+
+}

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

+package com.liquidnet.service.goblin.dto.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author TT
+ */
+
+@ApiModel(value = "NoticeGoblinMixDetailsVo", description = "票务")
+@Data
+public class NoticeGoblinMixDetailsVo implements Serializable, Cloneable {
+    @ApiModelProperty(value = "活动id")
+    private String mixId;
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+    @ApiModelProperty(value = "活动名称")
+    private String name;
+    @ApiModelProperty(value = "开始时间")
+    private String timeStart;
+    @ApiModelProperty(value = "结束时间")
+    private String timeEnd;
+    @ApiModelProperty(value = "展示位置[1-商城|2-数字藏品]")
+    private Integer showPosition;
+    @ApiModelProperty(value = "组合名称")
+    private String sellName;
+    @ApiModelProperty(value = "封面图片地址")
+    private String coverPic;
+    @ApiModelProperty(value = "展示文件类型[1-图片|2-视频]")
+    private Integer watchType;
+    @ApiModelProperty(value = "销售价格")
+    private BigDecimal sellPrice;
+    @ApiModelProperty(value = "原价")
+    private BigDecimal price;
+    @ApiModelProperty(value = "配置详情")
+    private List<NoticeGoblinMixDetailsItemVo> item;
+
+    private static final NoticeGoblinMixDetailsVo obj = new NoticeGoblinMixDetailsVo();
+
+    public static NoticeGoblinMixDetailsVo getNew() {
+        try {
+            return (NoticeGoblinMixDetailsVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new NoticeGoblinMixDetailsVo();
+        }
+    }
+
+    public NoticeGoblinMixDetailsVo copy(GoblinMixDetailsVo goblinMixDetailsVo) {
+        if (null == goblinMixDetailsVo) return getNew();
+        this.coverPic = goblinMixDetailsVo.getCoverPic();
+        this.item = goblinMixDetailsVo.getItem().stream().map(goblinMixDetailsItemVo -> {
+            return NoticeGoblinMixDetailsItemVo.getNew().copy(goblinMixDetailsItemVo);
+        }).collect(Collectors.toList());
+        this.price = goblinMixDetailsVo.getPrice();
+        this.mixId = goblinMixDetailsVo.getMixId();
+        this.timeEnd = goblinMixDetailsVo.getTimeEnd();
+        this.name = goblinMixDetailsVo.getName();
+        this.sellName = goblinMixDetailsVo.getSellName();
+        this.sellPrice = goblinMixDetailsVo.getSellPrice();
+        this.showPosition = goblinMixDetailsVo.getShowPosition();
+        this.timeStart = goblinMixDetailsVo.getTimeStart();
+        this.userId = goblinMixDetailsVo.getUserId();
+        this.watchType = goblinMixDetailsVo.getWatchType();
+        return this;
+    }
+
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/NoticeKylinPerformanceVo.java

+package com.liquidnet.service.kylin.dto.vo.returns;
+
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author TT
+ */
+
+@ApiModel(value = "NoticeKylinPerformanceVo", description = "票务")
+@Data
+public class NoticeKylinPerformanceVo  implements Serializable, Cloneable {
+    private Integer mid;
+    @ApiModelProperty(value = "主键")
+    private String performancesId;
+    @ApiModelProperty(value = "演出名称")
+    private String title;
+    @ApiModelProperty(value = "演出图片")
+    private String imgPoster;
+    @ApiModelProperty(value = "演出开始时间")
+    private String timeStart;
+    @ApiModelProperty(value = "演出结束时间")
+    private String timeEnd;
+    @ApiModelProperty(value = "停售时间")
+    private String stopSellTime;
+    @ApiModelProperty(value = "价格")
+    private String price;
+    @ApiModelProperty(value = "开售时间")
+    private String sellTime;
+    @ApiModelProperty(value = "城市id")
+    private Integer cityId;
+    @ApiModelProperty(value = "城市名称")
+    private String cityName;
+    @ApiModelProperty(value = "场地id")
+    private String fieldId;
+    @ApiModelProperty(value = "场地名称")
+    private String fieldName;
+    @ApiModelProperty(value = "搭售id")
+    private String projectId;
+    @ApiModelProperty(value = "巡演id")
+    private String roadShowId;
+
+    private static final NoticeKylinPerformanceVo obj = new NoticeKylinPerformanceVo();
+
+    public static NoticeKylinPerformanceVo getNew() {
+        try {
+            return (NoticeKylinPerformanceVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new NoticeKylinPerformanceVo();
+        }
+    }
+
+    public NoticeKylinPerformanceVo copy(KylinPerformanceVo kylinPerformanceVo){
+        if (null == kylinPerformanceVo) return getNew();
+        this.mid = kylinPerformanceVo.getMid();
+        this.cityId = kylinPerformanceVo.getCityId();
+        this.cityName = kylinPerformanceVo.getCityName();
+        this.performancesId = kylinPerformanceVo.getPerformancesId();
+        this.fieldId = kylinPerformanceVo.getFieldId();
+        this.fieldName = kylinPerformanceVo.getFieldName();
+        this.imgPoster = kylinPerformanceVo.getImgPoster();
+        this.price = kylinPerformanceVo.getPrice();
+        this.projectId = kylinPerformanceVo.getProjectId();
+        this.roadShowId = kylinPerformanceVo.getRoadShowId();
+        this.sellTime = kylinPerformanceVo.getSellTime();
+        this.stopSellTime = kylinPerformanceVo.getStopSellTime();
+        this.timeEnd = kylinPerformanceVo.getTimeEnd();
+        this.timeStart = kylinPerformanceVo.getTimeStart();
+        this.title = kylinPerformanceVo.getTitle();
+        return this;
+    }
+}

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

@@ -8,6 +8,8 @@ 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;
@@ -153,10 +155,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> toDaysNftList = (List<GoblinGoodsSkuInfoVo>) performancesListNotice.get("toDaysNftList");
         List<GoblinGoodsSkuInfoVo> threeNftList = (List<GoblinGoodsSkuInfoVo>) performancesListNotice.get("threeNftList");
         List<GoblinGoodsSkuInfoVo> toDayCombinationList = (List<GoblinGoodsSkuInfoVo>) performancesListNotice.get("toDayCombinationList");
-        List<GoblinGoodsSkuInfoVo> threeDayCombinationList = (List<GoblinGoodsSkuInfoVo>) performancesListNotice.get("threeDayCombinationList");
+        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");
 
         toDayList = checkAppStatus(toDayList);
         threeDaysList = checkAppStatus(threeDaysList);

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

@@ -5,9 +5,7 @@ import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.goblin.constant.GoblinRedisConst;
 import com.liquidnet.service.goblin.dto.manage.vo.GoblinGoodsAnticipateValueVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinMixDetailsItemVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinMixDetailsVo;
+import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dto.vo.KylinApiCameraDevicesVo;
@@ -21,6 +19,7 @@ import com.liquidnet.service.kylin.dto.vo.mongo.*;
 import com.liquidnet.service.kylin.dto.vo.partner.KylinTicketExpressModuleVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
+import com.liquidnet.service.kylin.dto.vo.returns.NoticeKylinPerformanceVo;
 import com.liquidnet.service.kylin.entity.KylinOrderCoupons;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -372,31 +371,57 @@ public class DataUtils {
 
             // 固定条件
             List<KylinPerformanceVo> toDayList = getKylinPerformanceVos(toDayIds);
+            /*List<NoticeKylinPerformanceVo> toDayVoList = toDayList.stream().map(kylinPerformanceVo -> {
+                return NoticeKylinPerformanceVo.getNew().copy(kylinPerformanceVo);
+            }).collect(Collectors.toList());*/
 
             // 固定条件
             List<KylinPerformanceVo> threeDaysList = getKylinPerformanceVos(threeDayIds);
+            /*List<NoticeKylinPerformanceVo> threeDayVoList = threeDaysList.stream().map(kylinPerformanceVo -> {
+                return NoticeKylinPerformanceVo.getNew().copy(kylinPerformanceVo);
+            }).collect(Collectors.toList());*/
 
             //数字藏品
             //当天
             List<GoblinGoodsSkuInfoVo> toDaysNftList = getGoblinGoodsSkuInfoVos(toDayNftIds);
+            List<NoticeGoblinGoodsSkuInfoVo> toDayNftVoList = toDaysNftList.stream().map(goblinGoodsSkuInfoVo -> {
+                return NoticeGoblinGoodsSkuInfoVo.getNew().copy(goblinGoodsSkuInfoVo);
+            }).collect(Collectors.toList());
+
 
             //三天的
             List<GoblinGoodsSkuInfoVo> threeNftList = getGoblinGoodsSkuInfoVos(threeNftIds);
+            List<NoticeGoblinGoodsSkuInfoVo> threeNftVoList = threeNftList.stream().map(goblinGoodsSkuInfoVo -> {
+                return NoticeGoblinGoodsSkuInfoVo.getNew().copy(goblinGoodsSkuInfoVo);
+            }).collect(Collectors.toList());
 
             //组合购
             //当天
             List<GoblinMixDetailsVo> toDayCombinationList = getGoblinMixDetailsVos(toDayCombinationIds);
+            List<NoticeGoblinMixDetailsVo> toDayCombinationVoList = toDayCombinationList.stream().map(goblinMixDetailsVo -> {
+                return NoticeGoblinMixDetailsVo.getNew().copy(goblinMixDetailsVo);
+            }).collect(Collectors.toList());
 
             //三天
             List<GoblinMixDetailsVo> threeDayCombinationList = getGoblinMixDetailsVos(threeDayCombinationIds);
+            List<NoticeGoblinMixDetailsVo> threeDayCombinationVoList = threeDayCombinationList.stream().map(goblinMixDetailsVo -> {
+                return NoticeGoblinMixDetailsVo.getNew().copy(goblinMixDetailsVo);
+            }).collect(Collectors.toList());
 
             HashMap<String, Object> info = CollectionUtil.mapStringObject();
             info.put("toDayList", toDayList);
             info.put("threeDaysList", threeDaysList);
-            info.put("toDaysNftList", toDaysNftList);
-            info.put("threeNftList", threeNftList);
-            info.put("toDayCombinationList", toDayCombinationList);
-            info.put("threeDayCombinationList", threeDayCombinationList);
+            //过滤数据
+            info.put("toDaysNftList", toDayNftVoList);
+            info.put("threeNftList", threeNftVoList);
+            info.put("toDayCombinationList", toDayCombinationVoList);
+            info.put("threeDayCombinationList", threeDayCombinationVoList);
+
+            //原始数据
+//            info.put("toDaysNftList", toDaysNftList);
+//            info.put("threeNftList", threeNftList);
+//            info.put("toDayCombinationList", toDayCombinationList);
+//            info.put("threeDayCombinationList", threeDayCombinationList);
             return info;
         }
         return (HashMap<String, Object>) obj;
@@ -404,17 +429,19 @@ public class DataUtils {
 
     private List<GoblinMixDetailsVo> getGoblinMixDetailsVos(List<String> toDayCombinationIds) {
         List<GoblinMixDetailsVo> toDayCombinationList = new ArrayList<>();
+        //redis key
         String rdk = GoblinRedisConst.GOBLIN_MIX_DETAILS;
         String rk = GoblinRedisConst.BASIC_GOODS_SKU;
         if (toDayCombinationIds != null && toDayCombinationIds.size() > 0) {
-            toDayCombinationIds.forEach(id->{
+            //查询redis
+            toDayCombinationIds.forEach(id -> {
                 Object obj = redisUtil.get(rdk.concat(id));
-                if (obj!=null){
+                if (obj != null) {
                     GoblinMixDetailsVo goblinMixDetailsVo = (GoblinMixDetailsVo) obj;
-                    goblinMixDetailsVo.getItem().forEach(goblinMixDetailsItemVo->{
+                    goblinMixDetailsVo.getItem().forEach(goblinMixDetailsItemVo -> {
                         Object objRk = redisUtil.get(rk.concat(goblinMixDetailsItemVo.getSkuId()));
-                        if (objRk!=null){
-                            goblinMixDetailsItemVo.setSkuName(((GoblinGoodsSkuInfoVo)objRk).getName());
+                        if (objRk != null) {
+                            goblinMixDetailsItemVo.setSkuName(((GoblinGoodsSkuInfoVo) objRk).getName());
                         }
                     });
                     toDayCombinationList.add(goblinMixDetailsVo);
@@ -432,10 +459,17 @@ public class DataUtils {
                 item.forEach(goblinMixDetailsItemVo -> {
                     Query query = new Query();
                     query.addCriteria(Criteria.where("skuId").is(goblinMixDetailsItemVo.getSkuId()));
-                    GoblinGoodsSkuInfoVo one = mongoTemplate.findOne(query, GoblinGoodsSkuInfoVo.class, GoblinGoodsSkuInfoVo.class.getSimpleName());
+                    //skuName查询redis
+                    Object objRk = redisUtil.get(rk.concat(goblinMixDetailsItemVo.getSkuId()));
+                    if (objRk != null) {
+                        goblinMixDetailsItemVo.setSkuName(((GoblinGoodsSkuInfoVo) objRk).getName());
+                    }
+
+                    //skuName查询mongodb
+                    *//*GoblinGoodsSkuInfoVo one = mongoTemplate.findOne(query, GoblinGoodsSkuInfoVo.class, GoblinGoodsSkuInfoVo.class.getSimpleName());
                     if (one != null) {
                         goblinMixDetailsItemVo.setSkuName(one.getName());
-                    }
+                    }*//*
                 });
             });*/
         }
@@ -444,14 +478,17 @@ public class DataUtils {
 
     private List<GoblinGoodsSkuInfoVo> getGoblinGoodsSkuInfoVos(List<String> toDayNftIds) {
         List<GoblinGoodsSkuInfoVo> toDaysNftList = new ArrayList<>();
+        //redis key
         String rk = GoblinRedisConst.BASIC_GOODS_SKU;
         if (toDayNftIds != null && toDayNftIds.size() > 0) {
+            //查询redis
             toDayNftIds.forEach(id -> {
                 Object obj = redisUtil.get(rk.concat(id));
-                if (obj!=null){
-                    toDaysNftList.add((GoblinGoodsSkuInfoVo)obj);
+                if (obj != null) {
+                    toDaysNftList.add((GoblinGoodsSkuInfoVo) obj);
                 }
             });
+            //查询mongodb
             /*Query queryToDayNft = new Query();
             queryToDayNft.fields().exclude("extagVoList");
             queryToDayNft.addCriteria(Criteria.where("skuId").in(toDayNftIds));
@@ -462,14 +499,17 @@ public class DataUtils {
 
     private List<KylinPerformanceVo> getKylinPerformanceVos(List<Integer> toDayIds) {
         List<KylinPerformanceVo> toDayList = new ArrayList<>();
+        //redis key
         String key = KylinRedisConst.PERFORMANCES;
         if (toDayIds != null && toDayIds.size() > 0) {
+            //查询redis
             toDayIds.forEach(id -> {
                 Object obj = redisUtil.get(key + id);
                 if (obj != null) {
                     toDayList.add((KylinPerformanceVo) obj);
                 }
             });
+            //查询mongodb
             /*Query query = new Query();
             query.fields().exclude("details");
             query.fields().exclude("noticeImage");