增加 字段 增加正常商品的开售时间

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

@@ -102,6 +102,9 @@ public class GoblinNftGoodsSkuInfoVo implements Serializable, Cloneable {
     private Integer tagType;
     @ApiModelProperty(position = 68, value = "分批购活动id")
     private String listId;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @ApiModelProperty(position = 69, value = "sku正常开售时间")
+    private LocalDateTime baseSaleStartTime;
 
     private static final GoblinNftGoodsSkuInfoVo obj = new GoblinNftGoodsSkuInfoVo();
 

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinNftGoodsAppServiceImpl.java

@@ -147,6 +147,7 @@ public class GoblinNftGoodsAppServiceImpl implements IGoblinNftGoodsAppService {
         GoblinGoodsSkuInfoVo skuInfoVo = (GoblinGoodsSkuInfoVo) map.get("vo");
         Integer tagType = (Integer) map.get("tagType");
         String listId = (String) map.get("listId");
+        LocalDateTime baseSaleStartTime  = (LocalDateTime) map.get("baseSaleStartTime");
         if (goblinRedisUtils.getSkuAllStatusShow(skuInfoVo)) {
             //获取预约相关
             AnticipateValueVo anticipateValueVo = goblinGoodsAnticipateMgService.getAnticipateValueBySkuId(skuId, 1);
@@ -176,6 +177,7 @@ public class GoblinNftGoodsAppServiceImpl implements IGoblinNftGoodsAppService {
             nftGoodsSkuInfoVo.setSystime(LocalDateTime.now());
             nftGoodsSkuInfoVo.setTagType(tagType);
             nftGoodsSkuInfoVo.setListId(listId);
+            nftGoodsSkuInfoVo.setBaseSaleStartTime(baseSaleStartTime);
             // 是否开启兑换
             nftGoodsSkuInfoVo.setIsExchange(goblinRedisUtils.getIsExchange(skuId));
             return nftGoodsSkuInfoVo;

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinRedisUtils.java

@@ -815,11 +815,13 @@ public class GoblinRedisUtils {
             map.put("tagType", null);
             map.put("listId", null);
             map.put("whiteType", null);
+            map.put("baseSaleStartTime", vo.getSaleStartTime());
         } else {//未开售
             GoblinListCollectVo collectVo = getCollectByNow(now, skuId);
             Integer tagType = null;
             Integer whiteType = null;
             String listId = null;
+            LocalDateTime baseSaleStartTime = vo.getSaleStartTime();
             if (collectVo != null) {
                 vo.setPrice(collectVo.getPrice());
                 vo.setPriceV(collectVo.getPriceV());
@@ -840,6 +842,7 @@ public class GoblinRedisUtils {
             map.put("tagType", tagType);
             map.put("listId", listId);
             map.put("whiteType", whiteType);
+            map.put("baseSaleStartTime", baseSaleStartTime);
         }
         return map;
     }