Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -92,6 +92,12 @@ public class CommConstant {
      * 未领取
      */
     public static final Integer STATUS_UNACCALIMED = 0;
+    
+    /**
+     * 成功
+     */
+    public static final String SUCCESS = "success";
+
 
 
     /**

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

@@ -213,7 +213,11 @@ public class TaGoodsController extends BaseController {
             String openid = JWTUtils.getSubject(request);
             //兑换商品
             String state = iTaGoodsService.exchangeGoods(id,openid);
-            responseBean.addSuccess(null);
+            if (state.equals(CommConstant.SUCCESS)){
+                responseBean.addSuccess("兑换成功");
+            }else{
+                responseBean.addError(state);
+            }
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taGoodsGet -=- {}",e.toString());

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

@@ -174,8 +174,8 @@ public class TaPointsRecordsController extends BaseController {
             //使用分页插件
             IPage<TaPointsRecords> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaPointsRecords> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("person_id",taPerson.getPersonId());
             queryWrapper.orderByDesc("create_date");
-            queryWrapper.like("change_params","%\""+taPerson.getPersonId()+"\"%");
             IPage<TaPointsRecords> result = iTaPointsRecordsService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
         }catch (Exception e){

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

@@ -74,7 +74,7 @@ public class TaGoodsServiceImpl extends ServiceImpl<TaGoodsMapper, TaGoods> impl
 		//商品数减少
 		taGoods.setTotalNum(taGoods.getTotalNum() -1);
 		taGoodsMapper.updateById(taGoods);
-		return "success";
+		return CommConstant.SUCCESS;
 	}
 	
 	/**