Commit d196d57c authored by zhangfeng's avatar zhangfeng

feature-reward:修改

parent 1958735a
...@@ -67,7 +67,6 @@ public class RewardController { ...@@ -67,7 +67,6 @@ public class RewardController {
public CommonResult<RewardBackVO> get(@RequestParam("id") Long id) { public CommonResult<RewardBackVO> get(@RequestParam("id") Long id) {
RewardDO rewardDO = rewardService.get(id); RewardDO rewardDO = rewardService.get(id);
RewardBackVO rewardBackVO = RewardConvert.INSTANCE.convert(rewardDO); RewardBackVO rewardBackVO = RewardConvert.INSTANCE.convert(rewardDO);
addPickMethodList(rewardBackVO);
return success(rewardBackVO); return success(rewardBackVO);
} }
...@@ -78,7 +77,6 @@ public class RewardController { ...@@ -78,7 +77,6 @@ public class RewardController {
public CommonResult<List<RewardBackVO>> getList(@RequestParam("ids") Collection<Long> ids) { public CommonResult<List<RewardBackVO>> getList(@RequestParam("ids") Collection<Long> ids) {
List<RewardDO> list = rewardService.getList(ids); List<RewardDO> list = rewardService.getList(ids);
List<RewardBackVO> rewardBackVOS = RewardConvert.INSTANCE.convertList(list); List<RewardBackVO> rewardBackVOS = RewardConvert.INSTANCE.convertList(list);
rewardBackVOS.forEach(this::addPickMethodList);
return success(rewardBackVOS); return success(rewardBackVOS);
} }
...@@ -88,7 +86,6 @@ public class RewardController { ...@@ -88,7 +86,6 @@ public class RewardController {
public CommonResult<PageResult<RewardBackVO>> getPage(@Valid @RequestBody RewardQueryVO query, PageVO page) { public CommonResult<PageResult<RewardBackVO>> getPage(@Valid @RequestBody RewardQueryVO query, PageVO page) {
PageResult<RewardDO> pageResult = rewardService.getPage(query, page); PageResult<RewardDO> pageResult = rewardService.getPage(query, page);
PageResult<RewardBackVO> rewardBackVOPageResult = RewardConvert.INSTANCE.convertPage(pageResult); PageResult<RewardBackVO> rewardBackVOPageResult = RewardConvert.INSTANCE.convertPage(pageResult);
rewardBackVOPageResult.getList().forEach(this::addPickMethodList);
return success(rewardBackVOPageResult); return success(rewardBackVOPageResult);
} }
...@@ -124,8 +121,4 @@ public class RewardController { ...@@ -124,8 +121,4 @@ public class RewardController {
List<RewardBackVO> datas = RewardConvert.INSTANCE.convertList(list); List<RewardBackVO> datas = RewardConvert.INSTANCE.convertList(list);
ExcelUtils.write(response, "礼品.xls", "数据", RewardBackVO.class, datas); ExcelUtils.write(response, "礼品.xls", "数据", RewardBackVO.class, datas);
} }
private void addPickMethodList (RewardBackVO rewardBackVO) {
rewardBackVO.setPickMethodList(JSON.parseArray(rewardBackVO.getPickMethod()));
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment