diff --git a/muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/controller/ActivityTeamInfoController.java b/muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/controller/ActivityTeamInfoController.java index 56a9d30..465af16 100644 --- a/muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/controller/ActivityTeamInfoController.java +++ b/muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/controller/ActivityTeamInfoController.java @@ -79,13 +79,13 @@ public class ActivityTeamInfoController { } /** - * 根据ID查询详情 - * @param id 活动I D - * @return 活动详情 + * 根据活动ID查询商品拼团信息 + * @param id 活动ID + * @return 商品拼团信息 */ - @GetMapping("/teamList/{id}") + @GetMapping("/ActivityTeamList/{id}") public Result> teamList(@PathVariable("id") Long id){ - List activityTeamInfoList= activityTeamInfoService.teamList(id); + List activityTeamInfoList= activityTeamInfoService.ActivityTeamList(id); return Result.success(activityTeamInfoList); } diff --git a/muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/service/ActivityTeamInfoService.java b/muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/service/ActivityTeamInfoService.java index f6652e4..ae991d6 100644 --- a/muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/service/ActivityTeamInfoService.java +++ b/muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/service/ActivityTeamInfoService.java @@ -41,11 +41,11 @@ public interface ActivityTeamInfoService extends IService { boolean update(ActivityTeamInfoUpdModel activityTeamInfoUpdModel); /** - * 根据活动ID查询详情 - * @param id id - * @return 查询详情 + * 根据活动ID查询商品拼团信息 + * @param id 活动ID + * @return 商品拼团信息 */ - List teamList(Long id); + List ActivityTeamList(Long id); } diff --git a/muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/service/impl/ActivityTeamInfoServiceImpl.java b/muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/service/impl/ActivityTeamInfoServiceImpl.java index 567aa4d..1ca2ddf 100644 --- a/muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/service/impl/ActivityTeamInfoServiceImpl.java +++ b/muyu-modules/muyu-marketing/muyu-marketing-server/src/main/java/com/muyu/system/team/service/impl/ActivityTeamInfoServiceImpl.java @@ -83,7 +83,7 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl save(ActivityTeamInfoSaveReq activityTeamInfoSaveReq) { ActivityTeamInfo activityTeamInfo = ActivityTeamInfo.buildModel(activityTeamInfoSaveReq); //添加返回主键ID - Assert.isTrue(this.save(activityTeamInfo),StringUtils.format("添加商品拼团错误",activityTeamInfoSaveReq)); + Assert.isTrue(this.save(activityTeamInfo),StringUtils.format("添加商品错误",activityTeamInfoSaveReq)); List projectSkuList = activityTeamInfoSaveReq.getTeamProjectSkuInfoAddReqList(); List teamProductSkuInfoList = projectSkuList.stream().map(projectSkuModel -> { @@ -96,7 +96,7 @@ public class ActivityTeamInfoServiceImpl extends ServiceImpl teamList(Long id) { + public List ActivityTeamList(Long id) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ActivityTeamInfo::getId,id); List list = this.list(queryWrapper);