diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java index e547232..ae5dcc8 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/controller/ActivityTeamController.java @@ -1,7 +1,6 @@ package com.muyu.marketing.team.controller; -import com.dtflys.forest.annotation.Get; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.muyu.common.core.domain.Result; @@ -12,11 +11,13 @@ import com.muyu.marketing.domain.model.ActivityTeamInfoListModel; import com.muyu.marketing.domain.req.ActivityTeamInfoReq; import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq; import com.muyu.marketing.domain.req.TeamInfoListReq; -import com.muyu.marketing.domain.resp.ActivityTeamInfoDatailResp; import com.muyu.marketing.domain.resp.TeamInfoListResp; import com.muyu.marketing.team.service.ActivityTeamInfoService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -51,7 +52,6 @@ public class ActivityTeamController { } - /** * 添加团购活动 * @param activityTeamInfoSaveReq 添加请求对象 @@ -76,14 +76,4 @@ public class ActivityTeamController { return Result.success(activityTeamInfoPageInfo); } - /** - * 根据活动Id查询信息 - * @param - * @return 结果集 - */ - @GetMapping("/byId/{id}") - public Result findById(@PathVariable Long id) { - ActivityTeamInfoDatailResp activityById = activityTeamInfoService.findActivityById(id); - return Result.success(activityById); - } } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java index e000c1a..4c8441a 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/ActivityTeamInfoService.java @@ -26,7 +26,16 @@ public interface ActivityTeamInfoService extends IService { */ public void save(ActivityTeamInfoAddModel activityTeamInfoAddModel); + /** + * 活动商品详细信息 + * @param id + * @return + */ public ActivityTeamInfoDatailResp findActivityById(Long id); + /** + * 活动商品的修改 + * @param activityTeamInfoModel + */ public void bateUpdate(ActivityTeamInfoModel activityTeamInfoModel); } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java index 746a0a4..1f099e1 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/team/service/impl/ActivityTeamInfoServiceImpl.java @@ -3,13 +3,10 @@ package com.muyu.marketing.team.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.marketing.domain.ActivityTeamInfo; import com.muyu.marketing.domain.model.*; -import com.muyu.marketing.domain.req.ActivityTeamProductReq; import com.muyu.marketing.domain.resp.ActivityTeamInfoDatailResp; import com.muyu.marketing.domain.resp.ActivityTeamProductSkuResp; import com.muyu.marketing.team.mapper.ActivityTeamInfoMapper;