Commit efd0a86007c3b71113383268a2aa386ace5cdb85
1 parent
c935312b
代码优化
Showing
2 changed files
with
8 additions
and
8 deletions
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/combination/CombinationActivityController.java
| @@ -89,13 +89,13 @@ public class CombinationActivityController { | @@ -89,13 +89,13 @@ public class CombinationActivityController { | ||
| 89 | return success(CombinationActivityConvert.INSTANCE.convert(activity, products)); | 89 | return success(CombinationActivityConvert.INSTANCE.convert(activity, products)); |
| 90 | } | 90 | } |
| 91 | 91 | ||
| 92 | - @GetMapping("/list") | 92 | + @GetMapping("/detail-list") |
| 93 | @Operation(summary = "获得拼团活动详情列表") | 93 | @Operation(summary = "获得拼团活动详情列表") |
| 94 | - @Parameter(name = "combinationActivityIds", description = "拼团活动编号列表", required = true, example = "[1,2,3]") | 94 | + @Parameter(name = "ids", description = "拼团活动编号列表", required = true, example = "[1,2,3]") |
| 95 | @PreAuthorize("@ss.hasPermission('product:spu:query')") | 95 | @PreAuthorize("@ss.hasPermission('product:spu:query')") |
| 96 | - public CommonResult<List<CombinationActivityRespVO>> getCombinationActivityDetailList(@RequestParam("combinationActivityIds") Collection<Long> combinationActivityIds) { | 96 | + public CommonResult<List<CombinationActivityRespVO>> getCombinationActivityDetailList(@RequestParam("ids") Collection<Long> ids) { |
| 97 | // 查询拼团活动列表 | 97 | // 查询拼团活动列表 |
| 98 | - List<CombinationActivityDO> activities = combinationActivityService.getCombinationActivityListByIds(combinationActivityIds); | 98 | + List<CombinationActivityDO> activities = combinationActivityService.getCombinationActivityListByIds(ids); |
| 99 | 99 | ||
| 100 | // 转换活动列表 | 100 | // 转换活动列表 |
| 101 | List<CombinationActivityRespVO> activityVOs = CombinationActivityConvert.INSTANCE.convertList(activities); | 101 | List<CombinationActivityRespVO> activityVOs = CombinationActivityConvert.INSTANCE.convertList(activities); |
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/combination/AppCombinationActivityController.java
| @@ -113,12 +113,12 @@ public class AppCombinationActivityController { | @@ -113,12 +113,12 @@ public class AppCombinationActivityController { | ||
| 113 | return success(CombinationActivityConvert.INSTANCE.convert3(activity, products)); | 113 | return success(CombinationActivityConvert.INSTANCE.convert3(activity, products)); |
| 114 | } | 114 | } |
| 115 | 115 | ||
| 116 | - @GetMapping("/get-detail-list") | 116 | + @GetMapping("/detail-list") |
| 117 | @Operation(summary = "获得拼团活动明细") | 117 | @Operation(summary = "获得拼团活动明细") |
| 118 | - @Parameter(name = "combinationActivityIds", description = "活动编号列表", required = true, example = "[1024, 1025]") | ||
| 119 | - public CommonResult<List<AppCombinationActivityDetailRespVO>> getCombinationActivityDetailList(@RequestParam("combinationActivityIds") Collection<Long> combinationActivityIds) { | 118 | + @Parameter(name = "ids", description = "活动编号列表", required = true, example = "[1024, 1025]") |
| 119 | + public CommonResult<List<AppCombinationActivityDetailRespVO>> getCombinationActivityDetailList(@RequestParam("ids") Collection<Long> ids) { | ||
| 120 | // 1. 获取活动 | 120 | // 1. 获取活动 |
| 121 | - List<CombinationActivityDO> combinationActivityDOList = activityService.getCombinationActivityListByIds(combinationActivityIds); | 121 | + List<CombinationActivityDO> combinationActivityDOList = activityService.getCombinationActivityListByIds(ids); |
| 122 | 122 | ||
| 123 | // 过滤掉无效的活动 | 123 | // 过滤掉无效的活动 |
| 124 | List<CombinationActivityDO> validActivities = combinationActivityDOList.stream() | 124 | List<CombinationActivityDO> validActivities = combinationActivityDOList.stream() |