下单：判断是否有库存时候如果是分批购的盲盒不判断盲盒内藏品的开售时间

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

@@ -2103,6 +2103,7 @@ public class GoblinRedisUtils {
     public int getSkuAllStatusStock(GoblinGoodsSkuInfoVo info, String listId) {
         if (
                 info != null
+//                        && LocalDateTime.now().isAfter(info.getSaleStartTime())
                         && (null == info.getSoldoutStatus() || info.getSoldoutStatus().equals("0"))
                         && (null == info.getHitRatio() || info.getHitRatio().compareTo(BigDecimal.ZERO) > 0)
                         && (null == info.getSkuCanbuy() || info.getSkuCanbuy().equals("1"))

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/GoblinNftOrderUtils.java

@@ -422,12 +422,21 @@ public class GoblinNftOrderUtils {
     public int getSkuAllStatusStock(String listId, GoblinGoodsSkuInfoVo info) {
         if (
             info != null
-            && LocalDateTime.now().isAfter(info.getSaleStartTime())
+//            && LocalDateTime.now().isAfter(info.getSaleStartTime())
             && (null == info.getSoldoutStatus() || info.getSoldoutStatus().equals("0"))
             && (null == info.getSkuCanbuy() || info.getSkuCanbuy().equals("1"))
             && (null == info.getHitRatio() || info.getHitRatio().compareTo(BigDecimal.ZERO) > 0)
         ) {// 可以返回库存
-            return goblinRedisUtils.getSkuStock(listId, info.getSkuId());
+            // 外面只有盲盒才能请求进来 里面只有不是分批购才判断盲盒里藏品的开售时间
+            if (null == listId) {
+                if (LocalDateTime.now().isAfter(info.getSaleStartTime())) {
+                    return goblinRedisUtils.getSkuStock(listId, info.getSkuId());
+                } else {
+                    return 0;
+                }
+            } else {
+                return goblinRedisUtils.getSkuStock(listId, info.getSkuId());
+            }
         } else {// 不计入库存
             return 0;
         }