盲盒计算库存

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

@@ -27,6 +27,8 @@ public class GoblinNftGoodsSkuListVo implements Serializable, Cloneable {
     private String subtitle;
     @ApiModelProperty(position = 15, value = "单品默认图片的URL[256]")
     private String skuPic;
+    @ApiModelProperty(position = 16, value = "是否盲盒[0-否|1-是]")
+    private String unbox;
 
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     @ApiModelProperty(position = 27, value = "开售时间")
@@ -60,6 +62,7 @@ public class GoblinNftGoodsSkuListVo implements Serializable, Cloneable {
         this.setSkuPic(source.getSkuPic());
         this.setSaleStartTime(source.getSaleStartTime());
         this.setSoldoutStatus(source.getSoldoutStatus());
+        this.setUnbox(source.getUnbox());
         return this;
     }
 }

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

@@ -74,7 +74,22 @@ public class GoblinNftGoodsAppServiceImpl implements IGoblinNftGoodsAppService {
             }
         }
         for (GoblinNftGoodsSkuListVo skuInfoVo : skuList) {
-            int stock = goblinRedisUtils.getSkuStock(null, skuInfoVo.getSkuId());
+            int stock = 0;
+            if (skuInfoVo.getUnbox().equals("0")) {
+                stock = goblinRedisUtils.getSkuStock(null, skuInfoVo.getSkuId());
+            } else {
+                String spuId = skuInfoVo.getSpuId();
+                List<String> skuArray = goblinRedisUtils.getGoodsInfoVo(spuId).getSkuIdList();
+                for (String skuIdItem : skuArray) {
+                    GoblinGoodsSkuInfoVo itemVo = goblinRedisUtils.getGoodsSkuInfoVo(skuIdItem);
+                    if (null == itemVo) {
+                        continue;
+                    }
+                    if (LocalDateTime.now().isAfter(itemVo.getSaleStartTime()) && itemVo.getShelvesStatus().equals("3") && itemVo.getSoldoutStatus().equals("0")) {//开卖后在计算库存
+                        stock += goblinRedisUtils.getSkuStock(null, skuIdItem);
+                    }
+                }
+            }
             if (stock <= 0 || (null != skuInfoVo.getSoldoutStatus() && skuInfoVo.getSoldoutStatus().equals("1"))) {
                 skuInfoVo.setIsStock(0);
             } else {
@@ -115,8 +130,11 @@ public class GoblinNftGoodsAppServiceImpl implements IGoblinNftGoodsAppService {
                 String spuId = goodsSkuInfoVo.getSpuId();
                 List<String> skuArray = goblinRedisUtils.getGoodsInfoVo(spuId).getSkuIdList();
                 for (String skuIdItem : skuArray) {
-                    GoblinGoodsSkuInfoVo itemVo = goblinRedisUtils.getGoodsSkuInfoVo(skuId);
-                    if (LocalDateTime.now().isAfter(itemVo.getSaleStartTime()) && itemVo.getShelvesStatus().equals("3")) {//开卖后在计算库存
+                    GoblinGoodsSkuInfoVo itemVo = goblinRedisUtils.getGoodsSkuInfoVo(skuIdItem);
+                    if (null == itemVo) {
+                        continue;
+                    }
+                    if (LocalDateTime.now().isAfter(itemVo.getSaleStartTime()) && itemVo.getShelvesStatus().equals("3") && itemVo.getSoldoutStatus().equals("0")) {//开卖后在计算库存
                         stock += goblinRedisUtils.getSkuStock(null, skuIdItem);
                     }
                 }