Merge remote-tracking branch 'origin/dev_bd_rm_consumer_od' into dev_bd_rm_consumer_od

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 com.liquidnet.service.goblin.dto.manage.vo.GoblinGoodsAnticipateValueVo;
+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;
+
+    @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;
+    @ApiModelProperty(value = "上架处理方式[1-等待手动上架|2-直接上架售卖|3-预约定时上架]")
+    private String shelvesHandle;
+    @ApiModelProperty(value = "预约上架时间[上架处理方式为3-预约定时上架时需要指定]")
+    private String shelvesTime;
+
+    @ApiModelProperty(position = 62, value = "标签[0-提前购买|1-分段购买|2-预约|3-普通数字藏品]")
+    private Integer tagType;
+    @ApiModelProperty(position = 70, value = "分批购活动id")
+    private String listId;
+
+    @ApiModelProperty(position = 12, value = "创作者")
+    private String author;
+    @ApiModelProperty(position = 13, value = "发行方")
+    private String publisher;
+
+
+    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();
+        this.shelvesHandle = goblinGoodsSkuInfoVo.getShelvesHandle();
+        this.shelvesTime = goblinGoodsSkuInfoVo.getShelvesTime();
+        return this;
+    }
+
+
+    public NoticeGoblinGoodsSkuInfoVo valueCopy(GoblinGoodsAnticipateValueVo valueVo) {
+        if (null == valueVo) return getNew();
+        this.aboutStartTime = valueVo.getAboutStartDate();
+        this.aboutStopTime = valueVo.getAboutEndDate();
+        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/constant/KylinRedisConst.java

@@ -7,6 +7,7 @@ public class KylinRedisConst {
     public static final String PERFORMANCES_LIST_CITY = "kylin:performances:city:";
     public static final String PERFORMANCES_LIST_SYSTEM_RECOMMEND = "kylin:performances:systemRecommend";
     public static final String PERFORMANCES_LIST_NOTICE = "kylin:performances:notice";
+    public static final String PERFORMANCES_LIST_NOTICE_IDS = "kylin:performances:notice:ids";
     public static final String PERFORMANCES_LIST_RECOMMEND = "kylin:performances:recommend";
     public static final String PERFORMANCES_LIST_EXCLUSIVE = "kylin:performances:exclusive";
     public static final String PERFORMANCES_ROADLIST = "kylin:performances:roadShowId:";

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-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinPerformancesService.java

@@ -24,4 +24,5 @@ public interface IKylinPerformancesService {
     ResponseDto<String> subscribe(String performancesId, Integer sourceType);
 
     ResponseDto<Integer> isSubscribe(String performancesId);
+
 }

liquidnet-bus-feign/liquidnet-api-feign-kylin/src/main/java/com/liquidnet/service/feign/kylin/api/FeignKylinForChimeClient.java

@@ -52,4 +52,8 @@ public interface FeignKylinForChimeClient {
     ResponseDto<KylinPerformanceVo> getDetail(
             @RequestParam("performancesId") String performancesId
     );
+
+
+    @GetMapping("inner/setNoticeIds")
+    ResponseDto<HashMap<String,Object>> setNoticeIds();
 }

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/KylinTaskHandler.java

 package com.liquidnet.service.executor.main.handler;
 
+import com.liquidnet.service.feign.kylin.api.FeignKylinForChimeClient;
 import com.liquidnet.service.feign.kylin.task.FeignPlatformTaskClient;
 import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.annotation.XxlJob;
@@ -19,6 +20,9 @@ public class KylinTaskHandler {
     @Autowired
     private FeignPlatformTaskClient feignPlatformTaskClient;
 
+    @Autowired
+    private FeignKylinForChimeClient feignKylinForChimeClient;
+
     @XxlJob(value = "sev-platform:checkOrderTimeHandler")
     public void checkOrderTimeHandler() {
         try {
@@ -68,4 +72,14 @@ public class KylinTaskHandler {
             XxlJobHelper.handleFail();
         }
     }
+
+    @XxlJob(value = "sev-platform:setNoticeIds")
+    public void setNoticeIds() {
+        try {
+            XxlJobHelper.handleSuccess("结果：" + feignKylinForChimeClient.setNoticeIds().getData());
+        } catch (Exception e) {
+            XxlJobHelper.log(e);
+            XxlJobHelper.handleFail();
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/bootstrap-service-goblin.yml

@@ -9,7 +9,7 @@ eureka:
 spring:
   cloud:
     config:
-#      uri: http://182.92.70.253:7002/support-config
+#      uri: http://127.0.0.1:7002/support-config
 #      uri: http://39.107.71.112:7002/support-config
       profile: ${liquidnet.cloudConfig.profile}
       name: ${spring.application.name} #默认为spring.application.name

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/controller/InnerController.java

@@ -7,6 +7,8 @@ import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.service.IKylinConsmerService;
+import com.liquidnet.service.kylin.service.IKylinPerformancesService;
+import com.liquidnet.service.kylin.service.impl.KylinPerformancesServiceImpl;
 import com.liquidnet.service.kylin.utils.DataUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.constraints.NotBlank;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
+import java.util.HashMap;
 
 @Api(tags = "内部接口")
 @RestController
@@ -33,6 +36,9 @@ public class InnerController {
     @Autowired
     IKylinConsmerService kylinConsmerService;
 
+    @Autowired
+    private KylinPerformancesServiceImpl kylinPerformancesService;
+
     @GetMapping("cache/member/{uid}")
     @ApiOperation("获取会员相关数据")
     public void cacheMember(@NotBlank @PathVariable(value = "uid") String uid) {
@@ -68,4 +74,11 @@ public class InnerController {
     public ResponseDto<Boolean> orderTransferOverTime(String orderId) {
         return kylinConsmerService.orderTransferOverTime(orderId);
     }
+    @GetMapping("/setNoticeIds")
+    @ApiOperation("演出预告列表定时任务")
+    public ResponseDto<HashMap<String,Object>> setNoticeIds(){
+        HashMap<String, Object> map = kylinPerformancesService.setNoticeIds();
+        return ResponseDto.success(map);
+    }
+
 }

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

@@ -9,6 +9,7 @@ import com.liquidnet.service.kylin.dto.vo.returns.PayDetailVo;
 import com.liquidnet.service.kylin.service.IKylinLackRegistersService;
 import com.liquidnet.service.kylin.service.IKylinPerformancesService;
 import com.liquidnet.service.kylin.service.impl.KylinPerformancesServiceImpl;
+import com.liquidnet.service.kylin.utils.DataUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

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,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> 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<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);
@@ -163,9 +172,17 @@ 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("threeDayNftList",threeDayNftList);
+        newList.put("toDayCombinationList",toDayCombinationList);
+        newList.put("threeDayCombinationList",threeDayCombinationList);
         return newList;
     }
 
+    public HashMap<String,Object> setNoticeIds() {
+        return dataUtils.setNoticeIds();
+    }
+
     private List<KylinPerformanceVo> mergeRoadList(List<KylinPerformanceVo> performanceList) {
         List<String> roadIdList = new ArrayList<>();
         List<KylinPerformanceVo> newList = ObjectUtil.getKylinPerformanceVoArrayList();

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

+package com.liquidnet.service.kylin.utils;
+
+import com.liquidnet.service.goblin.dto.vo.GoblinGoodsInfoVo;
+import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.stereotype.Component;
+
+@Component
+public class GoblinMongodbUtils {
+
+    @Autowired
+    MongoTemplate mongoTemplate;
+
+    // SKU信息
+    public GoblinGoodsSkuInfoVo getGoodsSkuInfoVo(String skuId) {
+//        return mongoTemplate.findOne(Query.query(Criteria.where("skuId").is(skuId).and("delFlg").is("0").and("shelvesStatus").is("3")),
+//        return mongoTemplate.findOne(Query.query(Criteria.where("skuId").is(skuId).and("delFlg").is("0")),
+        return mongoTemplate.findOne(Query.query(Criteria.where("skuId").is(skuId)),
+                GoblinGoodsSkuInfoVo.class, GoblinGoodsSkuInfoVo.class.getSimpleName());
+    }
+
+    // SPU信息
+    public GoblinGoodsInfoVo getGoodsInfoVo(String spuId) {
+//        return mongoTemplate.findOne(Query.query(Criteria.where("spuId").is(spuId).and("delFlg").is("0").and("shelvesStatus").is("3")),
+//        return mongoTemplate.findOne(Query.query(Criteria.where("spuId").is(spuId).and("delFlg").is("0")),
+        return mongoTemplate.findOne(Query.query(Criteria.where("spuId").is(spuId)),
+                GoblinGoodsInfoVo.class, GoblinGoodsInfoVo.class.getSimpleName());
+    }
+}

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

@@ -2,6 +2,7 @@ package com.liquidnet.service.kylin.utils;
 
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 import com.liquidnet.service.base.PagedResult;
+import com.liquidnet.service.goblin.dto.vo.GoblinListCollectVo;
 import com.liquidnet.service.kylin.dto.vo.KylinApiCameraDevicesVo;
 import com.liquidnet.service.kylin.dto.vo.admin.OrderRefundPoundage;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
@@ -33,6 +34,9 @@ public class ObjectUtil {
     private static final ArrayList<KylinOrderCoupons> kylinOrderCouponsArrayList = new ArrayList<>();
     private static final ArrayList<KylinApiCameraDevicesVo> kylinApiCameraDevicesVoArrayList = new ArrayList<>();
 
+    /*正在热卖*/
+    private static final ArrayList<GoblinListCollectVo> goblinListCollectVo = new ArrayList<>();
+
 
     public static ArrayList<KylinStationPerformanceVo> getKylinStationPerformanceVoArrayList() {
         return (ArrayList<KylinStationPerformanceVo>) kylinStationPerformanceVoArrayList.clone();
@@ -97,4 +101,10 @@ public class ObjectUtil {
     public static ArrayList<KylinApiCameraDevicesVo> getKylinApiCameraDevicesVoArrayList() {
         return (ArrayList<KylinApiCameraDevicesVo>) kylinApiCameraDevicesVoArrayList.clone();
     }
+
+
+    /*正在热卖*/
+    public static ArrayList<GoblinListCollectVo> getGoblinListCollectVo() {
+        return (ArrayList<GoblinListCollectVo>) goblinListCollectVo.clone();
+    }
 }