diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java index 5bed602..d94c80e 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/ActivityTeamInfo.java @@ -79,6 +79,9 @@ public class ActivityTeamInfo extends BaseEntity { * 策略ID */ private Long strategyId; + /** + * 首页 + */ /** diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java index b2f1f58..e2477e0 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoAddModel.java @@ -48,7 +48,6 @@ public class ActivityTeamInfoAddModel { /** * 轮播图 */ - private String imageList; /** * 活动结束时间 diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoReq.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoReq.java new file mode 100644 index 0000000..054576e --- /dev/null +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoReq.java @@ -0,0 +1,10 @@ +package com.muyu.marketing.domain.req; + +import com.muyu.marketing.domain.ActivityTeamInfo; +import lombok.Data; + +@Data +public class ActivityTeamInfoReq extends ActivityTeamInfo { + private Integer pageNum=1; + private Integer pageSize=2; +} diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoSaveReq.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoSaveReq.java index c6ba53e..ab30849 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoSaveReq.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/ActivityTeamInfoSaveReq.java @@ -75,4 +75,5 @@ public class ActivityTeamInfoSaveReq extends BaseEntity { * 策略ID */ private Long strategyId; + } diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoListReq.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoListReq.java index 4dab2b5..43044a8 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoListReq.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoListReq.java @@ -22,7 +22,6 @@ public class TeamInfoListReq extends PageDomain { */ private String status; - /** * 通过当前对象构建业务查询模型 * @return 业务查询模型 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 dbf1d83..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,26 +1,30 @@ package com.muyu.marketing.team.controller; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.marketing.domain.ActivityTeamInfo; import com.muyu.marketing.domain.model.ActivityTeamInfoAddModel; import com.muyu.marketing.domain.model.ActivityTeamInfoListModel; -import com.muyu.marketing.domain.model.ActivityTeamInfoModel; +import com.muyu.marketing.domain.req.ActivityTeamInfoReq; import com.muyu.marketing.domain.req.ActivityTeamInfoSaveReq; -import com.muyu.marketing.domain.req.ActivityTeamProductReq; 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; /** * 营销团购活动控制层 * - * @author + * @author DongZeLiang * @date 2024-11-20 14:25 */ @RestController @@ -28,7 +32,7 @@ import java.util.List; public class ActivityTeamController { @Autowired - private ActivityTeamInfoService activityTeamInfoService; + private ActivityTeamInfoService activityTeamInfoService;; /** * 查询营销团购活动列表 @@ -53,31 +57,23 @@ public class ActivityTeamController { * @param activityTeamInfoSaveReq 添加请求对象 * @return 结果集 */ - @PostMapping + @PostMapping("/add") public Result save(@RequestBody ActivityTeamInfoSaveReq activityTeamInfoSaveReq) { activityTeamInfoService.save(ActivityTeamInfoAddModel.addReqBuild(activityTeamInfoSaveReq)); return Result.success(); } /** - * 根据活动Id查询信息 - * @param + * 查询营销团购活动列表分页 + * @param activityTeamInfo 添加请求对象 * @return 结果集 */ - @GetMapping("/{id}") - public Result findById(@PathVariable Long id) { - ActivityTeamInfoDatailResp activityById = activityTeamInfoService.findActivityById(id); - return Result.success(activityById); - } - - /** - * 根据修改 - */ - @PostMapping("/update") - public Result updDate(@RequestBody ActivityTeamProductReq activityTeamProductReq){ - ActivityTeamInfoModel activityTeamInfoModel = ActivityTeamInfoModel.activityTeamBuilder(activityTeamProductReq); - activityTeamInfoService.bateUpdate(activityTeamInfoModel); - return Result.success(); + @PostMapping("/listTeam") + public Result listTeam(@RequestBody ActivityTeamInfoReq activityTeamInfo){ + PageHelper.startPage(activityTeamInfo.getPageNum(),activityTeamInfo.getPageSize()); + List list = activityTeamInfoService.list(); + PageInfo activityTeamInfoPageInfo = new PageInfo<>(list); + return Result.success(activityTeamInfoPageInfo); } } 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 29ffa48..746a0a4 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,6 +3,8 @@ 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;