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

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

@@ -1154,7 +1154,8 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         if(null!=goblinGoodsSkuInfoVo){
             BeanUtils.copyProperties(goblinGoodsSkuInfoVo,goblinGoodsSkuShopCartInfoVo);
             //查看是否有库存
-            int stock=goblinRedisUtils.getSkuStock(null,goblinGoodsSkuInfoVo.getSkuId());
+            String pre = GoblinStatusConst.MarketPreStatus.getPre(goblinGoodsSkuInfoVo.getSpuId());
+            int stock=goblinRedisUtils.getSkuStock(pre,goblinGoodsSkuInfoVo.getSkuId());
             if(stock<=0){
                 goblinGoodsSkuShopCartInfoVo.setStockLess(true);
             }else {goblinGoodsSkuShopCartInfoVo.setStockLess(false);}