浏览代码

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

张延森 5 年前
父节点
当前提交
a5e57b0357

+ 6
- 0
src/main/java/com/huiju/estateagents/common/CommConstant.java 查看文件

92
      * 未领取
92
      * 未领取
93
      */
93
      */
94
     public static final Integer STATUS_UNACCALIMED = 0;
94
     public static final Integer STATUS_UNACCALIMED = 0;
95
+    
96
+    /**
97
+     * 成功
98
+     */
99
+    public static final String SUCCESS = "success";
100
+
95
 
101
 
96
 
102
 
97
     /**
103
     /**

+ 5
- 1
src/main/java/com/huiju/estateagents/controller/TaGoodsController.java 查看文件

213
             String openid = JWTUtils.getSubject(request);
213
             String openid = JWTUtils.getSubject(request);
214
             //兑换商品
214
             //兑换商品
215
             String state = iTaGoodsService.exchangeGoods(id,openid);
215
             String state = iTaGoodsService.exchangeGoods(id,openid);
216
-            responseBean.addSuccess(null);
216
+            if (state.equals(CommConstant.SUCCESS)){
217
+                responseBean.addSuccess("兑换成功");
218
+            }else{
219
+                responseBean.addError(state);
220
+            }
217
         }catch (Exception e){
221
         }catch (Exception e){
218
             e.printStackTrace();
222
             e.printStackTrace();
219
             logger.error("taGoodsGet -=- {}",e.toString());
223
             logger.error("taGoodsGet -=- {}",e.toString());

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaPointsRecordsController.java 查看文件

174
             //使用分页插件
174
             //使用分页插件
175
             IPage<TaPointsRecords> pg = new Page<>(pageNum, pageSize);
175
             IPage<TaPointsRecords> pg = new Page<>(pageNum, pageSize);
176
             QueryWrapper<TaPointsRecords> queryWrapper = new QueryWrapper<>();
176
             QueryWrapper<TaPointsRecords> queryWrapper = new QueryWrapper<>();
177
+            queryWrapper.eq("person_id",taPerson.getPersonId());
177
             queryWrapper.orderByDesc("create_date");
178
             queryWrapper.orderByDesc("create_date");
178
-            queryWrapper.like("change_params","%\""+taPerson.getPersonId()+"\"%");
179
             IPage<TaPointsRecords> result = iTaPointsRecordsService.page(pg, queryWrapper);
179
             IPage<TaPointsRecords> result = iTaPointsRecordsService.page(pg, queryWrapper);
180
             responseBean.addSuccess(result);
180
             responseBean.addSuccess(result);
181
         }catch (Exception e){
181
         }catch (Exception e){

+ 1
- 1
src/main/java/com/huiju/estateagents/service/impl/TaGoodsServiceImpl.java 查看文件

74
 		//商品数减少
74
 		//商品数减少
75
 		taGoods.setTotalNum(taGoods.getTotalNum() -1);
75
 		taGoods.setTotalNum(taGoods.getTotalNum() -1);
76
 		taGoodsMapper.updateById(taGoods);
76
 		taGoodsMapper.updateById(taGoods);
77
-		return "success";
77
+		return CommConstant.SUCCESS;
78
 	}
78
 	}
79
 	
79
 	
80
 	/**
80
 	/**