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

@@ -291,10 +291,10 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
         GoblinFrontGoodDetailVo goblinFrontGoodDetailVo=GoblinFrontGoodDetailVo.getNew();
         GoblinGoodsInfoVo goblinGoodsInfoVo=goblinRedisUtils.getGoodsInfoVo(spuId);
         GoblinGoodsInfoDetailVo goblinGoodsInfoDetailVo=GoblinGoodsInfoDetailVo.getNew();
-        BeanUtils.copyProperties(goblinGoodsInfoVo,goblinGoodsInfoDetailVo);
-        goblinFrontGoodDetailVo.setGoblinGoodsInfoVo(goblinGoodsInfoDetailVo);
         //skuIdList
         if(null!=goblinGoodsInfoVo){
+            BeanUtils.copyProperties(goblinGoodsInfoVo,goblinGoodsInfoDetailVo);
+            goblinFrontGoodDetailVo.setGoblinGoodsInfoVo(goblinGoodsInfoDetailVo);
           // int limit= getStockCount(goblinGoodsInfoVo.getStoreId());
             List<String> skuIdList=goblinGoodsInfoVo.getSkuIdList();
             ArrayList<GoblinGoodsSkuInfoDetailVo> list=ObjectUtil.goblinGoodsSkuInfoDetailVos();