Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5.1

src/main/java/com/huiju/estateagents/controller/TaGoodsController.java

             //兑换商品
             String state = iTaGoodsService.exchangeGoods(id,openid);
             if (state.equals(CommConstant.SUCCESS)){
-                responseBean.addSuccess("兑换成功");
+                TaGoods taGoods = iTaGoodsService.getById(id);
+                responseBean.addSuccess(taGoods);
             }else{
                 responseBean.addError(state);
             }

src/main/java/com/huiju/estateagents/service/impl/TaGoodsServiceImpl.java

 		}
 
 		//判断积分是否足够
-		if (taPerson.getPoints() < taGoods.getPointPrice()){
+		if (null == taPerson.getPoints() || taPerson.getPoints().intValue() < taGoods.getPointPrice()){
 			return "积分不足，请先获取积分";
 		}
 		//判断商品是否够兑换
-		if (taGoods.getInventory() < 1){
+		if (null == taGoods.getInventory()|| taGoods.getInventory().intValue() < 1){
 			return "此商品无库存";
 		}