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

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

@@ -106,8 +106,9 @@ public class GoblinOrderUtils {
                     }
                     HashMap<String, Object> map = redisUtils.getGoodsSkuInfoVo(LocalDateTime.now(), skuIdItem);
                     GoblinGoodsSkuInfoVo itemVo = (GoblinGoodsSkuInfoVo) map.get("vo");
-                    String listId2 = (String) map.get("listId");
-                    surplusStock += redisUtils.getSkuAllStatusStock(itemVo, listId2);
+//                    String listId2 = (String) map.get("listId");
+//                    surplusStock += redisUtils.getSkuAllStatusStock(itemVo, listId2);
+                    surplusStock += redisUtils.getSkuAllStatusStock(itemVo, listId);
                     totalStock += redisUtils.getSkuTotalStock(itemVo);
                 }
             }

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

@@ -2103,12 +2103,20 @@ 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"))
         ) {// 可以返回库存
-            return getSkuStock(listId, info.getSkuId());
+            // 外面只有盲盒才能请求进来 里面只有不是分批购才判断盲盒里藏品的开售时间
+            if (null == listId) {
+                if (LocalDateTime.now().isAfter(info.getSaleStartTime())) {
+                    return getSkuStock(listId, info.getSkuId());
+                } else {
+                    return 0;
+                }
+            } else {
+                return getSkuStock(listId, info.getSkuId());
+            }
         } else {// 不计入库存
             return 0;
         }