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

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinFrontSelectGoodsServiceImpl.java

@@ -152,11 +152,16 @@ public class GoblinFrontSelectGoodsServiceImpl extends ServiceImpl<GoblinFrontSe
                goblinFrontSelectGoodsParam.setGoblinGoodsList(goblinGoodsList);
                goodsP.add(goblinFrontSelectGoodsParam);
                return goodsP;
+           }else{
+               GoblinFrontSelectGoodsParam goblinFrontSelectGoodsParam=new GoblinFrontSelectGoodsParam();
+               BeanUtils.copyProperties(a,goblinFrontSelectGoodsParam);
+               goblinFrontSelectGoodsParam.setGoblinGoodsList(goblinGoodsList);
+               goodsP.add(goblinFrontSelectGoodsParam);
+               return goodsP;
            }
        }else{
            return null;
        }
-        return null;
    }
     public boolean online(){
       //查询

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

@@ -763,9 +763,13 @@ public class GoblinFrontServiceImpl implements GoblinFrontService {
             Iterator<GoblinFrontSelectGoods> it = list.iterator();
             while (it.hasNext()) {
                 GoblinFrontSelectGoods goblinFrontSelectGoods= it.next();
-                GoblinGoodsInfoVo goblinGoodsInfoVo=  goblinRedisUtils.getGoodsInfoVo(goblinFrontSelectGoods.getSpuId());
-                if (null==goblinGoodsInfoVo) {
+                if(StringUtils.isBlank(goblinFrontSelectGoods.getSpuId())){
                     it.remove();
+                }else{
+                    GoblinGoodsInfoVo goblinGoodsInfoVo=  goblinRedisUtils.getGoodsInfoVo(goblinFrontSelectGoods.getSpuId());
+                    if (null==goblinGoodsInfoVo) {
+                        it.remove();
+                    }
                 }
             }
         }