Merge branch 'refs/heads/feature_member_score' into dev

yudao-module-reward/yudao-module-reward-impl/src/main/java/cn/iocoder/yudao/module/reward/controller/admin/reward/RewardController.java

@@ -67,7 +67,6 @@ public class RewardController {
     public CommonResult<RewardBackVO> get(@RequestParam("id") Long id) {
         RewardDO rewardDO = rewardService.get(id);
         RewardBackVO rewardBackVO = RewardConvert.INSTANCE.convert(rewardDO);
-        addPickMethodList(rewardBackVO);
         return success(rewardBackVO);
     }
 
@@ -78,7 +77,6 @@ public class RewardController {
     public CommonResult<List<RewardBackVO>> getList(@RequestParam("ids") Collection<Long> ids) {
         List<RewardDO> list = rewardService.getList(ids);
         List<RewardBackVO> rewardBackVOS = RewardConvert.INSTANCE.convertList(list);
-        rewardBackVOS.forEach(this::addPickMethodList);
         return success(rewardBackVOS);
     }
 
@@ -88,7 +86,6 @@ public class RewardController {
     public CommonResult<PageResult<RewardBackVO>> getPage(@Valid @RequestBody RewardQueryVO query, PageVO page) {
         PageResult<RewardDO> pageResult = rewardService.getPage(query, page);
         PageResult<RewardBackVO> rewardBackVOPageResult = RewardConvert.INSTANCE.convertPage(pageResult);
-        rewardBackVOPageResult.getList().forEach(this::addPickMethodList);
         return success(rewardBackVOPageResult);
     }
 
@@ -124,8 +121,4 @@ public class RewardController {
         List<RewardBackVO> datas = RewardConvert.INSTANCE.convertList(list);
         ExcelUtils.write(response, "礼品.xls", "数据", RewardBackVO.class, datas);
     }
-
-    private void addPickMethodList (RewardBackVO rewardBackVO) {
-        rewardBackVO.setPickMethodList(JSON.parseArray(rewardBackVO.getPickMethod()));
-    }
 }